Refactor ALL the classes
Fix Readme for the refactor