remove deprecated CollectionFactory
fix after merge
correct resolve inter-module references