Rework of organization operations
Rework of token operations
Removing unused classes/ code