diff --git a/README.rst b/mail_move_message/README.rst
similarity index 100%
rename from README.rst
rename to mail_move_message/README.rst
diff --git a/__init__.py b/mail_move_message/__init__.py
similarity index 100%
rename from __init__.py
rename to mail_move_message/__init__.py
diff --git a/__openerp__.py b/mail_move_message/__openerp__.py
similarity index 100%
rename from __openerp__.py
rename to mail_move_message/__openerp__.py
diff --git a/controllers/__init__.py b/mail_move_message/controllers/__init__.py
similarity index 100%
rename from controllers/__init__.py
rename to mail_move_message/controllers/__init__.py
diff --git a/controllers/main.py b/mail_move_message/controllers/main.py
similarity index 100%
rename from controllers/main.py
rename to mail_move_message/controllers/main.py
diff --git a/data/mail_move_message_data.xml b/mail_move_message/data/mail_move_message_data.xml
similarity index 100%
rename from data/mail_move_message_data.xml
rename to mail_move_message/data/mail_move_message_data.xml
diff --git a/doc/changelog.rst b/mail_move_message/doc/changelog.rst
similarity index 100%
rename from doc/changelog.rst
rename to mail_move_message/doc/changelog.rst
diff --git a/i18n/mail_move_message.pot b/mail_move_message/i18n/mail_move_message.pot
similarity index 100%
rename from i18n/mail_move_message.pot
rename to mail_move_message/i18n/mail_move_message.pot
diff --git a/i18n/sl.po b/mail_move_message/i18n/sl.po
similarity index 100%
rename from i18n/sl.po
rename to mail_move_message/i18n/sl.po
diff --git a/images/inbox.png b/mail_move_message/images/inbox.png
similarity index 100%
rename from images/inbox.png
rename to mail_move_message/images/inbox.png
diff --git a/mail_move_message_models.py b/mail_move_message/mail_move_message_models.py
similarity index 100%
rename from mail_move_message_models.py
rename to mail_move_message/mail_move_message_models.py
diff --git a/mail_move_message_views.xml b/mail_move_message/mail_move_message_views.xml
similarity index 100%
rename from mail_move_message_views.xml
rename to mail_move_message/mail_move_message_views.xml
diff --git a/static/description/delete-message.png b/mail_move_message/static/description/delete-message.png
similarity index 100%
rename from static/description/delete-message.png
rename to mail_move_message/static/description/delete-message.png
diff --git a/static/description/html-message-viewer.png b/mail_move_message/static/description/html-message-viewer.png
similarity index 100%
rename from static/description/html-message-viewer.png
rename to mail_move_message/static/description/html-message-viewer.png
diff --git a/static/description/html-message-viewer1.png b/mail_move_message/static/description/html-message-viewer1.png
similarity index 100%
rename from static/description/html-message-viewer1.png
rename to mail_move_message/static/description/html-message-viewer1.png
diff --git a/static/description/html-message.png b/mail_move_message/static/description/html-message.png
similarity index 100%
rename from static/description/html-message.png
rename to mail_move_message/static/description/html-message.png
diff --git a/static/description/icon.png b/mail_move_message/static/description/icon.png
similarity index 100%
rename from static/description/icon.png
rename to mail_move_message/static/description/icon.png
diff --git a/static/description/inbox-move.png b/mail_move_message/static/description/inbox-move.png
similarity index 100%
rename from static/description/inbox-move.png
rename to mail_move_message/static/description/inbox-move.png
diff --git a/static/description/inbox.png b/mail_move_message/static/description/inbox.png
similarity index 100%
rename from static/description/inbox.png
rename to mail_move_message/static/description/inbox.png
diff --git a/static/description/index.html b/mail_move_message/static/description/index.html
similarity index 100%
rename from static/description/index.html
rename to mail_move_message/static/description/index.html
diff --git a/static/description/record-move-back.png b/mail_move_message/static/description/record-move-back.png
similarity index 100%
rename from static/description/record-move-back.png
rename to mail_move_message/static/description/record-move-back.png
diff --git a/static/description/record1.png b/mail_move_message/static/description/record1.png
similarity index 100%
rename from static/description/record1.png
rename to mail_move_message/static/description/record1.png
diff --git a/static/description/record2.png b/mail_move_message/static/description/record2.png
similarity index 100%
rename from static/description/record2.png
rename to mail_move_message/static/description/record2.png
diff --git a/static/src/css/mail_move_message.css b/mail_move_message/static/src/css/mail_move_message.css
similarity index 100%
rename from static/src/css/mail_move_message.css
rename to mail_move_message/static/src/css/mail_move_message.css
diff --git a/static/src/js/mail_move_message.js b/mail_move_message/static/src/js/mail_move_message.js
similarity index 100%
rename from static/src/js/mail_move_message.js
rename to mail_move_message/static/src/js/mail_move_message.js
diff --git a/static/src/xml/mail_move_message_main.xml b/mail_move_message/static/src/xml/mail_move_message_main.xml
similarity index 100%
rename from static/src/xml/mail_move_message_main.xml
rename to mail_move_message/static/src/xml/mail_move_message_main.xml