Cleaned and Merged Classes, Updated Readme