Reorganized structure to have one version for py2 and py3
Updated adding translation packages