Refactor package for new domain