Reorganise project directory