Fixed bug with name variable printing
Moved service group out to class object
Moved service out to a class
Migrate the rest of the types over to classes