diff --git a/src/BeSimple/SoapClient/SoapOptions/SoapClientOptions.php b/src/BeSimple/SoapClient/SoapClientOptions.php
similarity index 100%
rename from src/BeSimple/SoapClient/SoapOptions/SoapClientOptions.php
rename to src/BeSimple/SoapClient/SoapClientOptions.php
diff --git a/src/BeSimple/SoapClient/SoapClientOptionsBuilder.php b/src/BeSimple/SoapClient/SoapClientOptionsBuilder.php
index 342346d..ef22a2c 100644
--- a/src/BeSimple/SoapClient/SoapClientOptionsBuilder.php
+++ b/src/BeSimple/SoapClient/SoapClientOptionsBuilder.php
@@ -12,8 +12,6 @@
 
 namespace BeSimple\SoapClient;
 
-use BeSimple\SoapCommon\SoapOptions\SoapOptions;
-
 /**
  * Provides a SoapClient instance.
  *
diff --git a/src/BeSimple/SoapClient/SoapOptions/SoapServerAuthentication/SoapServerAuthenticationBasic.php b/src/BeSimple/SoapClient/SoapServerAuthentication/SoapServerAuthenticationBasic.php
similarity index 100%
rename from src/BeSimple/SoapClient/SoapOptions/SoapServerAuthentication/SoapServerAuthenticationBasic.php
rename to src/BeSimple/SoapClient/SoapServerAuthentication/SoapServerAuthenticationBasic.php
diff --git a/src/BeSimple/SoapClient/SoapOptions/SoapServerAuthentication/SoapServerAuthenticationDigest.php b/src/BeSimple/SoapClient/SoapServerAuthentication/SoapServerAuthenticationDigest.php
similarity index 100%
rename from src/BeSimple/SoapClient/SoapOptions/SoapServerAuthentication/SoapServerAuthenticationDigest.php
rename to src/BeSimple/SoapClient/SoapServerAuthentication/SoapServerAuthenticationDigest.php
diff --git a/src/BeSimple/SoapClient/SoapOptions/SoapServerAuthentication/SoapServerAuthenticationInterface.php b/src/BeSimple/SoapClient/SoapServerAuthentication/SoapServerAuthenticationInterface.php
similarity index 100%
rename from src/BeSimple/SoapClient/SoapOptions/SoapServerAuthentication/SoapServerAuthenticationInterface.php
rename to src/BeSimple/SoapClient/SoapServerAuthentication/SoapServerAuthenticationInterface.php
diff --git a/src/BeSimple/SoapClient/SoapOptions/SoapServerProxy/SoapServerProxy.php b/src/BeSimple/SoapClient/SoapServerProxy/SoapServerProxy.php
similarity index 100%
rename from src/BeSimple/SoapClient/SoapOptions/SoapServerProxy/SoapServerProxy.php
rename to src/BeSimple/SoapClient/SoapServerProxy/SoapServerProxy.php