diff --git a/load-pathnames.lsp b/load-pathnames.lsp
index 6e0fa056ac95a54b21069c86856d2d1e1d1282cf..a3fdf0ba1ee435b038969bc7f1e01fc35cbc7b37 100644
--- a/load-pathnames.lsp
+++ b/load-pathnames.lsp
@@ -7,30 +7,30 @@
 
 (compile-and-load "pathnames-aux.lsp")
 
-(load "pathnames.lsp")
-(load "pathname.lsp")
-(load "pathnamep.lsp")
-(load "make-pathname.lsp")
-(load "pathname-host.lsp")
-(load "pathname-device.lsp")
-(load "pathname-directory.lsp")
-(load "pathname-name.lsp")
-(load "pathname-type.lsp")
-(load "pathname-version.lsp")
+(load "pathnames/pathnames.lsp")
+(load "pathnames/pathname.lsp")
+(load "pathnames/pathnamep.lsp")
+(load "pathnames/make-pathname.lsp")
+(load "pathnames/pathname-host.lsp")
+(load "pathnames/pathname-device.lsp")
+(load "pathnames/pathname-directory.lsp")
+(load "pathnames/pathname-name.lsp")
+(load "pathnames/pathname-type.lsp")
+(load "pathnames/pathname-version.lsp")
 
-(load "load-logical-pathname-translations.lsp")
-(load "logical-pathname.lsp")
-(load "logical-pathname-translations.lsp")
-(load "translate-logical-pathname.lsp")
+(load "pathnames/load-logical-pathname-translations.lsp")
+(load "pathnames/logical-pathname.lsp")
+(load "pathnames/logical-pathname-translations.lsp")
+(load "pathnames/translate-logical-pathname.lsp")
 
-(load "namestring.lsp")
-(load "file-namestring.lsp")
-(load "directory-namestring.lsp")
-(load "host-namestring.lsp")
-(load "enough-namestring.lsp")
+(load "pathnames/namestring.lsp")
+(load "pathnames/file-namestring.lsp")
+(load "pathnames/directory-namestring.lsp")
+(load "pathnames/host-namestring.lsp")
+(load "pathnames/enough-namestring.lsp")
 
-(load "wild-pathname-p.lsp")
-(load "merge-pathnames.lsp")
-(load "pathname-match-p.lsp")
+(load "pathnames/wild-pathname-p.lsp")
+(load "pathnames/merge-pathnames.lsp")
+(load "pathnames/pathname-match-p.lsp")
 
-(load "parse-namestring.lsp")
\ No newline at end of file
+(load "pathnames/parse-namestring.lsp")
diff --git a/directory-namestring.lsp b/pathnames/directory-namestring.lsp
similarity index 100%
rename from directory-namestring.lsp
rename to pathnames/directory-namestring.lsp
diff --git a/enough-namestring.lsp b/pathnames/enough-namestring.lsp
similarity index 100%
rename from enough-namestring.lsp
rename to pathnames/enough-namestring.lsp
diff --git a/file-namestring.lsp b/pathnames/file-namestring.lsp
similarity index 100%
rename from file-namestring.lsp
rename to pathnames/file-namestring.lsp
diff --git a/host-namestring.lsp b/pathnames/host-namestring.lsp
similarity index 100%
rename from host-namestring.lsp
rename to pathnames/host-namestring.lsp
diff --git a/load-logical-pathname-translations.lsp b/pathnames/load-logical-pathname-translations.lsp
similarity index 100%
rename from load-logical-pathname-translations.lsp
rename to pathnames/load-logical-pathname-translations.lsp
diff --git a/logical-pathname-translations.lsp b/pathnames/logical-pathname-translations.lsp
similarity index 100%
rename from logical-pathname-translations.lsp
rename to pathnames/logical-pathname-translations.lsp
diff --git a/logical-pathname.lsp b/pathnames/logical-pathname.lsp
similarity index 100%
rename from logical-pathname.lsp
rename to pathnames/logical-pathname.lsp
diff --git a/make-pathname.lsp b/pathnames/make-pathname.lsp
similarity index 100%
rename from make-pathname.lsp
rename to pathnames/make-pathname.lsp
diff --git a/merge-pathnames.lsp b/pathnames/merge-pathnames.lsp
similarity index 100%
rename from merge-pathnames.lsp
rename to pathnames/merge-pathnames.lsp
diff --git a/namestring.lsp b/pathnames/namestring.lsp
similarity index 100%
rename from namestring.lsp
rename to pathnames/namestring.lsp
diff --git a/parse-namestring.lsp b/pathnames/parse-namestring.lsp
similarity index 100%
rename from parse-namestring.lsp
rename to pathnames/parse-namestring.lsp
diff --git a/pathname-device.lsp b/pathnames/pathname-device.lsp
similarity index 100%
rename from pathname-device.lsp
rename to pathnames/pathname-device.lsp
diff --git a/pathname-directory.lsp b/pathnames/pathname-directory.lsp
similarity index 100%
rename from pathname-directory.lsp
rename to pathnames/pathname-directory.lsp
diff --git a/pathname-host.lsp b/pathnames/pathname-host.lsp
similarity index 100%
rename from pathname-host.lsp
rename to pathnames/pathname-host.lsp
diff --git a/pathname-match-p.lsp b/pathnames/pathname-match-p.lsp
similarity index 100%
rename from pathname-match-p.lsp
rename to pathnames/pathname-match-p.lsp
diff --git a/pathname-name.lsp b/pathnames/pathname-name.lsp
similarity index 100%
rename from pathname-name.lsp
rename to pathnames/pathname-name.lsp
diff --git a/pathname-type.lsp b/pathnames/pathname-type.lsp
similarity index 100%
rename from pathname-type.lsp
rename to pathnames/pathname-type.lsp
diff --git a/pathname-version.lsp b/pathnames/pathname-version.lsp
similarity index 100%
rename from pathname-version.lsp
rename to pathnames/pathname-version.lsp
diff --git a/pathname.lsp b/pathnames/pathname.lsp
similarity index 100%
rename from pathname.lsp
rename to pathnames/pathname.lsp
diff --git a/pathnamep.lsp b/pathnames/pathnamep.lsp
similarity index 100%
rename from pathnamep.lsp
rename to pathnames/pathnamep.lsp
diff --git a/pathnames.lsp b/pathnames/pathnames.lsp
similarity index 100%
rename from pathnames.lsp
rename to pathnames/pathnames.lsp
diff --git a/translate-logical-pathname.lsp b/pathnames/translate-logical-pathname.lsp
similarity index 100%
rename from translate-logical-pathname.lsp
rename to pathnames/translate-logical-pathname.lsp
diff --git a/wild-pathname-p.lsp b/pathnames/wild-pathname-p.lsp
similarity index 100%
rename from wild-pathname-p.lsp
rename to pathnames/wild-pathname-p.lsp