diff --git a/load-reader.lsp b/load-reader.lsp
index 1a400ce07629d084b2c0b8d617786b841a9dfe26..b0fad8cacaa506a56afa01c94a8f6fee95a2b9b6 100644
--- a/load-reader.lsp
+++ b/load-reader.lsp
@@ -5,20 +5,20 @@
 
 (in-package :cl-test)
 
-(load "reader-test.lsp")
-(load "with-standard-io-syntax.lsp")
-(load "copy-readtable.lsp")
-(load "read.lsp")
-(load "read-preserving-whitespace.lsp")
-(load "read-delimited-list.lsp")
-(load "read-from-string.lsp")
-(load "readtable-case.lsp")
-(load "readtablep.lsp")
-(load "get-macro-character.lsp")
-(load "set-macro-character.lsp")
-(load "read-suppress.lsp")
-(load "set-syntax-from-char.lsp")
-(load "dispatch-macro-characters.lsp")
+(load "reader/reader-test.lsp")
+(load "reader/with-standard-io-syntax.lsp")
+(load "reader/copy-readtable.lsp")
+(load "reader/read.lsp")
+(load "reader/read-preserving-whitespace.lsp")
+(load "reader/read-delimited-list.lsp")
+(load "reader/read-from-string.lsp")
+(load "reader/readtable-case.lsp")
+(load "reader/readtablep.lsp")
+(load "reader/get-macro-character.lsp")
+(load "reader/set-macro-character.lsp")
+(load "reader/read-suppress.lsp")
+(load "reader/set-syntax-from-char.lsp")
+(load "reader/dispatch-macro-characters.lsp")
 
-(load "syntax.lsp")
-(load "syntax-tokens.lsp")
+(load "reader/syntax.lsp")
+(load "reader/syntax-tokens.lsp")
diff --git a/copy-readtable.lsp b/reader/copy-readtable.lsp
similarity index 100%
rename from copy-readtable.lsp
rename to reader/copy-readtable.lsp
diff --git a/dispatch-macro-characters.lsp b/reader/dispatch-macro-characters.lsp
similarity index 100%
rename from dispatch-macro-characters.lsp
rename to reader/dispatch-macro-characters.lsp
diff --git a/get-macro-character.lsp b/reader/get-macro-character.lsp
similarity index 100%
rename from get-macro-character.lsp
rename to reader/get-macro-character.lsp
diff --git a/read-delimited-list.lsp b/reader/read-delimited-list.lsp
similarity index 100%
rename from read-delimited-list.lsp
rename to reader/read-delimited-list.lsp
diff --git a/read-from-string.lsp b/reader/read-from-string.lsp
similarity index 100%
rename from read-from-string.lsp
rename to reader/read-from-string.lsp
diff --git a/read-preserving-whitespace.lsp b/reader/read-preserving-whitespace.lsp
similarity index 100%
rename from read-preserving-whitespace.lsp
rename to reader/read-preserving-whitespace.lsp
diff --git a/read-suppress.lsp b/reader/read-suppress.lsp
similarity index 100%
rename from read-suppress.lsp
rename to reader/read-suppress.lsp
diff --git a/read.lsp b/reader/read.lsp
similarity index 100%
rename from read.lsp
rename to reader/read.lsp
diff --git a/reader-test.lsp b/reader/reader-test.lsp
similarity index 100%
rename from reader-test.lsp
rename to reader/reader-test.lsp
diff --git a/readtable-case.lsp b/reader/readtable-case.lsp
similarity index 100%
rename from readtable-case.lsp
rename to reader/readtable-case.lsp
diff --git a/readtablep.lsp b/reader/readtablep.lsp
similarity index 100%
rename from readtablep.lsp
rename to reader/readtablep.lsp
diff --git a/set-macro-character.lsp b/reader/set-macro-character.lsp
similarity index 100%
rename from set-macro-character.lsp
rename to reader/set-macro-character.lsp
diff --git a/set-syntax-from-char.lsp b/reader/set-syntax-from-char.lsp
similarity index 100%
rename from set-syntax-from-char.lsp
rename to reader/set-syntax-from-char.lsp
diff --git a/syntax-tokens.lsp b/reader/syntax-tokens.lsp
similarity index 100%
rename from syntax-tokens.lsp
rename to reader/syntax-tokens.lsp
diff --git a/syntax.lsp b/reader/syntax.lsp
similarity index 100%
rename from syntax.lsp
rename to reader/syntax.lsp
diff --git a/with-standard-io-syntax.lsp b/reader/with-standard-io-syntax.lsp
similarity index 100%
rename from with-standard-io-syntax.lsp
rename to reader/with-standard-io-syntax.lsp