Adding Translator and Helper and doing some refactoring