reorganise imports for new Collections conflict class
drwxr-xr-x - src