small refactorings
deprecation step1
refactoring
removed obsolete tokens package