diff --git a/data-and-control-flow/apropos-list.lsp b/environment/apropos-list.lsp
similarity index 100%
rename from data-and-control-flow/apropos-list.lsp
rename to environment/apropos-list.lsp
diff --git a/apropos.lsp b/environment/apropos.lsp
similarity index 100%
rename from apropos.lsp
rename to environment/apropos.lsp
diff --git a/decode-universal-time.lsp b/environment/decode-universal-time.lsp
similarity index 100%
rename from decode-universal-time.lsp
rename to environment/decode-universal-time.lsp
diff --git a/describe.lsp b/environment/describe.lsp
similarity index 100%
rename from describe.lsp
rename to environment/describe.lsp
diff --git a/disassemble.lsp b/environment/disassemble.lsp
similarity index 100%
rename from disassemble.lsp
rename to environment/disassemble.lsp
diff --git a/documentation.lsp b/environment/documentation.lsp
similarity index 100%
rename from documentation.lsp
rename to environment/documentation.lsp
diff --git a/dribble.lsp b/environment/dribble.lsp
similarity index 100%
rename from dribble.lsp
rename to environment/dribble.lsp
diff --git a/ed.lsp b/environment/ed.lsp
similarity index 100%
rename from ed.lsp
rename to environment/ed.lsp
diff --git a/encode-universal-time.lsp b/environment/encode-universal-time.lsp
similarity index 100%
rename from encode-universal-time.lsp
rename to environment/encode-universal-time.lsp
diff --git a/environment-functions.lsp b/environment/environment-functions.lsp
similarity index 100%
rename from environment-functions.lsp
rename to environment/environment-functions.lsp
diff --git a/get-internal-time.lsp b/environment/get-internal-time.lsp
similarity index 100%
rename from get-internal-time.lsp
rename to environment/get-internal-time.lsp
diff --git a/get-universal-time.lsp b/environment/get-universal-time.lsp
similarity index 100%
rename from get-universal-time.lsp
rename to environment/get-universal-time.lsp
diff --git a/inspect.lsp b/environment/inspect.lsp
similarity index 100%
rename from inspect.lsp
rename to environment/inspect.lsp
diff --git a/room.lsp b/environment/room.lsp
similarity index 100%
rename from room.lsp
rename to environment/room.lsp
diff --git a/sleep.lsp b/environment/sleep.lsp
similarity index 100%
rename from sleep.lsp
rename to environment/sleep.lsp
diff --git a/trace.lsp b/environment/trace.lsp
similarity index 100%
rename from trace.lsp
rename to environment/trace.lsp
diff --git a/user-homedir-pathname.lsp b/environment/user-homedir-pathname.lsp
similarity index 100%
rename from user-homedir-pathname.lsp
rename to environment/user-homedir-pathname.lsp
diff --git a/load-environment.lsp b/load-environment.lsp
index 25748e37c8eca6d486f698f5a3524d1403a54d31..bbef07365a5d9c0fc18de3e20d0a6b3450692d0a 100644
--- a/load-environment.lsp
+++ b/load-environment.lsp
@@ -3,24 +3,24 @@
 ;;;; Created:  Sun Dec 12 19:43:17 2004
 ;;;; Contains: Load environment tests (section 25)
 
-(load "apropos.lsp")
-(load "apropos-list.lsp")
-(load "describe.lsp")
-(load "disassemble.lsp")
-(load "environment-functions.lsp")
-(load "room.lsp")
-(load "time.lsp")
-(load "trace.lsp") ;; and untrace
-(load "user-homedir-pathname.lsp")
+(load "environment/apropos.lsp")
+(load "environment/apropos-list.lsp")
+(load "environment/describe.lsp")
+(load "environment/disassemble.lsp")
+(load "environment/environment-functions.lsp")
+(load "environment/room.lsp")
+(load "environment/time.lsp")
+(load "environment/trace.lsp") ;; and untrace
+(load "environment/user-homedir-pathname.lsp")
 
-(load "decode-universal-time.lsp")
-(load "encode-universal-time.lsp")
-(load "get-universal-time.lsp")
-(load "sleep.lsp")
-(load "get-internal-time.lsp")
+(load "environment/decode-universal-time.lsp")
+(load "environment/encode-universal-time.lsp")
+(load "environment/get-universal-time.lsp")
+(load "environment/sleep.lsp")
+(load "environment/get-internal-time.lsp")
 
-(load "documentation.lsp")
-#-lispworks (load "inspect.lsp")
-(load "dribble.lsp")
-(load "ed.lsp")
+(load "environment/documentation.lsp")
+#-lispworks (load "environment/inspect.lsp")
+(load "environment/dribble.lsp")
+(load "environment/ed.lsp")