Moved the classes into their own files. Refactored logic in translate method to make the logic clearer.