diff --git a/abort.lsp b/conditions/abort.lsp
similarity index 100%
rename from abort.lsp
rename to conditions/abort.lsp
diff --git a/arithmetic-error.lsp b/conditions/arithmetic-error.lsp
similarity index 100%
rename from arithmetic-error.lsp
rename to conditions/arithmetic-error.lsp
diff --git a/assert.lsp b/conditions/assert.lsp
similarity index 100%
rename from assert.lsp
rename to conditions/assert.lsp
diff --git a/cell-error-name.lsp b/conditions/cell-error-name.lsp
similarity index 100%
rename from cell-error-name.lsp
rename to conditions/cell-error-name.lsp
diff --git a/cerror.lsp b/conditions/cerror.lsp
similarity index 100%
rename from cerror.lsp
rename to conditions/cerror.lsp
diff --git a/check-type.lsp b/conditions/check-type.lsp
similarity index 100%
rename from check-type.lsp
rename to conditions/check-type.lsp
diff --git a/compute-restarts.lsp b/conditions/compute-restarts.lsp
similarity index 100%
rename from compute-restarts.lsp
rename to conditions/compute-restarts.lsp
diff --git a/condition.lsp b/conditions/condition.lsp
similarity index 100%
rename from condition.lsp
rename to conditions/condition.lsp
diff --git a/continue.lsp b/conditions/continue.lsp
similarity index 100%
rename from continue.lsp
rename to conditions/continue.lsp
diff --git a/define-condition.lsp b/conditions/define-condition.lsp
similarity index 100%
rename from define-condition.lsp
rename to conditions/define-condition.lsp
diff --git a/handler-bind.lsp b/conditions/handler-bind.lsp
similarity index 100%
rename from handler-bind.lsp
rename to conditions/handler-bind.lsp
diff --git a/handler-case.lsp b/conditions/handler-case.lsp
similarity index 100%
rename from handler-case.lsp
rename to conditions/handler-case.lsp
diff --git a/ignore-errors.lsp b/conditions/ignore-errors.lsp
similarity index 100%
rename from ignore-errors.lsp
rename to conditions/ignore-errors.lsp
diff --git a/invoke-debugger.lsp b/conditions/invoke-debugger.lsp
similarity index 100%
rename from invoke-debugger.lsp
rename to conditions/invoke-debugger.lsp
diff --git a/make-condition.lsp b/conditions/make-condition.lsp
similarity index 100%
rename from make-condition.lsp
rename to conditions/make-condition.lsp
diff --git a/muffle-warning.lsp b/conditions/muffle-warning.lsp
similarity index 100%
rename from muffle-warning.lsp
rename to conditions/muffle-warning.lsp
diff --git a/restart-bind.lsp b/conditions/restart-bind.lsp
similarity index 100%
rename from restart-bind.lsp
rename to conditions/restart-bind.lsp
diff --git a/restart-case.lsp b/conditions/restart-case.lsp
similarity index 100%
rename from restart-case.lsp
rename to conditions/restart-case.lsp
diff --git a/store-value.lsp b/conditions/store-value.lsp
similarity index 100%
rename from store-value.lsp
rename to conditions/store-value.lsp
diff --git a/use-value.lsp b/conditions/use-value.lsp
similarity index 100%
rename from use-value.lsp
rename to conditions/use-value.lsp
diff --git a/warn.lsp b/conditions/warn.lsp
similarity index 100%
rename from warn.lsp
rename to conditions/warn.lsp
diff --git a/with-condition-restarts.lsp b/conditions/with-condition-restarts.lsp
similarity index 100%
rename from with-condition-restarts.lsp
rename to conditions/with-condition-restarts.lsp
diff --git a/with-simple-restart.lsp b/conditions/with-simple-restart.lsp
similarity index 100%
rename from with-simple-restart.lsp
rename to conditions/with-simple-restart.lsp
diff --git a/load-conditions.lsp b/load-conditions.lsp
index 9061e22e47a1342936e16a49243cbe292f9380bf..e83a8c6b02ac4a02826cc774db6746d3e288c1da 100644
--- a/load-conditions.lsp
+++ b/load-conditions.lsp
@@ -1,26 +1,26 @@
 ;;; Tests of conditions
 (compile-and-load "types-aux.lsp")
 (compile-and-load "define-condition-aux.lsp")
-(load "condition.lsp")
-(load "cell-error-name.lsp")
-(load "assert.lsp")
-(load "error.lsp")
-(load "cerror.lsp")
-(load "check-type.lsp")
-(load "warn.lsp")
-(load "invoke-debugger.lsp")
-(load "handler-bind.lsp")
-(load "handler-case.lsp")
-(load "ignore-errors.lsp")
-(load "define-condition.lsp")
-(load "compute-restarts.lsp")
-(load "restart-bind.lsp")
-(load "restart-case.lsp")
-(load "with-condition-restarts.lsp")
-(load "with-simple-restart.lsp")
-(load "abort.lsp")
-(load "muffle-warning.lsp")
-(load "continue.lsp")
-(load "store-value.lsp")
-(load "use-value.lsp")
-(load "make-condition.lsp")
+(load "conditions/condition.lsp")
+(load "conditions/cell-error-name.lsp")
+(load "conditions/assert.lsp")
+(load "conditions/error.lsp")
+(load "conditions/cerror.lsp")
+(load "conditions/check-type.lsp")
+(load "conditions/warn.lsp")
+(load "conditions/invoke-debugger.lsp")
+(load "conditions/handler-bind.lsp")
+(load "conditions/handler-case.lsp")
+(load "conditions/ignore-errors.lsp")
+(load "conditions/define-condition.lsp")
+(load "conditions/compute-restarts.lsp")
+(load "conditions/restart-bind.lsp")
+(load "conditions/restart-case.lsp")
+(load "conditions/with-condition-restarts.lsp")
+(load "conditions/with-simple-restart.lsp")
+(load "conditions/abort.lsp")
+(load "conditions/muffle-warning.lsp")
+(load "conditions/continue.lsp")
+(load "conditions/store-value.lsp")
+(load "conditions/use-value.lsp")
+(load "conditions/make-condition.lsp")