Code Refactored
- modules were created