Refactored packages and classes