Move HashMapDb to its own bundle