Rearranging Classes
Updated readme