diff --git a/acons.lsp b/cons/acons.lsp
similarity index 100%
rename from acons.lsp
rename to cons/acons.lsp
diff --git a/adjoin.lsp b/cons/adjoin.lsp
similarity index 100%
rename from adjoin.lsp
rename to cons/adjoin.lsp
diff --git a/append.lsp b/cons/append.lsp
similarity index 100%
rename from append.lsp
rename to cons/append.lsp
diff --git a/assoc-if-not.lsp b/cons/assoc-if-not.lsp
similarity index 100%
rename from assoc-if-not.lsp
rename to cons/assoc-if-not.lsp
diff --git a/assoc.lsp b/cons/assoc.lsp
similarity index 100%
rename from assoc.lsp
rename to cons/assoc.lsp
diff --git a/atom.lsp b/cons/atom.lsp
similarity index 100%
rename from atom.lsp
rename to cons/atom.lsp
diff --git a/butlast.lsp b/cons/butlast.lsp
similarity index 100%
rename from butlast.lsp
rename to cons/butlast.lsp
diff --git a/cons-test-01.lsp b/cons/cons-test-01.lsp
similarity index 100%
rename from cons-test-01.lsp
rename to cons/cons-test-01.lsp
diff --git a/cons-test-03.lsp b/cons/cons-test-03.lsp
similarity index 100%
rename from cons-test-03.lsp
rename to cons/cons-test-03.lsp
diff --git a/cons-test-05.lsp b/cons/cons-test-05.lsp
similarity index 100%
rename from cons-test-05.lsp
rename to cons/cons-test-05.lsp
diff --git a/consp.lsp b/cons/consp.lsp
similarity index 100%
rename from consp.lsp
rename to cons/consp.lsp
diff --git a/copy-alist.lsp b/cons/copy-alist.lsp
similarity index 100%
rename from copy-alist.lsp
rename to cons/copy-alist.lsp
diff --git a/copy-list.lsp b/cons/copy-list.lsp
similarity index 100%
rename from copy-list.lsp
rename to cons/copy-list.lsp
diff --git a/copy-tree.lsp b/cons/copy-tree.lsp
similarity index 100%
rename from copy-tree.lsp
rename to cons/copy-tree.lsp
diff --git a/cxr.lsp b/cons/cxr.lsp
similarity index 100%
rename from cxr.lsp
rename to cons/cxr.lsp
diff --git a/endp.lsp b/cons/endp.lsp
similarity index 100%
rename from endp.lsp
rename to cons/endp.lsp
diff --git a/get-properties.lsp b/cons/get-properties.lsp
similarity index 100%
rename from get-properties.lsp
rename to cons/get-properties.lsp
diff --git a/getf.lsp b/cons/getf.lsp
similarity index 100%
rename from getf.lsp
rename to cons/getf.lsp
diff --git a/intersection.lsp b/cons/intersection.lsp
similarity index 100%
rename from intersection.lsp
rename to cons/intersection.lsp
diff --git a/ldiff.lsp b/cons/ldiff.lsp
similarity index 100%
rename from ldiff.lsp
rename to cons/ldiff.lsp
diff --git a/list-length.lsp b/cons/list-length.lsp
similarity index 100%
rename from list-length.lsp
rename to cons/list-length.lsp
diff --git a/listp.lsp b/cons/listp.lsp
similarity index 100%
rename from listp.lsp
rename to cons/listp.lsp
diff --git a/make-list.lsp b/cons/make-list.lsp
similarity index 100%
rename from make-list.lsp
rename to cons/make-list.lsp
diff --git a/mapc.lsp b/cons/mapc.lsp
similarity index 100%
rename from mapc.lsp
rename to cons/mapc.lsp
diff --git a/mapcan.lsp b/cons/mapcan.lsp
similarity index 100%
rename from mapcan.lsp
rename to cons/mapcan.lsp
diff --git a/mapcar.lsp b/cons/mapcar.lsp
similarity index 100%
rename from mapcar.lsp
rename to cons/mapcar.lsp
diff --git a/mapcon.lsp b/cons/mapcon.lsp
similarity index 100%
rename from mapcon.lsp
rename to cons/mapcon.lsp
diff --git a/mapl.lsp b/cons/mapl.lsp
similarity index 100%
rename from mapl.lsp
rename to cons/mapl.lsp
diff --git a/maplist.lsp b/cons/maplist.lsp
similarity index 100%
rename from maplist.lsp
rename to cons/maplist.lsp
diff --git a/member-if-not.lsp b/cons/member-if-not.lsp
similarity index 100%
rename from member-if-not.lsp
rename to cons/member-if-not.lsp
diff --git a/member-if.lsp b/cons/member-if.lsp
similarity index 100%
rename from member-if.lsp
rename to cons/member-if.lsp
diff --git a/member.lsp b/cons/member.lsp
similarity index 100%
rename from member.lsp
rename to cons/member.lsp
diff --git a/nbutlast.lsp b/cons/nbutlast.lsp
similarity index 100%
rename from nbutlast.lsp
rename to cons/nbutlast.lsp
diff --git a/nconc.lsp b/cons/nconc.lsp
similarity index 100%
rename from nconc.lsp
rename to cons/nconc.lsp
diff --git a/nintersection.lsp b/cons/nintersection.lsp
similarity index 100%
rename from nintersection.lsp
rename to cons/nintersection.lsp
diff --git a/nreconc.lsp b/cons/nreconc.lsp
similarity index 100%
rename from nreconc.lsp
rename to cons/nreconc.lsp
diff --git a/nset-difference.lsp b/cons/nset-difference.lsp
similarity index 100%
rename from nset-difference.lsp
rename to cons/nset-difference.lsp
diff --git a/nset-exclusive-or.lsp b/cons/nset-exclusive-or.lsp
similarity index 100%
rename from nset-exclusive-or.lsp
rename to cons/nset-exclusive-or.lsp
diff --git a/nsublis.lsp b/cons/nsublis.lsp
similarity index 100%
rename from nsublis.lsp
rename to cons/nsublis.lsp
diff --git a/nsubst-if-not.lsp b/cons/nsubst-if-not.lsp
similarity index 100%
rename from nsubst-if-not.lsp
rename to cons/nsubst-if-not.lsp
diff --git a/nsubst-if.lsp b/cons/nsubst-if.lsp
similarity index 100%
rename from nsubst-if.lsp
rename to cons/nsubst-if.lsp
diff --git a/nsubst.lsp b/cons/nsubst.lsp
similarity index 100%
rename from nsubst.lsp
rename to cons/nsubst.lsp
diff --git a/nth.lsp b/cons/nth.lsp
similarity index 100%
rename from nth.lsp
rename to cons/nth.lsp
diff --git a/nthcdr.lsp b/cons/nthcdr.lsp
similarity index 100%
rename from nthcdr.lsp
rename to cons/nthcdr.lsp
diff --git a/nunion.lsp b/cons/nunion.lsp
similarity index 100%
rename from nunion.lsp
rename to cons/nunion.lsp
diff --git a/pairlis.lsp b/cons/pairlis.lsp
similarity index 100%
rename from pairlis.lsp
rename to cons/pairlis.lsp
diff --git a/pop.lsp b/cons/pop.lsp
similarity index 100%
rename from pop.lsp
rename to cons/pop.lsp
diff --git a/push.lsp b/cons/push.lsp
similarity index 100%
rename from push.lsp
rename to cons/push.lsp
diff --git a/pushnew.lsp b/cons/pushnew.lsp
similarity index 100%
rename from pushnew.lsp
rename to cons/pushnew.lsp
diff --git a/rassoc-if-not.lsp b/cons/rassoc-if-not.lsp
similarity index 100%
rename from rassoc-if-not.lsp
rename to cons/rassoc-if-not.lsp
diff --git a/rassoc-if.lsp b/cons/rassoc-if.lsp
similarity index 100%
rename from rassoc-if.lsp
rename to cons/rassoc-if.lsp
diff --git a/rassoc.lsp b/cons/rassoc.lsp
similarity index 100%
rename from rassoc.lsp
rename to cons/rassoc.lsp
diff --git a/remf.lsp b/cons/remf.lsp
similarity index 100%
rename from remf.lsp
rename to cons/remf.lsp
diff --git a/rest.lsp b/cons/rest.lsp
similarity index 100%
rename from rest.lsp
rename to cons/rest.lsp
diff --git a/revappend.lsp b/cons/revappend.lsp
similarity index 100%
rename from revappend.lsp
rename to cons/revappend.lsp
diff --git a/rplaca.lsp b/cons/rplaca.lsp
similarity index 100%
rename from rplaca.lsp
rename to cons/rplaca.lsp
diff --git a/rplacd.lsp b/cons/rplacd.lsp
similarity index 100%
rename from rplacd.lsp
rename to cons/rplacd.lsp
diff --git a/subsetp.lsp b/cons/subsetp.lsp
similarity index 100%
rename from subsetp.lsp
rename to cons/subsetp.lsp
diff --git a/tailp.lsp b/cons/tailp.lsp
similarity index 100%
rename from tailp.lsp
rename to cons/tailp.lsp
diff --git a/tree-equal.lsp b/cons/tree-equal.lsp
similarity index 100%
rename from tree-equal.lsp
rename to cons/tree-equal.lsp
diff --git a/load-cons.lsp b/load-cons.lsp
index ea366af746d5edbbed2e3116b6f41b9e626511cd..3a891b11159284bdd80c0d6c7b0175dbb84af7f5 100644
--- a/load-cons.lsp
+++ b/load-cons.lsp
@@ -2,81 +2,81 @@
 
 ;;; (compile-and-load "cons-aux.lsp")
 
