Refactored package for namespace move