Modernize project layout