Shuffle files around to fit in better with project structure.