diff --git a/Makefile.am b/Makefile.am
index 6b94fe516db1fc9725f84e339f465c2a90940753..5a88d5402383b1851ebcc1c5149b1735285af958 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -265,7 +265,6 @@ pkgpython_PYTHON = \
 	lib/compat.py \
 	lib/config.py \
 	lib/constants.py \
-	lib/container.py \
 	lib/daemon.py \
 	lib/errors.py \
 	lib/hooksmaster.py \
@@ -320,6 +319,7 @@ storage_PYTHON = \
 	lib/storage/__init__.py \
 	lib/storage/bdev.py \
 	lib/storage/base.py \
+	lib/storage/container.py \
 	lib/storage/drbd.py \
 	lib/storage/drbd_info.py \
 	lib/storage/drbd_cmdgen.py
@@ -1153,7 +1153,7 @@ python_tests = \
 	test/py/ganeti.confd.client_unittest.py \
 	test/py/ganeti.config_unittest.py \
 	test/py/ganeti.constants_unittest.py \
-	test/py/ganeti.container_unittest.py \
+	test/py/ganeti.storage.container_unittest.py \
 	test/py/ganeti.daemon_unittest.py \
 	test/py/ganeti.errors_unittest.py \
 	test/py/ganeti.hooks_unittest.py \
diff --git a/lib/server/noded.py b/lib/server/noded.py
index 48dc3050af3b696716fa4cc6c747c1295263743e..fbaff89e2db0b9e32a991d9a4a631d904c294b27 100644
--- a/lib/server/noded.py
+++ b/lib/server/noded.py
@@ -45,7 +45,7 @@ from ganeti import jstore
 from ganeti import daemon
 from ganeti import http
 from ganeti import utils
-from ganeti import container
+from ganeti.storage import container
 from ganeti import serializer
 from ganeti import netutils
 from ganeti import pathutils
diff --git a/lib/container.py b/lib/storage/container.py
similarity index 100%
rename from lib/container.py
rename to lib/storage/container.py
diff --git a/test/py/ganeti.container_unittest.py b/test/py/ganeti.storage.container_unittest.py
similarity index 99%
rename from test/py/ganeti.container_unittest.py
rename to test/py/ganeti.storage.container_unittest.py
index 808c1ccf83e714d8abf50bac238e4087a60122dd..e8811cc27f461ff8a254166045fb426113fec1e6 100755
--- a/test/py/ganeti.container_unittest.py
+++ b/test/py/ganeti.storage.container_unittest.py
@@ -29,7 +29,7 @@ from ganeti import constants
 from ganeti import utils
 from ganeti import compat
 from ganeti import errors
-from ganeti import container
+from ganeti.storage import container
 
 import testutils