Reorganise directory structure to make navigation more convenient