Cleaned things up again and moved translations to Bundle (fix #1)