Refactored classes to specific packages