diff --git a/bin/glance-prefetcher b/bin/image_cache/glance-prefetcher
similarity index 97%
rename from bin/glance-prefetcher
rename to bin/image_cache/glance-prefetcher
index a7799a0ce3..63a83de125 100755
--- a/bin/glance-prefetcher
+++ b/bin/image_cache/glance-prefetcher
@@ -31,6 +31,7 @@ import sys
 # If ../glance/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
 possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
+                                   os.pardir,
                                    os.pardir,
                                    os.pardir))
 if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')):
diff --git a/bin/glance-pruner b/bin/image_cache/glance-pruner
similarity index 97%
rename from bin/glance-pruner
rename to bin/image_cache/glance-pruner
index e164036070..c28fecbee8 100755
--- a/bin/glance-pruner
+++ b/bin/image_cache/glance-pruner
@@ -31,6 +31,7 @@ import sys
 # If ../glance/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
 possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
+                                   os.pardir,
                                    os.pardir,
                                    os.pardir))
 if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')):
diff --git a/bin/glance-reaper b/bin/image_cache/glance-reaper
similarity index 98%
rename from bin/glance-reaper
rename to bin/image_cache/glance-reaper
index 67e9bf3ccb..f5ca84adc7 100755
--- a/bin/glance-reaper
+++ b/bin/image_cache/glance-reaper
@@ -36,6 +36,7 @@ import sys
 # If ../glance/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
 possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
+                                   os.pardir,
                                    os.pardir,
                                    os.pardir))
 if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')):
diff --git a/setup.py b/setup.py
index 21253afe87..9722b21936 100644
--- a/setup.py
+++ b/setup.py
@@ -89,8 +89,8 @@ setup(
              'bin/glance-api',
              'bin/glance-control',
              'bin/glance-manage',
-             'bin/glance-prefetcher',
-             'bin/glance-pruner',
-             'bin/glance-reaper',
              'bin/glance-registry',
-             'bin/glance-upload'])
+             'bin/glance-upload',
+             'bin/image_cache/glance-prefetcher',
+             'bin/image_cache/glance-pruner',
+             'bin/image_cache/glance-reaper'])