reorganise directory structure