Rework project layout