Changed the structure of the classes. Added new stuff
Added new class, restructuring