diff --git a/__unported__/server_environment/__init__.py b/server_environment/__init__.py
similarity index 100%
rename from __unported__/server_environment/__init__.py
rename to server_environment/__init__.py
diff --git a/__unported__/server_environment/__openerp__.py b/server_environment/__openerp__.py
similarity index 100%
rename from __unported__/server_environment/__openerp__.py
rename to server_environment/__openerp__.py
diff --git a/__unported__/server_environment/i18n/server_environment.pot b/server_environment/i18n/server_environment.pot
similarity index 100%
rename from __unported__/server_environment/i18n/server_environment.pot
rename to server_environment/i18n/server_environment.pot
diff --git a/__unported__/server_environment/serv_config.py b/server_environment/serv_config.py
similarity index 100%
rename from __unported__/server_environment/serv_config.py
rename to server_environment/serv_config.py
diff --git a/__unported__/server_environment/serv_config.xml b/server_environment/serv_config.xml
similarity index 100%
rename from __unported__/server_environment/serv_config.xml
rename to server_environment/serv_config.xml
diff --git a/__unported__/server_environment/system_info.py b/server_environment/system_info.py
similarity index 100%
rename from __unported__/server_environment/system_info.py
rename to server_environment/system_info.py
diff --git a/__unported__/server_environment_files/__init__.py b/server_environment_file_sample/__init__.py
similarity index 100%
rename from __unported__/server_environment_files/__init__.py
rename to server_environment_file_sample/__init__.py
diff --git a/__unported__/server_environment_files/__openerp__.py b/server_environment_file_sample/__openerp__.py
similarity index 100%
rename from __unported__/server_environment_files/__openerp__.py
rename to server_environment_file_sample/__openerp__.py
diff --git a/__unported__/server_environment_files/default/base.conf b/server_environment_file_sample/default/base.conf
similarity index 100%
rename from __unported__/server_environment_files/default/base.conf
rename to server_environment_file_sample/default/base.conf
diff --git a/__unported__/server_environment_files/default/mytopic.conf b/server_environment_file_sample/default/mytopic.conf
similarity index 100%
rename from __unported__/server_environment_files/default/mytopic.conf
rename to server_environment_file_sample/default/mytopic.conf
diff --git a/__unported__/server_environment_files/dev/base.conf b/server_environment_file_sample/dev/base.conf
similarity index 100%
rename from __unported__/server_environment_files/dev/base.conf
rename to server_environment_file_sample/dev/base.conf
diff --git a/__unported__/server_environment_files/dev/mytopic.conf b/server_environment_file_sample/dev/mytopic.conf
similarity index 100%
rename from __unported__/server_environment_files/dev/mytopic.conf
rename to server_environment_file_sample/dev/mytopic.conf
diff --git a/__unported__/server_environment_files/i18n/server_environment_files.pot b/server_environment_file_sample/i18n/server_environment_files.pot
similarity index 100%
rename from __unported__/server_environment_files/i18n/server_environment_files.pot
rename to server_environment_file_sample/i18n/server_environment_files.pot
diff --git a/__unported__/server_environment_files/preprod/mytopic.conf b/server_environment_file_sample/preprod/mytopic.conf
similarity index 100%
rename from __unported__/server_environment_files/preprod/mytopic.conf
rename to server_environment_file_sample/preprod/mytopic.conf
diff --git a/__unported__/server_environment_files/prod/base.conf b/server_environment_file_sample/prod/base.conf
similarity index 100%
rename from __unported__/server_environment_files/prod/base.conf
rename to server_environment_file_sample/prod/base.conf
diff --git a/__unported__/server_environment_files/prod/mytopic.conf b/server_environment_file_sample/prod/mytopic.conf
similarity index 100%
rename from __unported__/server_environment_files/prod/mytopic.conf
rename to server_environment_file_sample/prod/mytopic.conf