- refactored
- made console app, class lib instead with tests