Tokenizer types fixes
Moved old tokenizer types to segmenataion namespace
Commented out descriptor generators