Refactoring into packages
Refactored into packages