Move some files around to make things faster