diff --git a/src/BeSimple/SoapClient/Soap/SoapClient.php b/src/BeSimple/SoapClient/SoapClient.php
similarity index 98%
rename from src/BeSimple/SoapClient/Soap/SoapClient.php
rename to src/BeSimple/SoapClient/SoapClient.php
index 8b5b187..c335a2e 100644
--- a/src/BeSimple/SoapClient/Soap/SoapClient.php
+++ b/src/BeSimple/SoapClient/SoapClient.php
@@ -10,7 +10,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace BeSimple\SoapClient\Soap;
+namespace BeSimple\SoapClient;
 
 use BeSimple\SoapCommon\Cache;
 
diff --git a/src/BeSimple/SoapClient/Soap/SoapRequest.php b/src/BeSimple/SoapClient/SoapRequest.php
similarity index 98%
rename from src/BeSimple/SoapClient/Soap/SoapRequest.php
rename to src/BeSimple/SoapClient/SoapRequest.php
index 1963a64..0960074 100644
--- a/src/BeSimple/SoapClient/Soap/SoapRequest.php
+++ b/src/BeSimple/SoapClient/SoapRequest.php
@@ -10,7 +10,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace BeSimple\SoapClient\Soap;
+namespace BeSimple\SoapClient;
 
 /**
  * @author Francis Besset <francis.besset@gmail.com>
diff --git a/tests/BeSimple/Tests/SoapClient/Soap/Fixtures/foobar.wsdl b/tests/BeSimple/Tests/SoapClient/Fixtures/foobar.wsdl
similarity index 100%
rename from tests/BeSimple/Tests/SoapClient/Soap/Fixtures/foobar.wsdl
rename to tests/BeSimple/Tests/SoapClient/Fixtures/foobar.wsdl
diff --git a/tests/BeSimple/Tests/SoapClient/Soap/SoapClientTest.php b/tests/BeSimple/Tests/SoapClient/SoapClientTest.php
similarity index 96%
rename from tests/BeSimple/Tests/SoapClient/Soap/SoapClientTest.php
rename to tests/BeSimple/Tests/SoapClient/SoapClientTest.php
index bb6d03a..7d9d4dd 100644
--- a/tests/BeSimple/Tests/SoapClient/Soap/SoapClientTest.php
+++ b/tests/BeSimple/Tests/SoapClient/SoapClientTest.php
@@ -10,10 +10,10 @@
  * with this source code in the file LICENSE.
  */
 
-namespace BeSimple\Tests\SoapClient\Soap;
+namespace BeSimple\Tests\SoapClient;
 
 use BeSimple\SoapCommon\Cache;
-use BeSimple\SoapClient\Soap\SoapClient;
+use BeSimple\SoapClient\SoapClient;
 
 class SoapClientTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/BeSimple/Tests/SoapClient/Soap/SoapRequestTest.php b/tests/BeSimple/Tests/SoapClient/SoapRequestTest.php
similarity index 96%
rename from tests/BeSimple/Tests/SoapClient/Soap/SoapRequestTest.php
rename to tests/BeSimple/Tests/SoapClient/SoapRequestTest.php
index 8e06a23..efb5123 100644
--- a/tests/BeSimple/Tests/SoapClient/Soap/SoapRequestTest.php
+++ b/tests/BeSimple/Tests/SoapClient/SoapRequestTest.php
@@ -10,9 +10,9 @@
  * with this source code in the file LICENSE.
  */
 
-namespace BeSimple\Tests\SoapClient\Soap;
+namespace BeSimple\Tests\SoapClient;
 
-use BeSimple\SoapClient\Soap\SoapRequest;
+use BeSimple\SoapClient\SoapRequest;
 
 class SoapRequestTest extends \PHPUnit_Framework_TestCase
 {