Adjust package hierarchy and add humhamhire submodule