Refactor package names
Add imports for classes outside the new package