Fixing problems caused by moving catalog module into a package (subdir)