refactor package to the correct domain