Reorganise file structure.