Refactoring renaming and moving to other packages