refactoring to classes - 0.0.10