Refactored classes in different packages