Rework the project layout (no code change)