Catch the NPE
Refactor translation classes into one package
Tidy