diff --git a/var/spack/repos/builtin/improved-rdock/package.py b/var/spack/repos/builtin/packages/improved-rdock/package.py
similarity index 99%
rename from var/spack/repos/builtin/improved-rdock/package.py
rename to var/spack/repos/builtin/packages/improved-rdock/package.py
index 2da7523a477..9657112f734 100644
--- a/var/spack/repos/builtin/improved-rdock/package.py
+++ b/var/spack/repos/builtin/packages/improved-rdock/package.py
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
-from spack import *
+from spack.package import *
 
 
 class ImprovedRdock(MakefilePackage):
diff --git a/var/spack/repos/builtin/improved-rdock/rdock_const.patch b/var/spack/repos/builtin/packages/improved-rdock/rdock_const.patch
similarity index 100%
rename from var/spack/repos/builtin/improved-rdock/rdock_const.patch
rename to var/spack/repos/builtin/packages/improved-rdock/rdock_const.patch
diff --git a/var/spack/repos/builtin/improved-rdock/rdock_const2.patch b/var/spack/repos/builtin/packages/improved-rdock/rdock_const2.patch
similarity index 100%
rename from var/spack/repos/builtin/improved-rdock/rdock_const2.patch
rename to var/spack/repos/builtin/packages/improved-rdock/rdock_const2.patch
diff --git a/var/spack/repos/builtin/improved-rdock/rdock_erase.patch b/var/spack/repos/builtin/packages/improved-rdock/rdock_erase.patch
similarity index 100%
rename from var/spack/repos/builtin/improved-rdock/rdock_erase.patch
rename to var/spack/repos/builtin/packages/improved-rdock/rdock_erase.patch
diff --git a/var/spack/repos/builtin/improved-rdock/rdock_ld.patch b/var/spack/repos/builtin/packages/improved-rdock/rdock_ld.patch
similarity index 100%
rename from var/spack/repos/builtin/improved-rdock/rdock_ld.patch
rename to var/spack/repos/builtin/packages/improved-rdock/rdock_ld.patch
diff --git a/var/spack/repos/builtin/improved-rdock/rdock_loop.patch b/var/spack/repos/builtin/packages/improved-rdock/rdock_loop.patch
similarity index 100%
rename from var/spack/repos/builtin/improved-rdock/rdock_loop.patch
rename to var/spack/repos/builtin/packages/improved-rdock/rdock_loop.patch
diff --git a/var/spack/repos/builtin/improved-rdock/rdock_newcxx.patch b/var/spack/repos/builtin/packages/improved-rdock/rdock_newcxx.patch
similarity index 100%
rename from var/spack/repos/builtin/improved-rdock/rdock_newcxx.patch
rename to var/spack/repos/builtin/packages/improved-rdock/rdock_newcxx.patch
diff --git a/var/spack/repos/builtin/improved-rdock/rdock_python3.patch b/var/spack/repos/builtin/packages/improved-rdock/rdock_python3.patch
similarity index 100%
rename from var/spack/repos/builtin/improved-rdock/rdock_python3.patch
rename to var/spack/repos/builtin/packages/improved-rdock/rdock_python3.patch
diff --git a/var/spack/repos/builtin/improved-rdock/rdock_useint.patch b/var/spack/repos/builtin/packages/improved-rdock/rdock_useint.patch
similarity index 100%
rename from var/spack/repos/builtin/improved-rdock/rdock_useint.patch
rename to var/spack/repos/builtin/packages/improved-rdock/rdock_useint.patch
diff --git a/var/spack/repos/builtin/improved-rdock/test/test.sh b/var/spack/repos/builtin/packages/improved-rdock/test/test.sh
similarity index 100%
rename from var/spack/repos/builtin/improved-rdock/test/test.sh
rename to var/spack/repos/builtin/packages/improved-rdock/test/test.sh