refactoring, moving classes to packages, renaming classes and methods