Reorganise code files