further restructoring
Merge branch 'master' of github.com:Nemo64/meteor-translator