Reorganise file structure