Eliminated globals & upgraded everything to classes

Just adding some more professionalism to the project