moved scala class escaping from \ufe33-\ufe34-_ to _-__-
Refactorings and clean up for new encoding.