* Finished re-arranging classes to get rid of unneeded classes