diff --git a/addons/base_gengo/__init__.py b/addons/base_gengo/__init__.py
index 33980043203..3267a73df82 100644
--- a/addons/base_gengo/__init__.py
+++ b/addons/base_gengo/__init__.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import res_company
-import ir_translation
-import wizard
+import models
 import controller
+import wizard
diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
index 47a579a18e8..df24fb95666 100644
--- a/addons/base_gengo/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -2,8 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Automated Translations through Gengo API',
-    'version': '0.1',
-    'category': 'Extra Tools',
+    'category': 'Tools',
     'description': """
 Automated Translations through Gengo API
 ========================================
@@ -17,9 +16,9 @@ This wizard will activate the CRON job and the Scheduler and will start the auto
     """,
     'depends': ['base'],
     'data': [
-        'gengo_sync_schedular_data.xml',
-        'ir_translation.xml',
-        'res_company_view.xml',
+        'data/ir_cron_data.xml',
+        'views/ir_translation_views.xml',
+        'views/res_company_views.xml',
         'wizard/base_gengo_translations_view.xml',
     ],
     'demo': ['data/res_company_demo.xml'],
diff --git a/addons/base_gengo/controller/__init__.py b/addons/base_gengo/controller/__init__.py
index 4648ae64b0f..e1ba39812f5 100644
--- a/addons/base_gengo/controller/__init__.py
+++ b/addons/base_gengo/controller/__init__.py
@@ -1 +1,4 @@
-import gengo_callback
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import main
\ No newline at end of file
diff --git a/addons/base_gengo/controller/gengo_callback.py b/addons/base_gengo/controller/main.py
similarity index 96%
rename from addons/base_gengo/controller/gengo_callback.py
rename to addons/base_gengo/controller/main.py
index 85af7f8585d..40af6c1fb64 100644
--- a/addons/base_gengo/controller/gengo_callback.py
+++ b/addons/base_gengo/controller/main.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import openerp
 from openerp import SUPERUSER_ID
diff --git a/addons/base_gengo/gengo_sync_schedular_data.xml b/addons/base_gengo/data/ir_cron_data.xml
similarity index 100%
rename from addons/base_gengo/gengo_sync_schedular_data.xml
rename to addons/base_gengo/data/ir_cron_data.xml
diff --git a/addons/base_gengo/models/__init__.py b/addons/base_gengo/models/__init__.py
new file mode 100644
index 00000000000..6ccf32be938
--- /dev/null
+++ b/addons/base_gengo/models/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import ir_translation
+import res_company
\ No newline at end of file
diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/models/ir_translation.py
similarity index 100%
rename from addons/base_gengo/ir_translation.py
rename to addons/base_gengo/models/ir_translation.py
diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/models/res_company.py
similarity index 100%
rename from addons/base_gengo/res_company.py
rename to addons/base_gengo/models/res_company.py
diff --git a/addons/base_gengo/ir_translation.xml b/addons/base_gengo/views/ir_translation_views.xml
similarity index 100%
rename from addons/base_gengo/ir_translation.xml
rename to addons/base_gengo/views/ir_translation_views.xml
diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/views/res_company_views.xml
similarity index 100%
rename from addons/base_gengo/res_company_view.xml
rename to addons/base_gengo/views/res_company_views.xml