diff --git a/load-printer.lsp b/load-printer.lsp
index c5bae7e90bafde300e1fd529354d93928b6c98f5..c80d370b5a8e65847fcc179e54fdf3f68c7d64b9 100644
--- a/load-printer.lsp
+++ b/load-printer.lsp
@@ -7,43 +7,43 @@
 
 (compile-and-load "printer-aux.lsp")
 
-(load "copy-pprint-dispatch.lsp")
+(load "printer/copy-pprint-dispatch.lsp")
 
-(load "print-integers.lsp")
-(load "print-ratios.lsp")
-(load "print-floats.lsp")
-(load "print-complex.lsp")
-(load "print-characters.lsp")
-(load "print-symbols.lsp")
-(load "print-strings.lsp")
-(load "print-cons.lsp")
-(load "print-backquote.lsp")
-(load "print-bit-vector.lsp")
-(load "print-vector.lsp")
-(load "print-array.lsp")
-(load "print-random-state.lsp")
-(load "print-pathname.lsp")
-(load "print-structure.lsp")
-(load "printer-control-vars.lsp")
-(load "pprint-dispatch.lsp")
-(load "pprint-fill.lsp")
-(load "pprint-linear.lsp")
-(load "pprint-tabular.lsp")
-(load "pprint-indent.lsp")
-(load "pprint-logical-block.lsp")
-(load "pprint-exit-if-list-exhausted.lsp")
-(load "pprint-newline.lsp")
-(load "pprint-tab.lsp")
-(load "print-unreadable-object.lsp")
-(load "write.lsp")
-(load "print.lsp")
-(load "pprint.lsp")
-(load "prin1.lsp")
-(load "princ.lsp")
-(load "write-to-string.lsp")
-(load "prin1-to-string.lsp")
-(load "princ-to-string.lsp")
-(load "print-level.lsp")
-(load "print-length.lsp")
+(load "printer/print-integers.lsp")
+(load "printer/print-ratios.lsp")
+(load "printer/print-floats.lsp")
+(load "printer/print-complex.lsp")
+(load "printer/print-characters.lsp")
+(load "printer/print-symbols.lsp")
+(load "printer/print-strings.lsp")
+(load "printer/print-cons.lsp")
+(load "printer/print-backquote.lsp")
+(load "printer/print-bit-vector.lsp")
+(load "printer/print-vector.lsp")
+(load "printer/print-array.lsp")
+(load "printer/print-random-state.lsp")
+(load "printer/print-pathname.lsp")
+(load "printer/print-structure.lsp")
+(load "printer/printer-control-vars.lsp")
+(load "printer/pprint-dispatch.lsp")
+(load "printer/pprint-fill.lsp")
+(load "printer/pprint-linear.lsp")
+(load "printer/pprint-tabular.lsp")
+(load "printer/pprint-indent.lsp")
+(load "printer/pprint-logical-block.lsp")
+(load "printer/pprint-exit-if-list-exhausted.lsp")
+(load "printer/pprint-newline.lsp")
+(load "printer/pprint-tab.lsp")
+(load "printer/print-unreadable-object.lsp")
+(load "printer/write.lsp")
+(load "printer/print.lsp")
+(load "printer/pprint.lsp")
+(load "printer/prin1.lsp")
+(load "printer/princ.lsp")
+(load "printer/write-to-string.lsp")
+(load "printer/prin1-to-string.lsp")
+(load "printer/princ-to-string.lsp")
+(load "printer/print-level.lsp")
+(load "printer/print-length.lsp")
 
