Reorganise project layout.