diff --git a/composer.json b/composer.json
index 0975cb5..a6f71f8 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     },
     "autoload": {
         "psr-4": {
-            "WsfaqAccordion\\": "src/"
+            "Module\\WsFaqAccordion\\": "src/"
         },
         "classmap": [
             "ws_faqAccordion.php"
diff --git a/src/Module/Install.php b/src/Module/Install.php
index 05f48bb..48e97e1 100644
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WsfaqAccordion\Module;
+namespace Module\WsFaqAccordion\Module;
 
 trait Install
 {
diff --git a/src/Module/displayHooks.php b/src/Module/displayHooks.php
index 65c5d77..2c04115 100644
--- a/src/Module/displayHooks.php
+++ b/src/Module/displayHooks.php
@@ -1,6 +1,6 @@
 <?php 
 
-namespace WsfaqAccordion\Module;
+namespace Module\WsFaqAccordion\Module;
 
 trait displayHooks
 {
diff --git a/ws_faqAccordion.php b/ws_faqAccordion.php
index c299aa0..dd59dbc 100644
--- a/ws_faqAccordion.php
+++ b/ws_faqAccordion.php
@@ -19,18 +19,14 @@
  * @license    Valid for 1 website (or project) for each purchase of license
  *  International Registered Trademark & Property of De Websmid BV
  */
-use WsFaqAccordion\Module\Install;
-use WsFaqAccordion\Module\displayHooks;
+use Module\WsFaqAccordion\Module\Install;
+use Module\WsFaqAccordion\Module\displayHooks;
 
 
 if (!defined('_PS_VERSION_')) {
     exit;
 }
 
-if (file_exists(__DIR__ . '/vendor/autoload.php')) {
-    require_once __DIR__ . '/vendor/autoload.php';
-}
-
 class ws_faqAccordion extends Module
 {
     use Install;