diff --git a/addons/payment_acquirer/__init__.py b/addons/payment_acquirer/__init__.py
index dde6f25c728..d95d47860af 100644
--- a/addons/payment_acquirer/__init__.py
+++ b/addons/payment_acquirer/__init__.py
@@ -20,4 +20,3 @@
 ##############################################################################
 
 import models
-import controllers
diff --git a/addons/payment_acquirer/__openerp__.py b/addons/payment_acquirer/__openerp__.py
index 06c3aa19d40..2c633121c7a 100644
--- a/addons/payment_acquirer/__openerp__.py
+++ b/addons/payment_acquirer/__openerp__.py
@@ -28,7 +28,7 @@
     'author': 'OpenERP SA',
     'depends': ['decimal_precision', 'mail'],
     'data': [
-        'views/payment_acquirer_views.xml',
+        'views/payment_acquirer.xml',
         'security/ir.model.access.csv',
     ],
     'installable': True,
diff --git a/addons/payment_acquirer/controllers/__init__.py b/addons/payment_acquirer/controllers/__init__.py
deleted file mode 100644
index 039d9715fab..00000000000
--- a/addons/payment_acquirer/controllers/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-import main
\ No newline at end of file
diff --git a/addons/payment_acquirer/controllers/main.py b/addons/payment_acquirer/controllers/main.py
deleted file mode 100644
index c0ef7f383d4..00000000000
--- a/addons/payment_acquirer/controllers/main.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.addons.web import http
-
-import logging
-
-_logger = logging.getLogger(__name__)
-
-
-class PaymentController(http.Controller):
-    pass
diff --git a/addons/payment_acquirer/views/payment_acquirer_views.xml b/addons/payment_acquirer/views/payment_acquirer.xml
similarity index 100%
rename from addons/payment_acquirer/views/payment_acquirer_views.xml
rename to addons/payment_acquirer/views/payment_acquirer.xml
diff --git a/addons/payment_acquirer/static/src/img/icon_code.png b/addons/payment_acquirer_ogone/static/src/img/icon_code.png
similarity index 100%
rename from addons/payment_acquirer/static/src/img/icon_code.png
rename to addons/payment_acquirer_ogone/static/src/img/icon_code.png
diff --git a/addons/payment_acquirer/static/src/img/icon_credit_card.png b/addons/payment_acquirer_ogone/static/src/img/icon_credit_card.png
similarity index 100%
rename from addons/payment_acquirer/static/src/img/icon_credit_card.png
rename to addons/payment_acquirer_ogone/static/src/img/icon_credit_card.png
diff --git a/addons/payment_acquirer/static/src/img/ogone_logo.png b/addons/payment_acquirer_ogone/static/src/img/ogone_logo.png
similarity index 100%
rename from addons/payment_acquirer/static/src/img/ogone_logo.png
rename to addons/payment_acquirer_ogone/static/src/img/ogone_logo.png
diff --git a/addons/payment_acquirer/static/src/img/ogone_logo_plain.gif b/addons/payment_acquirer_ogone/static/src/img/ogone_logo_plain.gif
similarity index 100%
rename from addons/payment_acquirer/static/src/img/ogone_logo_plain.gif
rename to addons/payment_acquirer_ogone/static/src/img/ogone_logo_plain.gif