diff --git a/Module.php b/Module.php
index 999fd2b8913dd15c2c7e417a72492a23a14961ec..1ef224d8d96c3d37e4d9e6455350bd642e6ef626 100644
--- a/Module.php
+++ b/Module.php
@@ -39,7 +39,7 @@ class Module
         return array(
             'Laminas\Loader\StandardAutoloader' => array(
                 'namespaces' => array(
-                    __NAMESPACE__ => __DIR__ . '/src/',
+                    __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
                 ),
             ),
         );
diff --git a/composer.json b/composer.json
index 02f136e04c3766328fd764ffdccc35f59b0d385b..4c5c14a65377bf9d13e27595b2fa6429a1ed4a90 100755
--- a/composer.json
+++ b/composer.json
@@ -7,11 +7,12 @@
             "url": "https://gest.unicaen.fr/packagist"
         }
     ],
-    "require": {
-    },
     "autoload": {
         "psr-4": {
-            "UnicaenIcs\\": "module/src/"
-        }
+            "UnicaenIcs\\": "src/UnicaenIcs/"
+        },
+        "classmap": [
+            "./Module.php"
+        ]
     }
 }
diff --git a/config/module.config.php b/config/module.config.php
index 57da3df0cc7f81e0e8bcb8f0c9c62430266f236a..40f12331f3f6f304bc4bd590c2d7f626216b1e9a 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -18,7 +18,7 @@ return [
                 'class' => XmlDriver::class,
                 'cache' => 'apc',
                 'paths' => [
-                    __DIR__ . '/../src/Entity/Db/Mapping',
+                    __DIR__ . '/../src/UnicaenIcs/Entity/Db/Mapping',
                 ],
             ],
         ],
diff --git a/src/Entity/Db/Invitation.php b/src/UnicaenIcs/Entity/Db/Invitation.php
similarity index 100%
rename from src/Entity/Db/Invitation.php
rename to src/UnicaenIcs/Entity/Db/Invitation.php
diff --git a/src/Entity/Db/Mapping/UnicaenIcs.Entity.Db.Invitation.dcm.xml b/src/UnicaenIcs/Entity/Db/Mapping/UnicaenIcs.Entity.Db.Invitation.dcm.xml
similarity index 100%
rename from src/Entity/Db/Mapping/UnicaenIcs.Entity.Db.Invitation.dcm.xml
rename to src/UnicaenIcs/Entity/Db/Mapping/UnicaenIcs.Entity.Db.Invitation.dcm.xml
diff --git a/src/Service/InvitationService.php b/src/UnicaenIcs/Service/InvitationService.php
similarity index 100%
rename from src/Service/InvitationService.php
rename to src/UnicaenIcs/Service/InvitationService.php
diff --git a/src/Service/InvitationServiceAwareTrait.php b/src/UnicaenIcs/Service/InvitationServiceAwareTrait.php
similarity index 100%
rename from src/Service/InvitationServiceAwareTrait.php
rename to src/UnicaenIcs/Service/InvitationServiceAwareTrait.php
diff --git a/src/Service/InvitationServiceFactory.php b/src/UnicaenIcs/Service/InvitationServiceFactory.php
similarity index 100%
rename from src/Service/InvitationServiceFactory.php
rename to src/UnicaenIcs/Service/InvitationServiceFactory.php