diff --git a/compile.lsp b/eval-and-compile/compile.lsp
similarity index 100%
rename from compile.lsp
rename to eval-and-compile/compile.lsp
diff --git a/compiler-macros.lsp b/eval-and-compile/compiler-macros.lsp
similarity index 100%
rename from compiler-macros.lsp
rename to eval-and-compile/compiler-macros.lsp
diff --git a/constantp.lsp b/eval-and-compile/constantp.lsp
similarity index 100%
rename from constantp.lsp
rename to eval-and-compile/constantp.lsp
diff --git a/declaim.lsp b/eval-and-compile/declaim.lsp
similarity index 100%
rename from declaim.lsp
rename to eval-and-compile/declaim.lsp
diff --git a/declaration.lsp b/eval-and-compile/declaration.lsp
similarity index 100%
rename from declaration.lsp
rename to eval-and-compile/declaration.lsp
diff --git a/define-compiler-macro.lsp b/eval-and-compile/define-compiler-macro.lsp
similarity index 100%
rename from define-compiler-macro.lsp
rename to eval-and-compile/define-compiler-macro.lsp
diff --git a/define-symbol-macro.lsp b/eval-and-compile/define-symbol-macro.lsp
similarity index 100%
rename from define-symbol-macro.lsp
rename to eval-and-compile/define-symbol-macro.lsp
diff --git a/defmacro.lsp b/eval-and-compile/defmacro.lsp
similarity index 100%
rename from defmacro.lsp
rename to eval-and-compile/defmacro.lsp
diff --git a/deftype.lsp b/eval-and-compile/deftype.lsp
similarity index 100%
rename from deftype.lsp
rename to eval-and-compile/deftype.lsp
diff --git a/dynamic-extent.lsp b/eval-and-compile/dynamic-extent.lsp
similarity index 100%
rename from dynamic-extent.lsp
rename to eval-and-compile/dynamic-extent.lsp
diff --git a/eval-and-compile.lsp b/eval-and-compile/eval-and-compile.lsp
similarity index 100%
rename from eval-and-compile.lsp
rename to eval-and-compile/eval-and-compile.lsp
diff --git a/data-and-control-flow/eval-when.lsp b/eval-and-compile/eval-when.lsp
similarity index 100%
rename from data-and-control-flow/eval-when.lsp
rename to eval-and-compile/eval-when.lsp
diff --git a/eval.lsp b/eval-and-compile/eval.lsp
similarity index 100%
rename from eval.lsp
rename to eval-and-compile/eval.lsp
diff --git a/ignorable.lsp b/eval-and-compile/ignorable.lsp
similarity index 100%
rename from ignorable.lsp
rename to eval-and-compile/ignorable.lsp
diff --git a/ignore.lsp b/eval-and-compile/ignore.lsp
similarity index 100%
rename from ignore.lsp
rename to eval-and-compile/ignore.lsp
diff --git a/lambda.lsp b/eval-and-compile/lambda.lsp
similarity index 100%
rename from lambda.lsp
rename to eval-and-compile/lambda.lsp
diff --git a/locally.lsp b/eval-and-compile/locally.lsp
similarity index 100%
rename from locally.lsp
rename to eval-and-compile/locally.lsp
diff --git a/macro-function.lsp b/eval-and-compile/macro-function.lsp
similarity index 100%
rename from macro-function.lsp
rename to eval-and-compile/macro-function.lsp
diff --git a/macroexpand-1.lsp b/eval-and-compile/macroexpand-1.lsp
similarity index 100%
rename from macroexpand-1.lsp
rename to eval-and-compile/macroexpand-1.lsp
diff --git a/macroexpand.lsp b/eval-and-compile/macroexpand.lsp
similarity index 100%
rename from macroexpand.lsp
rename to eval-and-compile/macroexpand.lsp
diff --git a/optimize.lsp b/eval-and-compile/optimize.lsp
similarity index 100%
rename from optimize.lsp
rename to eval-and-compile/optimize.lsp
diff --git a/proclaim.lsp b/eval-and-compile/proclaim.lsp
similarity index 100%
rename from proclaim.lsp
rename to eval-and-compile/proclaim.lsp
diff --git a/special.lsp b/eval-and-compile/special.lsp
similarity index 100%
rename from special.lsp
rename to eval-and-compile/special.lsp
diff --git a/symbol-macrolet.lsp b/eval-and-compile/symbol-macrolet.lsp
similarity index 100%
rename from symbol-macrolet.lsp
rename to eval-and-compile/symbol-macrolet.lsp
diff --git a/the.lsp b/eval-and-compile/the.lsp
similarity index 100%
rename from the.lsp
rename to eval-and-compile/the.lsp
diff --git a/load-eval-and-compile.lsp b/load-eval-and-compile.lsp
index 264ff4cf5f8ab91b15724278f0b0f8e24e2fb8d1..20a88532e63fae90f1dcaed20face9fcd3fd87ba 100644
--- a/load-eval-and-compile.lsp
+++ b/load-eval-and-compile.lsp
@@ -1,26 +1,26 @@
 ;;; Tests of evaluation and compilation
-(load "eval.lsp")
-(load "eval-and-compile.lsp")
-(load "compile.lsp")
-(load "compiler-macros.lsp")
-(load "constantp.lsp")
-(load "lambda.lsp")
-(load "eval-when.lsp")
-(load "define-compiler-macro.lsp")
-(load "define-symbol-macro.lsp")
-(load "defmacro.lsp")
-(load "the.lsp")
-(load "symbol-macrolet.lsp")
-(load "proclaim.lsp")
-(load "declaim.lsp")
-(load "locally.lsp")
-(load "ignore.lsp")
-(load "ignorable.lsp")
-(load "dynamic-extent.lsp")
-(load "optimize.lsp")
-(load "special.lsp")
-(load "macroexpand.lsp")
-(load "macroexpand-1.lsp")
-(load "declaration.lsp")
-(load "type.lsp")
-(load "macro-function.lsp")
+(load "eval-and-compile/eval.lsp")
+(load "eval-and-compile/eval-and-compile.lsp")
+(load "eval-and-compile/compile.lsp")
+(load "eval-and-compile/compiler-macros.lsp")
+(load "eval-and-compile/constantp.lsp")
+(load "eval-and-compile/lambda.lsp")
+(load "eval-and-compile/eval-when.lsp")
+(load "eval-and-compile/define-compiler-macro.lsp")
+(load "eval-and-compile/define-symbol-macro.lsp")
+(load "eval-and-compile/defmacro.lsp")
+(load "eval-and-compile/the.lsp")
+(load "eval-and-compile/symbol-macrolet.lsp")
+(load "eval-and-compile/proclaim.lsp")
+(load "eval-and-compile/declaim.lsp")
+(load "eval-and-compile/locally.lsp")
+(load "eval-and-compile/ignore.lsp")
+(load "eval-and-compile/ignorable.lsp")
+(load "eval-and-compile/dynamic-extent.lsp")
+(load "eval-and-compile/optimize.lsp")
+(load "eval-and-compile/special.lsp")
+(load "eval-and-compile/macroexpand.lsp")
+(load "eval-and-compile/macroexpand-1.lsp")
+(load "eval-and-compile/declaration.lsp")
+(load "eval-and-compile/type.lsp")
+(load "eval-and-compile/macro-function.lsp")