Move some files around a bit