refactoring shack namespacing