diff --git a/extensions/sphinx/yii/sphinx/Command.php b/extensions/sphinx/Command.php
similarity index 100%
rename from extensions/sphinx/yii/sphinx/Command.php
rename to extensions/sphinx/Command.php
diff --git a/extensions/sphinx/yii/sphinx/Connection.php b/extensions/sphinx/Connection.php
similarity index 100%
rename from extensions/sphinx/yii/sphinx/Connection.php
rename to extensions/sphinx/Connection.php
diff --git a/extensions/sphinx/yii/sphinx/Query.php b/extensions/sphinx/Query.php
similarity index 100%
rename from extensions/sphinx/yii/sphinx/Query.php
rename to extensions/sphinx/Query.php
diff --git a/extensions/sphinx/yii/sphinx/QueryBuilder.php b/extensions/sphinx/QueryBuilder.php
similarity index 100%
rename from extensions/sphinx/yii/sphinx/QueryBuilder.php
rename to extensions/sphinx/QueryBuilder.php
diff --git a/extensions/sphinx/yii/sphinx/Schema.php b/extensions/sphinx/Schema.php
similarity index 100%
rename from extensions/sphinx/yii/sphinx/Schema.php
rename to extensions/sphinx/Schema.php
diff --git a/tests/unit/extensions/sphinx/SphinxTestCase.php b/tests/unit/extensions/sphinx/SphinxTestCase.php
index c643c65..475ca69 100644
--- a/tests/unit/extensions/sphinx/SphinxTestCase.php
+++ b/tests/unit/extensions/sphinx/SphinxTestCase.php
@@ -56,7 +56,7 @@ class SphinxTestCase extends TestCase
 	protected static function loadClassMap()
 	{
 		$baseNameSpace = 'yii/sphinx';
-		$basePath = realpath(__DIR__. '/../../../../extensions/sphinx/yii/sphinx');
+		$basePath = realpath(__DIR__. '/../../../../extensions/sphinx');
 		$files = FileHelper::findFiles($basePath);
 		foreach ($files as $file) {
 			$classRelativePath = str_replace($basePath, '', $file);