Renamed hashmap.h to hashlib.h, some related improvements