Modify imports, make them explicit relative imports.  Cleanup namespace in catalog.py.