diff --git a/load-streams.lsp b/load-streams.lsp
index ee9bb9a4f8a38744d0bdbcc7beaf71361a7b8a4b..8fe60c842f4a3cc568840644d80a94a17a13d8d8 100644
--- a/load-streams.lsp
+++ b/load-streams.lsp
@@ -5,53 +5,53 @@
 
 (in-package :cl-test)
 
-(load "input-stream-p.lsp")
-(load "output-stream-p.lsp")
-(load "interactive-stream-p.lsp")
-(load "open-stream-p.lsp")
-(load "stream-element-type.lsp")
-(load "streamp.lsp")
-(load "read-byte.lsp")
-(load "peek-char.lsp")
-(load "read-char.lsp")
-(load "read-char-no-hang.lsp")
-(load "terpri.lsp")
-(load "fresh-line.lsp")
-(load "unread-char.lsp")
-(load "write-char.lsp")
-(load "read-line.lsp")
-(load "write-string.lsp")
-(load "write-line.lsp")
-(load "read-sequence.lsp")
-(load "write-sequence.lsp")
-(load "file-length.lsp")
-(load "file-position.lsp")
-(load "file-string-length.lsp")
-(load "open.lsp")
-(load "stream-external-format.lsp")
-(load "with-open-file.lsp")
-(load "with-open-stream.lsp")
-(load "listen.lsp")
-(load "clear-input.lsp")
-(load "finish-output.lsp")
-(load "force-output.lsp")
-(load "clear-output.lsp")
-(load "make-synonym-stream.lsp")
-(load "synonym-stream-symbol.lsp")
-(load "make-broadcast-stream.lsp")
-(load "broadcast-stream-streams.lsp")
-(load "make-two-way-stream.lsp")
-(load "two-way-stream-input-stream.lsp")
-(load "two-way-stream-output-stream.lsp")
-(load "echo-stream-input-stream.lsp")
-(load "echo-stream-output-stream.lsp")
-(load "make-echo-stream.lsp")
-(load "concatenated-stream-streams.lsp")
-(load "make-concatenated-stream.lsp")
-(load "get-output-stream-string.lsp")
-(load "make-string-input-stream.lsp")
-(load "make-string-output-stream.lsp")
-(load "with-input-from-string.lsp")
-(load "with-output-to-string.lsp")
-(load "stream-error-stream.lsp")
+(load "streams/input-stream-p.lsp")
+(load "streams/output-stream-p.lsp")
+(load "streams/interactive-stream-p.lsp")
+(load "streams/open-stream-p.lsp")
+(load "streams/stream-element-type.lsp")
+(load "streams/streamp.lsp")
+(load "streams/read-byte.lsp")
+(load "streams/peek-char.lsp")
+(load "streams/read-char.lsp")
+(load "streams/read-char-no-hang.lsp")
+(load "streams/terpri.lsp")
+(load "streams/fresh-line.lsp")
+(load "streams/unread-char.lsp")
+(load "streams/write-char.lsp")
+(load "streams/read-line.lsp")
+(load "streams/write-string.lsp")
+(load "streams/write-line.lsp")
+(load "streams/read-sequence.lsp")
+(load "streams/write-sequence.lsp")
+(load "streams/file-length.lsp")
+(load "streams/file-position.lsp")
+(load "streams/file-string-length.lsp")
+(load "streams/open.lsp")
+(load "streams/stream-external-format.lsp")
+(load "streams/with-open-file.lsp")
+(load "streams/with-open-stream.lsp")
+(load "streams/listen.lsp")
+(load "streams/clear-input.lsp")
+(load "streams/finish-output.lsp")
+(load "streams/force-output.lsp")
+(load "streams/clear-output.lsp")
+(load "streams/make-synonym-stream.lsp")
+(load "streams/synonym-stream-symbol.lsp")
+(load "streams/make-broadcast-stream.lsp")
+(load "streams/broadcast-stream-streams.lsp")
+(load "streams/make-two-way-stream.lsp")
+(load "streams/two-way-stream-input-stream.lsp")
+(load "streams/two-way-stream-output-stream.lsp")
+(load "streams/echo-stream-input-stream.lsp")
+(load "streams/echo-stream-output-stream.lsp")
+(load "streams/make-echo-stream.lsp")
+(load "streams/concatenated-stream-streams.lsp")
+(load "streams/make-concatenated-stream.lsp")
+(load "streams/get-output-stream-string.lsp")
+(load "streams/make-string-input-stream.lsp")
+(load "streams/make-string-output-stream.lsp")
+(load "streams/with-input-from-string.lsp")
+(load "streams/with-output-to-string.lsp")
+(load "streams/stream-error-stream.lsp")
 