-(load "load-format.lsp")
+(load "printer/load-format.lsp")
diff --git a/copy-pprint-dispatch.lsp b/printer/copy-pprint-dispatch.lsp
similarity index 100%
rename from copy-pprint-dispatch.lsp
rename to printer/copy-pprint-dispatch.lsp
diff --git a/load-format.lsp b/printer/load-format.lsp
similarity index 100%
rename from load-format.lsp
rename to printer/load-format.lsp
diff --git a/pprint-exit-if-list-exhausted.lsp b/printer/pprint-exit-if-list-exhausted.lsp
similarity index 100%
rename from pprint-exit-if-list-exhausted.lsp
rename to printer/pprint-exit-if-list-exhausted.lsp
diff --git a/pprint-fill.lsp b/printer/pprint-fill.lsp
similarity index 100%
rename from pprint-fill.lsp
rename to printer/pprint-fill.lsp
diff --git a/pprint-indent.lsp b/printer/pprint-indent.lsp
similarity index 100%
rename from pprint-indent.lsp
rename to printer/pprint-indent.lsp
diff --git a/pprint-linear.lsp b/printer/pprint-linear.lsp
similarity index 100%
rename from pprint-linear.lsp
rename to printer/pprint-linear.lsp
diff --git a/pprint-logical-block.lsp b/printer/pprint-logical-block.lsp
similarity index 100%
rename from pprint-logical-block.lsp
rename to printer/pprint-logical-block.lsp
diff --git a/pprint-newline.lsp b/printer/pprint-newline.lsp
similarity index 100%
rename from pprint-newline.lsp
rename to printer/pprint-newline.lsp
diff --git a/pprint-tab.lsp b/printer/pprint-tab.lsp
similarity index 100%
rename from pprint-tab.lsp
rename to printer/pprint-tab.lsp
diff --git a/pprint-tabular.lsp b/printer/pprint-tabular.lsp
similarity index 100%
rename from pprint-tabular.lsp
rename to printer/pprint-tabular.lsp
diff --git a/pprint.lsp b/printer/pprint.lsp
similarity index 100%
rename from pprint.lsp
rename to printer/pprint.lsp
diff --git a/prin1-to-string.lsp b/printer/prin1-to-string.lsp
similarity index 100%
rename from prin1-to-string.lsp
rename to printer/prin1-to-string.lsp
diff --git a/prin1.lsp b/printer/prin1.lsp
similarity index 100%
rename from prin1.lsp
rename to printer/prin1.lsp
diff --git a/princ-to-string.lsp b/printer/princ-to-string.lsp
similarity index 100%
rename from princ-to-string.lsp
rename to printer/princ-to-string.lsp
diff --git a/princ.lsp b/printer/princ.lsp
similarity index 100%
rename from princ.lsp
rename to printer/princ.lsp
diff --git a/print-array.lsp b/printer/print-array.lsp
similarity index 100%
rename from print-array.lsp
rename to printer/print-array.lsp
diff --git a/print-backquote.lsp b/printer/print-backquote.lsp
similarity index 100%
rename from print-backquote.lsp
rename to printer/print-backquote.lsp
diff --git a/print-bit-vector.lsp b/printer/print-bit-vector.lsp
similarity index 100%
rename from print-bit-vector.lsp
rename to printer/print-bit-vector.lsp
diff --git a/print-characters.lsp b/printer/print-characters.lsp
similarity index 100%
rename from print-characters.lsp
rename to printer/print-characters.lsp
diff --git a/print-complex.lsp b/printer/print-complex.lsp
similarity index 100%
rename from print-complex.lsp
rename to printer/print-complex.lsp
diff --git a/print-cons.lsp b/printer/print-cons.lsp
similarity index 100%
rename from print-cons.lsp
rename to printer/print-cons.lsp
diff --git a/print-floats.lsp b/printer/print-floats.lsp
similarity index 100%
rename from print-floats.lsp
rename to printer/print-floats.lsp
diff --git a/print-integers.lsp b/printer/print-integers.lsp
similarity index 100%
rename from print-integers.lsp
rename to printer/print-integers.lsp
diff --git a/print-length.lsp b/printer/print-length.lsp
similarity index 100%
rename from print-length.lsp
rename to printer/print-length.lsp
diff --git a/print-level.lsp b/printer/print-level.lsp
similarity index 100%
rename from print-level.lsp
rename to printer/print-level.lsp
diff --git a/print-pathname.lsp b/printer/print-pathname.lsp
similarity index 100%
rename from print-pathname.lsp
rename to printer/print-pathname.lsp
diff --git a/print-random-state.lsp b/printer/print-random-state.lsp
similarity index 100%
rename from print-random-state.lsp
rename to printer/print-random-state.lsp
diff --git a/print-ratios.lsp b/printer/print-ratios.lsp
similarity index 100%
rename from print-ratios.lsp
rename to printer/print-ratios.lsp
diff --git a/print-strings.lsp b/printer/print-strings.lsp
similarity index 100%
rename from print-strings.lsp
rename to printer/print-strings.lsp
diff --git a/print-structure.lsp b/printer/print-structure.lsp
similarity index 100%
rename from print-structure.lsp
rename to printer/print-structure.lsp
diff --git a/print-symbols.lsp b/printer/print-symbols.lsp
similarity index 100%
rename from print-symbols.lsp
rename to printer/print-symbols.lsp
diff --git a/print-unreadable-object.lsp b/printer/print-unreadable-object.lsp
similarity index 100%
rename from print-unreadable-object.lsp
rename to printer/print-unreadable-object.lsp
diff --git a/print-vector.lsp b/printer/print-vector.lsp
similarity index 100%
rename from print-vector.lsp
rename to printer/print-vector.lsp
diff --git a/printer-control-vars.lsp b/printer/printer-control-vars.lsp
similarity index 100%
rename from printer-control-vars.lsp
rename to printer/printer-control-vars.lsp
diff --git a/write-to-string.lsp b/printer/write-to-string.lsp
similarity index 100%
rename from write-to-string.lsp
rename to printer/write-to-string.lsp
diff --git a/write.lsp b/printer/write.lsp
similarity index 100%
rename from write.lsp
rename to printer/write.lsp