Simplify the project layout