diff --git a/broadcast-stream-streams.lsp b/streams/broadcast-stream-streams.lsp
similarity index 100%
rename from broadcast-stream-streams.lsp
rename to streams/broadcast-stream-streams.lsp
diff --git a/clear-input.lsp b/streams/clear-input.lsp
similarity index 100%
rename from clear-input.lsp
rename to streams/clear-input.lsp
diff --git a/clear-output.lsp b/streams/clear-output.lsp
similarity index 100%
rename from clear-output.lsp
rename to streams/clear-output.lsp
diff --git a/concatenated-stream-streams.lsp b/streams/concatenated-stream-streams.lsp
similarity index 100%
rename from concatenated-stream-streams.lsp
rename to streams/concatenated-stream-streams.lsp
diff --git a/echo-stream-input-stream.lsp b/streams/echo-stream-input-stream.lsp
similarity index 100%
rename from echo-stream-input-stream.lsp
rename to streams/echo-stream-input-stream.lsp
diff --git a/echo-stream-output-stream.lsp b/streams/echo-stream-output-stream.lsp
similarity index 100%
rename from echo-stream-output-stream.lsp
rename to streams/echo-stream-output-stream.lsp
diff --git a/file-length.lsp b/streams/file-length.lsp
similarity index 100%
rename from file-length.lsp
rename to streams/file-length.lsp
diff --git a/file-position.lsp b/streams/file-position.lsp
similarity index 100%
rename from file-position.lsp
rename to streams/file-position.lsp
diff --git a/file-string-length.lsp b/streams/file-string-length.lsp
similarity index 100%
rename from file-string-length.lsp
rename to streams/file-string-length.lsp
diff --git a/finish-output.lsp b/streams/finish-output.lsp
similarity index 100%
rename from finish-output.lsp
rename to streams/finish-output.lsp
diff --git a/force-output.lsp b/streams/force-output.lsp
similarity index 100%
rename from force-output.lsp
rename to streams/force-output.lsp
diff --git a/fresh-line.lsp b/streams/fresh-line.lsp
similarity index 100%
rename from fresh-line.lsp
rename to streams/fresh-line.lsp
diff --git a/get-output-stream-string.lsp b/streams/get-output-stream-string.lsp
similarity index 100%
rename from get-output-stream-string.lsp
rename to streams/get-output-stream-string.lsp
diff --git a/input-stream-p.lsp b/streams/input-stream-p.lsp
similarity index 100%
rename from input-stream-p.lsp
rename to streams/input-stream-p.lsp
diff --git a/interactive-stream-p.lsp b/streams/interactive-stream-p.lsp
similarity index 100%
rename from interactive-stream-p.lsp
rename to streams/interactive-stream-p.lsp
diff --git a/listen.lsp b/streams/listen.lsp
similarity index 100%
rename from listen.lsp
rename to streams/listen.lsp
diff --git a/make-broadcast-stream.lsp b/streams/make-broadcast-stream.lsp
similarity index 100%
rename from make-broadcast-stream.lsp
rename to streams/make-broadcast-stream.lsp
diff --git a/make-concatenated-stream.lsp b/streams/make-concatenated-stream.lsp
similarity index 100%
rename from make-concatenated-stream.lsp
rename to streams/make-concatenated-stream.lsp
diff --git a/make-echo-stream.lsp b/streams/make-echo-stream.lsp
similarity index 100%
rename from make-echo-stream.lsp
rename to streams/make-echo-stream.lsp
diff --git a/make-string-input-stream.lsp b/streams/make-string-input-stream.lsp
similarity index 100%
rename from make-string-input-stream.lsp
rename to streams/make-string-input-stream.lsp
diff --git a/make-string-output-stream.lsp b/streams/make-string-output-stream.lsp
similarity index 100%
rename from make-string-output-stream.lsp
rename to streams/make-string-output-stream.lsp
diff --git a/make-synonym-stream.lsp b/streams/make-synonym-stream.lsp
similarity index 100%
rename from make-synonym-stream.lsp
rename to streams/make-synonym-stream.lsp
diff --git a/make-two-way-stream.lsp b/streams/make-two-way-stream.lsp
similarity index 100%
rename from make-two-way-stream.lsp
rename to streams/make-two-way-stream.lsp
diff --git a/open-stream-p.lsp b/streams/open-stream-p.lsp
similarity index 100%
rename from open-stream-p.lsp
rename to streams/open-stream-p.lsp
diff --git a/open.lsp b/streams/open.lsp
similarity index 100%
rename from open.lsp
rename to streams/open.lsp
diff --git a/output-stream-p.lsp b/streams/output-stream-p.lsp
similarity index 100%
rename from output-stream-p.lsp
rename to streams/output-stream-p.lsp
diff --git a/peek-char.lsp b/streams/peek-char.lsp
similarity index 100%
rename from peek-char.lsp
rename to streams/peek-char.lsp
diff --git a/read-byte.lsp b/streams/read-byte.lsp
similarity index 100%
rename from read-byte.lsp
rename to streams/read-byte.lsp
diff --git a/read-char-no-hang.lsp b/streams/read-char-no-hang.lsp
similarity index 100%
rename from read-char-no-hang.lsp
rename to streams/read-char-no-hang.lsp
diff --git a/read-line.lsp b/streams/read-line.lsp
similarity index 100%
rename from read-line.lsp
rename to streams/read-line.lsp
diff --git a/read-sequence.lsp b/streams/read-sequence.lsp
similarity index 100%
rename from read-sequence.lsp
rename to streams/read-sequence.lsp
diff --git a/stream-element-type.lsp b/streams/stream-element-type.lsp
similarity index 100%
rename from stream-element-type.lsp
rename to streams/stream-element-type.lsp
diff --git a/stream-error-stream.lsp b/streams/stream-error-stream.lsp
similarity index 100%
rename from stream-error-stream.lsp
rename to streams/stream-error-stream.lsp
diff --git a/stream-external-format.lsp b/streams/stream-external-format.lsp
similarity index 100%
rename from stream-external-format.lsp
rename to streams/stream-external-format.lsp
diff --git a/streamp.lsp b/streams/streamp.lsp
similarity index 100%
rename from streamp.lsp
rename to streams/streamp.lsp
diff --git a/synonym-stream-symbol.lsp b/streams/synonym-stream-symbol.lsp
similarity index 100%
rename from synonym-stream-symbol.lsp
rename to streams/synonym-stream-symbol.lsp
diff --git a/terpri.lsp b/streams/terpri.lsp
similarity index 100%
rename from terpri.lsp
rename to streams/terpri.lsp
diff --git a/two-way-stream-input-stream.lsp b/streams/two-way-stream-input-stream.lsp
similarity index 100%
rename from two-way-stream-input-stream.lsp
rename to streams/two-way-stream-input-stream.lsp
diff --git a/two-way-stream-output-stream.lsp b/streams/two-way-stream-output-stream.lsp
similarity index 100%
rename from two-way-stream-output-stream.lsp
rename to streams/two-way-stream-output-stream.lsp
diff --git a/unread-char.lsp b/streams/unread-char.lsp
similarity index 100%
rename from unread-char.lsp
rename to streams/unread-char.lsp
diff --git a/with-input-from-string.lsp b/streams/with-input-from-string.lsp
similarity index 100%
rename from with-input-from-string.lsp
rename to streams/with-input-from-string.lsp
diff --git a/with-open-file.lsp b/streams/with-open-file.lsp
similarity index 100%
rename from with-open-file.lsp
rename to streams/with-open-file.lsp
diff --git a/with-open-stream.lsp b/streams/with-open-stream.lsp
similarity index 100%
rename from with-open-stream.lsp
rename to streams/with-open-stream.lsp
diff --git a/with-output-to-string.lsp b/streams/with-output-to-string.lsp
similarity index 100%
rename from with-output-to-string.lsp
rename to streams/with-output-to-string.lsp
diff --git a/write-char.lsp b/streams/write-char.lsp
similarity index 100%
rename from write-char.lsp
rename to streams/write-char.lsp
diff --git a/write-line.lsp b/streams/write-line.lsp
similarity index 100%
rename from write-line.lsp
rename to streams/write-line.lsp
diff --git a/write-sequence.lsp b/streams/write-sequence.lsp
similarity index 100%
rename from write-sequence.lsp
rename to streams/write-sequence.lsp
diff --git a/write-string.lsp b/streams/write-string.lsp
similarity index 100%
rename from write-string.lsp
rename to streams/write-string.lsp