diff --git a/web_warning_on_save/__init__.py b/web_warning_on_save/__init__.py
index 7c5f67fb..7f72dfd5 100644
--- a/web_warning_on_save/__init__.py
+++ b/web_warning_on_save/__init__.py
@@ -19,4 +19,4 @@
 #
 ##############################################################################
 
-from . import controller
+from . import controllers
diff --git a/web_warning_on_save/controllers/__init__.py b/web_warning_on_save/controllers/__init__.py
new file mode 100644
index 00000000..7c5f67fb
--- /dev/null
+++ b/web_warning_on_save/controllers/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Damien Crier
+#    Copyright 2015 Camptocamp SA
+#
+#    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 . import controller
diff --git a/web_warning_on_save/controller.py b/web_warning_on_save/controllers/controller.py
similarity index 100%
rename from web_warning_on_save/controller.py
rename to web_warning_on_save/controllers/controller.py