Minor tweaks to mock_factory
Removed cosmology sub-package