-(load "cons.lsp")
-(load "consp.lsp")
-(load "atom.lsp")
-(load "cxr.lsp")
-(load "rplaca.lsp")
-(load "rplacd.lsp")
-(load "copy-tree.lsp")
-(load "sublis.lsp")
-(load "nsublis.lsp")
-(load "subst.lsp")
-(load "subst-if.lsp")
-(load "subst-if-not.lsp")
-(load "nsubst.lsp")
-(load "nsubst-if.lsp")
-(load "nsubst-if-not.lsp")
-(load "tree-equal.lsp")
-(load "copy-list.lsp")
-(load "list.lsp")
-(load "list-length.lsp")
-(load "listp.lsp")
-(load "make-list.lsp")
-(load "push.lsp")
-(load "pop.lsp")
-(load "pushnew.lsp")
-(load "adjoin.lsp")
-(load "nth.lsp")
-(load "endp.lsp")
-(load "nconc.lsp")
-(load "append.lsp")
-(load "revappend.lsp")
-(load "nreconc.lsp")
-(load "butlast.lsp")
-(load "nbutlast.lsp")
-(load "last.lsp")
-(load "ldiff.lsp")
-(load "tailp.lsp")
-(load "nthcdr.lsp")
-(load "rest.lsp")
-(load "member.lsp")
-(load "member-if.lsp")
-(load "member-if-not.lsp")
+(load "cons/cons.lsp")
+(load "cons/consp.lsp")
+(load "cons/atom.lsp")
+(load "cons/cxr.lsp")
+(load "cons/rplaca.lsp")
+(load "cons/rplacd.lsp")
+(load "cons/copy-tree.lsp")
+(load "cons/sublis.lsp")
+(load "cons/nsublis.lsp")
+(load "cons/subst.lsp")
+(load "cons/subst-if.lsp")
+(load "cons/subst-if-not.lsp")
+(load "cons/nsubst.lsp")
+(load "cons/nsubst-if.lsp")
+(load "cons/nsubst-if-not.lsp")
+(load "cons/tree-equal.lsp")
+(load "cons/copy-list.lsp")
+(load "cons/list.lsp")
+(load "cons/list-length.lsp")
+(load "cons/listp.lsp")
+(load "cons/make-list.lsp")
+(load "cons/push.lsp")
+(load "cons/pop.lsp")
+(load "cons/pushnew.lsp")
+(load "cons/adjoin.lsp")
+(load "cons/nth.lsp")
+(load "cons/endp.lsp")
+(load "cons/nconc.lsp")
+(load "cons/append.lsp")
+(load "cons/revappend.lsp")
+(load "cons/nreconc.lsp")
+(load "cons/butlast.lsp")
+(load "cons/nbutlast.lsp")
+(load "cons/last.lsp")
+(load "cons/ldiff.lsp")
+(load "cons/tailp.lsp")
+(load "cons/nthcdr.lsp")
+(load "cons/rest.lsp")
+(load "cons/member.lsp")
+(load "cons/member-if.lsp")
+(load "cons/member-if-not.lsp")
 
