Sorted classes into proper folders. Refactored classes into subclasses