Move all catalog hash functions to static module.  Ready for tests!