-(load "mapc.lsp")
-(load "mapcar.lsp")
-(load "mapcan.lsp")
-(load "mapl.lsp")
-(load "maplist.lsp")
-(load "mapcon.lsp")
+(load "cons/mapc.lsp")
+(load "cons/mapcar.lsp")
+(load "cons/mapcan.lsp")
+(load "cons/mapl.lsp")
+(load "cons/maplist.lsp")
+(load "cons/mapcon.lsp")
 
-(load "acons.lsp")
-(load "assoc.lsp")
-(load "assoc-if.lsp")
-(load "assoc-if-not.lsp")
-(load "rassoc.lsp")
-(load "rassoc-if.lsp")
-(load "rassoc-if-not.lsp")
-(load "copy-alist.lsp")
-(load "pairlis.lsp")
+(load "cons/acons.lsp")
+(load "cons/assoc.lsp")
+(load "cons/assoc-if.lsp")
+(load "cons/assoc-if-not.lsp")
+(load "cons/rassoc.lsp")
+(load "cons/rassoc-if.lsp")
+(load "cons/rassoc-if-not.lsp")
+(load "cons/copy-alist.lsp")
+(load "cons/pairlis.lsp")
 
-(load "get-properties.lsp")
-(load "getf.lsp")
-(load "remf.lsp")
+(load "cons/get-properties.lsp")
+(load "cons/getf.lsp")
+(load "cons/remf.lsp")
 
-(load "intersection.lsp")
-(load "nintersection.lsp")
-(load "union.lsp")
-(load "nunion.lsp")
-(load "set-difference.lsp")
-(load "nset-difference.lsp")
-(load "set-exclusive-or.lsp")
-(load "nset-exclusive-or.lsp")
-(load "subsetp.lsp")
+(load "cons/intersection.lsp")
+(load "cons/nintersection.lsp")
+(load "cons/union.lsp")
+(load "cons/nunion.lsp")
+(load "cons/set-difference.lsp")
+(load "cons/nset-difference.lsp")
+(load "cons/set-exclusive-or.lsp")
+(load "cons/nset-exclusive-or.lsp")
+(load "cons/subsetp.lsp")
 
 ;;; Misc. stuff that should be moved elsewhere
-(load "cons-test-01.lsp")
-(load "cons-test-03.lsp")
-(load "cons-test-05.lsp")
+(load "cons/cons-test-01.lsp")
+(load "cons/cons-test-03.lsp")
+(load "cons/cons-test-05.lsp")