Fixed the project layout