diff --git a/organize/personal/storage/favorite.py b/organize/personal/storage/favorite.py
index f1af16c..83b34f1 100644
--- a/organize/personal/storage/favorite.py
+++ b/organize/personal/storage/favorite.py
@@ -4,16 +4,16 @@
 
 from cco.storage.common import registerContainerClass
 from loops.organize.personal.favorite import BaseFavorite
-from loops.organize.tracking.storage import compat
+from loops.storage.compat import tracking
 
 
-class Favorite(BaseFavorite, compat.Track):
+class Favorite(BaseFavorite, tracking.Track):
 
     prefix = 'fav'
 
 
 @registerContainerClass
-class Favorites(compat.Container):
+class Favorites(tracking.Container):
 
     itemFactory = Favorite
     tableName = 'favorites'
diff --git a/organize/tracking/storage/__init__.py b/organize/tracking/storage/__init__.py
deleted file mode 100644
index ff95f03..0000000
--- a/organize/tracking/storage/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-#  package loops.organize.tracking.storage
diff --git a/storage/compat/__init__.py b/storage/compat/__init__.py
new file mode 100644
index 0000000..765dbff
--- /dev/null
+++ b/storage/compat/__init__.py
@@ -0,0 +1,4 @@
+# package loops.storage.compat
+
+"""Compatibility layer for new SQL-based storage implementation.
+"""
diff --git a/organize/tracking/storage/compat.py b/storage/compat/tracking.py
similarity index 94%
rename from organize/tracking/storage/compat.py
rename to storage/compat/tracking.py
index 9724d81..92f14b8 100644
--- a/organize/tracking/storage/compat.py
+++ b/storage/compat/tracking.py
@@ -1,4 +1,4 @@
-# loops.organize.tracking.storage.compat
+# loops.storage.compat.tracking
 
 """loops compatibility layer on cco.storage.tracking.
 
diff --git a/storage/migration/__init__.py b/storage/migration/__init__.py
new file mode 100644
index 0000000..5a64432
--- /dev/null
+++ b/storage/migration/__init__.py
@@ -0,0 +1,3 @@
+# package loops.storage.migration
+
+"""Tools for migration of objects from ZODB to SQL-based storage."""
diff --git a/organize/tracking/storage/migration.py b/storage/migration/tracking.py
similarity index 92%
rename from organize/tracking/storage/migration.py
rename to storage/migration/tracking.py
index 4321d2a..58ef590 100644
--- a/organize/tracking/storage/migration.py
+++ b/storage/migration/tracking.py
@@ -1,6 +1,6 @@
-# loops.organize.tracking.storage.migration
+# loops.storage.migration.tracking
 
-"""Tools for migration ZODB-/BTree-based tracks to SQL-base records."""
+"""Tools for migration of ZODB-/BTree-based tracks to SQL-based records."""
 
 from datetime import datetime
 import transaction
diff --git a/storage/tests/test_storage.py b/storage/tests/test_storage.py
index 6076aeb..4efd815 100644
--- a/storage/tests/test_storage.py
+++ b/storage/tests/test_storage.py
@@ -13,7 +13,7 @@ from loops.config.base import LoopsOptions
 from loops.organize.personal.favorite import Favorites as FavoritesAdapter
 from loops.organize.personal.interfaces import IFavorites
 from loops.organize.personal.storage.favorite import Favorites
-from loops.organize.tracking.storage.migration import migrate
+from loops.storage.migration.tracking import migrate
 from loops.setup import addAndConfigureObject
 from loops.storage.tests import common
 from loops import util