Reorganise some files