Shuffled the project layout a bit