diff --git a/core/lib/Thelia/Core/Security/Security/Authentication/AuthenticationProviderInterface.php b/core/lib/Thelia/Core/Security/Authentication/AuthenticationProviderInterface.php
similarity index 100%
rename from core/lib/Thelia/Core/Security/Security/Authentication/AuthenticationProviderInterface.php
rename to core/lib/Thelia/Core/Security/Authentication/AuthenticationProviderInterface.php
diff --git a/core/lib/Thelia/Core/Security/Security/Authentication/UsernamePasswordAuthenticator.php b/core/lib/Thelia/Core/Security/Authentication/UsernamePasswordAuthenticator.php
similarity index 100%
rename from core/lib/Thelia/Core/Security/Security/Authentication/UsernamePasswordAuthenticator.php
rename to core/lib/Thelia/Core/Security/Authentication/UsernamePasswordAuthenticator.php
diff --git a/core/lib/Thelia/Core/Security/Security/Encoder/PasswordEncoderInterface.php b/core/lib/Thelia/Core/Security/Encoder/PasswordEncoderInterface.php
similarity index 100%
rename from core/lib/Thelia/Core/Security/Security/Encoder/PasswordEncoderInterface.php
rename to core/lib/Thelia/Core/Security/Encoder/PasswordEncoderInterface.php
diff --git a/core/lib/Thelia/Core/Security/Security/Encoder/PasswordHashEncoder.php b/core/lib/Thelia/Core/Security/Encoder/PasswordHashEncoder.php
similarity index 100%
rename from core/lib/Thelia/Core/Security/Security/Encoder/PasswordHashEncoder.php
rename to core/lib/Thelia/Core/Security/Encoder/PasswordHashEncoder.php
diff --git a/core/lib/Thelia/Core/Security/Security/Exception/AuthenticationTokenNotFoundException.php b/core/lib/Thelia/Core/Security/Exception/AuthenticationTokenNotFoundException.php
similarity index 100%
rename from core/lib/Thelia/Core/Security/Security/Exception/AuthenticationTokenNotFoundException.php
rename to core/lib/Thelia/Core/Security/Exception/AuthenticationTokenNotFoundException.php
diff --git a/core/lib/Thelia/Core/Security/Security/SecurityManager.php b/core/lib/Thelia/Core/Security/SecurityManager.php
similarity index 100%
rename from core/lib/Thelia/Core/Security/Security/SecurityManager.php
rename to core/lib/Thelia/Core/Security/SecurityManager.php
diff --git a/core/lib/Thelia/Core/Security/Security/Token/AbstractToken.php b/core/lib/Thelia/Core/Security/Token/AbstractToken.php
similarity index 100%
rename from core/lib/Thelia/Core/Security/Security/Token/AbstractToken.php
rename to core/lib/Thelia/Core/Security/Token/AbstractToken.php
diff --git a/core/lib/Thelia/Core/Security/Security/Token/TokenInterface.php b/core/lib/Thelia/Core/Security/Token/TokenInterface.php
similarity index 100%
rename from core/lib/Thelia/Core/Security/Security/Token/TokenInterface.php
rename to core/lib/Thelia/Core/Security/Token/TokenInterface.php
diff --git a/core/lib/Thelia/Core/Security/Security/Token/UsernamePasswordToken.php b/core/lib/Thelia/Core/Security/Token/UsernamePasswordToken.php
similarity index 100%
rename from core/lib/Thelia/Core/Security/Security/Token/UsernamePasswordToken.php
rename to core/lib/Thelia/Core/Security/Token/UsernamePasswordToken.php
diff --git a/core/lib/Thelia/Core/Security/Security/User/AdminUserProvider.php b/core/lib/Thelia/Core/Security/User/AdminUserProvider.php
similarity index 100%
rename from core/lib/Thelia/Core/Security/Security/User/AdminUserProvider.php
rename to core/lib/Thelia/Core/Security/User/AdminUserProvider.php
diff --git a/core/lib/Thelia/Core/Security/Security/User/CustomerUserProvider.php b/core/lib/Thelia/Core/Security/User/CustomerUserProvider.php
similarity index 100%
rename from core/lib/Thelia/Core/Security/Security/User/CustomerUserProvider.php
rename to core/lib/Thelia/Core/Security/User/CustomerUserProvider.php
diff --git a/core/lib/Thelia/Core/Security/Security/User/UserInterface.php b/core/lib/Thelia/Core/Security/User/UserInterface.php
similarity index 100%
rename from core/lib/Thelia/Core/Security/Security/User/UserInterface.php
rename to core/lib/Thelia/Core/Security/User/UserInterface.php
diff --git a/core/lib/Thelia/Core/Security/Security/User/UserProviderInterface.php b/core/lib/Thelia/Core/Security/User/UserProviderInterface.php
similarity index 100%
rename from core/lib/Thelia/Core/Security/Security/User/UserProviderInterface.php
rename to core/lib/Thelia/Core/Security/User/UserProviderInterface.php