reorganize project
Class name refactoring

Add also some class to the future of this lib
Remove unused code
Add assertions - work in progress