cleaning up the project layout