diff --git a/.idea/cursor.iml b/.idea/cursor.iml
index fb11120cb8f09a4c48b399157fe673b7f581cbd6..4662101fa8da6efdd5dba0eeb5dd055d180781d0 100644
--- a/.idea/cursor.iml
+++ b/.idea/cursor.iml
@@ -3,8 +3,8 @@
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/vendor/nette/tester/src" isTestSource="false" packagePrefix="Tester" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="Grifart\Mappi\Store" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Grifart\Mappi\Tests\Store" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="Grifart\Mappi\Cursor" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Grifart\Mappi\Tests" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/vendor/mockery/mockery/tests" isTestSource="true" packagePrefix="test" />
       <sourceFolder url="file://$MODULE_DIR$/vendor/dibi/dibi/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/vendor/hamcrest/hamcrest-php/tests" isTestSource="true" />
@@ -12,6 +12,9 @@
       <sourceFolder url="file://$MODULE_DIR$/vendor/mockery/mockery/library" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/vendor/mockery/mockery/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/vendor/mockery/mockery/tests/Mockery/Test" isTestSource="true" packagePrefix="Mockery" />
+      <sourceFolder url="file://$MODULE_DIR$/vendor/marc-mabe/php-enum/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/vendor/tracy/tracy/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/vendor/tracy/tracy/src" isTestSource="false" packagePrefix="Tracy" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/tests/Cursor/CursorTest.phpt b/tests/Cursor/CursorTest.phpt
index 360a1b0dee82f9d3d54a617a996efbc3cd24f3dd..e6f165e5af5f405f425ace36b469f96474a02d39 100644
--- a/tests/Cursor/CursorTest.phpt
+++ b/tests/Cursor/CursorTest.phpt
@@ -3,7 +3,7 @@
  * @testCase
  */
 
-namespace Grifart\Mappi\Tests\Store\Cursor;
+namespace Grifart\Mappi\Tests\Cursor;
 
 use Grifart\Mappi\Cursor\Cursor;
 use Grifart\Mappi\Cursor\Driver\ArrayCursorDriver;
diff --git a/tests/Cursor/ICursorTest.php b/tests/Cursor/ICursorTest.php
index 5c45a8213c1a744fe27bb95391e0f0ad965cb0ca..9749ae564de34a8929a73d7ce5ae72bd39219fad 100644
--- a/tests/Cursor/ICursorTest.php
+++ b/tests/Cursor/ICursorTest.php
@@ -3,7 +3,7 @@
  * @testCase
  */
 
-namespace Grifart\Mappi\Tests\Store\Cursor;
+namespace Grifart\Mappi\Tests\Cursor;
 
 use Grifart\Mappi\Cursor\ICursor;
 use Grifart\Mappi\Tests\Store\BaseTest;
@@ -15,7 +15,7 @@ use Tester\Assert;
  * This file is using Given-When-Then naming convention.
  * @link http://martinfowler.com/bliki/GivenWhenThen.html
  *
- * @package Grifart\Mappi\Tests\Store\Cursor
+ * @package Grifart\Mappi\Tests\Cursor
  */
 abstract class ICursorTest extends BaseTest
 {
diff --git a/tests/Cursor/PostgresCursorTest.phpt b/tests/Cursor/PostgresCursorTest.phpt
index cd4444b76942c495082db58ec41259f553db85e5..97e8a0c4ff5a2600cad1925dabba2a3cfc5a00f0 100644
--- a/tests/Cursor/PostgresCursorTest.phpt
+++ b/tests/Cursor/PostgresCursorTest.phpt
@@ -3,7 +3,7 @@
  * @testCase
  */
 
-namespace Grifart\Mappi\Tests\Store\Cursor;
+namespace Grifart\Mappi\Tests\Cursor;
 
 use Dibi\DriverException;
 use Grifart\Mappi\Cursor\Driver\PostgresCursorFactory;
diff --git a/tests/Cursor/SemanticCursorIntegration.phpt b/tests/Cursor/SemanticCursorIntegration.phpt
index 95dc3e0d99c19b5941a9463432ebccce5db238d7..b343ec84dd8985b5c2bedae8354cf14af4b84a10 100644
--- a/tests/Cursor/SemanticCursorIntegration.phpt
+++ b/tests/Cursor/SemanticCursorIntegration.phpt
@@ -3,7 +3,7 @@
  * @testCase
  */
 
-namespace Grifart\Mappi\Tests\Store\Cursor;
+namespace Grifart\Mappi\Tests\Cursor;
 
 use Grifart\Mappi\Cursor\Cursor;
 use Grifart\Mappi\Cursor\Driver\ArrayCursorDriver;
@@ -17,7 +17,7 @@ require_once __DIR__ . "/ICursorTest.php";
  * Behavioral test for SemanticCursor using mocking.
  * @link http://docs.mockery.io/en/latest/
  *
- * @package Grifart\Mappi\Tests\Store\Cursor
+ * @package Grifart\Mappi\Tests\Cursor
  */
 class SemanticCursorIntegrationTest extends ICursorTest
 {
diff --git a/tests/Cursor/SemanticCursorTest.phpt b/tests/Cursor/SemanticCursorTest.phpt
index 329f7edbc7574f5751f924f7acbdb2efe3dac227..fc3bb3c70c087be5553d65200d6806230936c448 100644
--- a/tests/Cursor/SemanticCursorTest.phpt
+++ b/tests/Cursor/SemanticCursorTest.phpt
@@ -3,7 +3,7 @@
  * @testCase
  */
 
-namespace Grifart\Mappi\Tests\Store\Cursor;
+namespace Grifart\Mappi\Tests\Cursor;
 
 use Grifart\Mappi\Cursor\CursorException;
 use Grifart\Mappi\Cursor\ICursor;
@@ -19,7 +19,7 @@ require_once __DIR__ . "/ICursorTest.php";
  * Behavioral test for SemanticCursor using mocking.
  * @link http://docs.mockery.io/en/latest/
  *
- * @package Grifart\Mappi\Tests\Store\Cursor
+ * @package Grifart\Mappi\Tests\Cursor
  */
 class SemanticCursorTest extends BaseTest
 {
diff --git a/tests/Cursor/TrackedCursorTest.phpt b/tests/Cursor/TrackedCursorTest.phpt
index cc6b98fba1bd56fff1a6cccc027c7982469d14dc..570473598bf9b89b81a4eb27ccad34f9f1c2a53e 100644
--- a/tests/Cursor/TrackedCursorTest.phpt
+++ b/tests/Cursor/TrackedCursorTest.phpt
@@ -6,7 +6,7 @@
 // TODO: moveBy() ->isOnRecord() ->moveBy() ->isOnRecord() (now I see state before and after command)
 // TODO: Maybe construct Cursor class in TrackedCursor constructor?
 
-namespace Grifart\Mappi\Tests\Store\Cursor;
+namespace Grifart\Mappi\Tests\Cursor;
 
 use Grifart\Mappi\Cursor\Cursor;
 use Grifart\Mappi\Cursor\CursorPosition;