Changed the layout of the classes and updated readme.md