Started oop-style refactoring
:bug: Bug fixes
Merge pull request #3 from muchweb/oop

Class refactoring