Test refactoring
Refactored classes to their packages