Refactored Package Structure