We were creating the plugins folder if it didn't exist and moving it,
but we need it to exist regardless of whether we have plugins, so this
patch moves the creation after the move (and ensures the move doesn't
fail).