Refactored classes
Removed a lot of unused classes