Refactored classes into proper structure
Refactored code to reflect proper structure
Refactored code to reflect a better structure