Reorganise project