Moved translator code to Library project
Added 'self' token.
Fixing some tests.