Reorganise project folder