diff --git a/load-objects.lsp b/load-objects.lsp
index a73586bbe33d87c51c48bb13d8d739c5bb054cda..533279fec5a3207e2a32f5ae54d583e6b91c8ad4 100644
--- a/load-objects.lsp
+++ b/load-objects.lsp
@@ -4,55 +4,55 @@
 ;;;; Contains: Loader for CLOS-related test files
 
 (compile-and-load "defclass-aux.lsp")
-(load "defclass.lsp")
-(load "defclass-01.lsp")
-(load "defclass-02.lsp")
-(load "defclass-03.lsp")
-(load "defclass-errors.lsp")
-(load "defclass-forward-reference.lsp")
-(load "ensure-generic-function.lsp")
-(load "allocate-instance.lsp")
-(load "reinitialize-instance.lsp")
-(load "shared-initialize.lsp")
-(load "change-class.lsp")
-(load "update-instance-for-different-class.lsp")
-(load "slot-boundp.lsp")
-(load "slot-exists-p.lsp")
-(load "slot-makunbound.lsp")
-(load "slot-missing.lsp")
-(load "slot-unbound.lsp")
-(load "slot-value.lsp")
-(load "method-qualifiers.lsp")
-(load "no-applicable-method.lsp")
-(load "no-next-method.lsp")
-(load "remove-method.lsp")
-(load "make-instance.lsp")
-(load "make-instances-obsolete.lsp")
-(load "make-load-form.lsp")
-(load "make-load-form-saving-slots.lsp")
-(load "with-accessors.lsp")
-(load "with-slots.lsp")
-(load "defgeneric.lsp")
-(load "defgeneric-method-combination-aux.lsp")
-(load "defgeneric-method-combination-plus.lsp")
-(load "defgeneric-method-combination-append.lsp")
-(load "defgeneric-method-combination-nconc.lsp")
-(load "defgeneric-method-combination-list.lsp")
-(load "defgeneric-method-combination-max.lsp")
-(load "defgeneric-method-combination-min.lsp")
-(load "defgeneric-method-combination-and.lsp")
-(load "defgeneric-method-combination-or.lsp")
-(load "defgeneric-method-combination-progn.lsp")
-;; (load "defgeneric-method-combination-standard.lsp")
-(load "find-class.lsp")
-(load "next-method-p.lsp")
-(load "call-next-method.lsp")
-(load "compute-applicable-methods.lsp")
-(load "define-method-combination.lsp")
-(load "find-method.lsp")
-(load "add-method.lsp")
-(load "class-name.lsp")
-(load "class-of.lsp")
-(load "unbound-slot.lsp")
-(load "defmethod.lsp")
-
+(load "objects/defclass.lsp")
+(load "objects/defclass-01.lsp")
+(load "objects/defclass-02.lsp")
+(load "objects/defclass-03.lsp")
+(load "objects/defclass-errors.lsp")
+(load "objects/defclass-forward-reference.lsp")
+(load "objects/ensure-generic-function.lsp")
+(load "objects/allocate-instance.lsp")
+(load "objects/reinitialize-instance.lsp")
+(load "objects/shared-initialize.lsp")
+(load "objects/change-class.lsp")
+(load "objects/update-instance-for-different-class.lsp")
+(load "objects/slot-boundp.lsp")
+(load "objects/slot-exists-p.lsp")
+(load "objects/slot-makunbound.lsp")
+(load "objects/slot-missing.lsp")
+(load "objects/slot-unbound.lsp")
+(load "objects/slot-value.lsp")
+(load "objects/method-qualifiers.lsp")
+(load "objects/no-applicable-method.lsp")
+(load "objects/no-next-method.lsp")
+(load "objects/remove-method.lsp")
+(load "objects/make-instance.lsp")
+(load "objects/make-instances-obsolete.lsp")
+(load "objects/make-load-form.lsp")
+(load "objects/make-load-form-saving-slots.lsp")
+(load "objects/with-accessors.lsp")
+(load "objects/with-slots.lsp")
+(load "objects/defgeneric.lsp")
+(load "objects/defgeneric-method-combination-aux.lsp")
+(load "objects/defgeneric-method-combination-plus.lsp")
+(load "objects/defgeneric-method-combination-append.lsp")
+(load "objects/defgeneric-method-combination-nconc.lsp")
+(load "objects/defgeneric-method-combination-list.lsp")
+(load "objects/defgeneric-method-combination-max.lsp")
+(load "objects/defgeneric-method-combination-min.lsp")
+(load "objects/defgeneric-method-combination-and.lsp")
+(load "objects/defgeneric-method-combination-or.lsp")
+(load "objects/defgeneric-method-combination-progn.lsp")
+;; (load "objects/defgeneric-method-combination-standard.lsp")
+(load "objects/find-class.lsp")
+(load "objects/next-method-p.lsp")
+(load "objects/call-next-method.lsp")
+(load "objects/compute-applicable-methods.lsp")
+(load "objects/define-method-combination.lsp")
+;; (load "objects/define-method-combination-long-form.lsp")
+(load "objects/find-method.lsp")
+(load "objects/add-method.lsp")
+(load "objects/class-name.lsp")
+(load "objects/class-of.lsp")
+(load "objects/unbound-slot.lsp")
+(load "objects/defmethod.lsp")
diff --git a/add-method.lsp b/objects/add-method.lsp
similarity index 100%
rename from add-method.lsp
rename to objects/add-method.lsp
diff --git a/allocate-instance.lsp b/objects/allocate-instance.lsp
similarity index 100%
rename from allocate-instance.lsp
rename to objects/allocate-instance.lsp
diff --git a/call-next-method.lsp b/objects/call-next-method.lsp
similarity index 100%
rename from call-next-method.lsp
rename to objects/call-next-method.lsp
diff --git a/change-class.lsp b/objects/change-class.lsp
similarity index 100%
rename from change-class.lsp
rename to objects/change-class.lsp
diff --git a/class-name.lsp b/objects/class-name.lsp
similarity index 100%
rename from class-name.lsp
rename to objects/class-name.lsp
diff --git a/class-of.lsp b/objects/class-of.lsp
similarity index 100%
rename from class-of.lsp
rename to objects/class-of.lsp
diff --git a/compute-applicable-methods.lsp b/objects/compute-applicable-methods.lsp
similarity index 100%
rename from compute-applicable-methods.lsp
rename to objects/compute-applicable-methods.lsp
diff --git a/defclass-01.lsp b/objects/defclass-01.lsp
similarity index 100%
rename from defclass-01.lsp
rename to objects/defclass-01.lsp
diff --git a/defclass-02.lsp b/objects/defclass-02.lsp
similarity index 100%
rename from defclass-02.lsp
rename to objects/defclass-02.lsp
diff --git a/defclass-03.lsp b/objects/defclass-03.lsp
similarity index 100%
rename from defclass-03.lsp
rename to objects/defclass-03.lsp
diff --git a/defclass-errors.lsp b/objects/defclass-errors.lsp
similarity index 100%
rename from defclass-errors.lsp
rename to objects/defclass-errors.lsp
diff --git a/defclass-forward-reference.lsp b/objects/defclass-forward-reference.lsp
similarity index 100%
rename from defclass-forward-reference.lsp
rename to objects/defclass-forward-reference.lsp
diff --git a/defclass.lsp b/objects/defclass.lsp
similarity index 100%
rename from defclass.lsp
rename to objects/defclass.lsp
diff --git a/defgeneric-method-combination-and.lsp b/objects/defgeneric-method-combination-and.lsp
similarity index 100%
rename from defgeneric-method-combination-and.lsp
rename to objects/defgeneric-method-combination-and.lsp
diff --git a/defgeneric-method-combination-append.lsp b/objects/defgeneric-method-combination-append.lsp
similarity index 100%
rename from defgeneric-method-combination-append.lsp
rename to objects/defgeneric-method-combination-append.lsp
diff --git a/defgeneric-method-combination-aux.lsp b/objects/defgeneric-method-combination-aux.lsp
similarity index 100%
rename from defgeneric-method-combination-aux.lsp
rename to objects/defgeneric-method-combination-aux.lsp
diff --git a/defgeneric-method-combination-list.lsp b/objects/defgeneric-method-combination-list.lsp
similarity index 100%
rename from defgeneric-method-combination-list.lsp
rename to objects/defgeneric-method-combination-list.lsp
diff --git a/defgeneric-method-combination-max.lsp b/objects/defgeneric-method-combination-max.lsp
similarity index 100%
rename from defgeneric-method-combination-max.lsp
rename to objects/defgeneric-method-combination-max.lsp
diff --git a/defgeneric-method-combination-min.lsp b/objects/defgeneric-method-combination-min.lsp
similarity index 100%
rename from defgeneric-method-combination-min.lsp
rename to objects/defgeneric-method-combination-min.lsp
diff --git a/defgeneric-method-combination-nconc.lsp b/objects/defgeneric-method-combination-nconc.lsp
similarity index 100%
rename from defgeneric-method-combination-nconc.lsp
rename to objects/defgeneric-method-combination-nconc.lsp
diff --git a/data-and-control-flow/defgeneric-method-combination-or.lsp b/objects/defgeneric-method-combination-or.lsp
similarity index 100%
rename from data-and-control-flow/defgeneric-method-combination-or.lsp
rename to objects/defgeneric-method-combination-or.lsp
diff --git a/defgeneric-method-combination-plus.lsp b/objects/defgeneric-method-combination-plus.lsp
similarity index 100%
rename from defgeneric-method-combination-plus.lsp
rename to objects/defgeneric-method-combination-plus.lsp
diff --git a/data-and-control-flow/defgeneric-method-combination-progn.lsp b/objects/defgeneric-method-combination-progn.lsp
similarity index 100%
rename from data-and-control-flow/defgeneric-method-combination-progn.lsp
rename to objects/defgeneric-method-combination-progn.lsp
diff --git a/defgeneric.lsp b/objects/defgeneric.lsp
similarity index 100%
rename from defgeneric.lsp
rename to objects/defgeneric.lsp
diff --git a/define-method-combination-long-form.lsp b/objects/define-method-combination-long-form.lsp
similarity index 100%
rename from define-method-combination-long-form.lsp
rename to objects/define-method-combination-long-form.lsp
diff --git a/define-method-combination.lsp b/objects/define-method-combination.lsp
similarity index 100%
rename from define-method-combination.lsp
rename to objects/define-method-combination.lsp
diff --git a/defmethod.lsp b/objects/defmethod.lsp
similarity index 100%
rename from defmethod.lsp
rename to objects/defmethod.lsp
diff --git a/data-and-control-flow/ensure-generic-function.lsp b/objects/ensure-generic-function.lsp
similarity index 100%
rename from data-and-control-flow/ensure-generic-function.lsp
rename to objects/ensure-generic-function.lsp
diff --git a/find-class.lsp b/objects/find-class.lsp
similarity index 100%
rename from find-class.lsp
rename to objects/find-class.lsp
diff --git a/find-method.lsp b/objects/find-method.lsp
similarity index 100%
rename from find-method.lsp
rename to objects/find-method.lsp
diff --git a/make-instance.lsp b/objects/make-instance.lsp
similarity index 100%
rename from make-instance.lsp
rename to objects/make-instance.lsp
diff --git a/make-instances-obsolete.lsp b/objects/make-instances-obsolete.lsp
similarity index 100%
rename from make-instances-obsolete.lsp
rename to objects/make-instances-obsolete.lsp
diff --git a/make-load-form-saving-slots.lsp b/objects/make-load-form-saving-slots.lsp
similarity index 100%
rename from make-load-form-saving-slots.lsp
rename to objects/make-load-form-saving-slots.lsp
diff --git a/make-load-form.lsp b/objects/make-load-form.lsp
similarity index 100%
rename from make-load-form.lsp
rename to objects/make-load-form.lsp
diff --git a/method-qualifiers.lsp b/objects/method-qualifiers.lsp
similarity index 100%
rename from method-qualifiers.lsp
rename to objects/method-qualifiers.lsp
diff --git a/next-method-p.lsp b/objects/next-method-p.lsp
similarity index 100%
rename from next-method-p.lsp
rename to objects/next-method-p.lsp
diff --git a/no-applicable-method.lsp b/objects/no-applicable-method.lsp
similarity index 100%
rename from no-applicable-method.lsp
rename to objects/no-applicable-method.lsp
diff --git a/no-next-method.lsp b/objects/no-next-method.lsp
similarity index 100%
rename from no-next-method.lsp
rename to objects/no-next-method.lsp
diff --git a/reinitialize-instance.lsp b/objects/reinitialize-instance.lsp
similarity index 100%
rename from reinitialize-instance.lsp
rename to objects/reinitialize-instance.lsp
diff --git a/remove-method.lsp b/objects/remove-method.lsp
similarity index 100%
rename from remove-method.lsp
rename to objects/remove-method.lsp
diff --git a/shared-initialize.lsp b/objects/shared-initialize.lsp
similarity index 100%
rename from shared-initialize.lsp
rename to objects/shared-initialize.lsp
diff --git a/slot-boundp.lsp b/objects/slot-boundp.lsp
similarity index 100%
rename from slot-boundp.lsp
rename to objects/slot-boundp.lsp
diff --git a/slot-exists-p.lsp b/objects/slot-exists-p.lsp
similarity index 100%
rename from slot-exists-p.lsp
rename to objects/slot-exists-p.lsp
diff --git a/slot-makunbound.lsp b/objects/slot-makunbound.lsp
similarity index 100%
rename from slot-makunbound.lsp
rename to objects/slot-makunbound.lsp
diff --git a/slot-missing.lsp b/objects/slot-missing.lsp
similarity index 100%
rename from slot-missing.lsp
rename to objects/slot-missing.lsp
diff --git a/slot-unbound.lsp b/objects/slot-unbound.lsp
similarity index 100%
rename from slot-unbound.lsp
rename to objects/slot-unbound.lsp
diff --git a/slot-value.lsp b/objects/slot-value.lsp
similarity index 100%
rename from slot-value.lsp
rename to objects/slot-value.lsp
diff --git a/unbound-slot.lsp b/objects/unbound-slot.lsp
similarity index 100%
rename from unbound-slot.lsp
rename to objects/unbound-slot.lsp
diff --git a/update-instance-for-different-class.lsp b/objects/update-instance-for-different-class.lsp
similarity index 100%
rename from update-instance-for-different-class.lsp
rename to objects/update-instance-for-different-class.lsp
diff --git a/with-accessors.lsp b/objects/with-accessors.lsp
similarity index 100%
rename from with-accessors.lsp
rename to objects/with-accessors.lsp
diff --git a/with-slots.lsp b/objects/with-slots.lsp
similarity index 100%
rename from with-slots.lsp
rename to objects/with-slots.lsp