refactor hasher package & names