Shuffle files around to match other projects.