Moved class in packages
Refactored