-Refactor classes names
-Minor fixes
-Some comments