Refactored Package Organization