diff --git a/CLASH.system b/CLASH.system
index 2d8acc7..8783a58 100644
--- a/CLASH.system
+++ b/CLASH.system
@@ -7,7 +7,7 @@
 ;;;; Checkout Tag: $Name$
 ;;;; $Id$
 
-(in-package :CL-USER)
+(in-package :MAKE)
 
 ;;;; %File Description:
 ;;;; 
@@ -24,13 +24,18 @@
     ((:module "base"
 	      :source-pathname ""
 	      :components ((:file "package")
-			   (:file "utility" :depends-on ("package"))))
+			   (:file "utility" :depends-on ("package"))
+			   #+CMU
+			   (:file "cmu-locking" :depends-on ("package"))
+			   #+LISPWORKS4.1
+			   (:file "lwl-locking" :depends-on ("package"))))
      (:module "main"
 	      :source-pathname "main"
 	      :components ((:file "status-codes")
-			   (:file "parsing")
 			   (:file "conditions"
-				  :depends-on ("status-codes" "parsing"))
+				  :depends-on ("status-codes"))
+			   (:file "parsing"
+			          :depends-on ("conditions"))
 			   (:file "url"
 				  :depends-on ("conditions" "status-codes"))
 			   (:file "version"
@@ -64,10 +69,14 @@
 			   (:file "logging"
 				  :depends-on ("messages" "entity" "server"))
 			   (:file "readtable"
-				  :depends-on ("url" "version")))
+				  :depends-on ("url" "version"))
+		           (:file "utility"
+			          :depends-on ("resource" "entity" "server")))
 	      :depends-on ("base"))
      (:module "driver"
 	      :source-pathname "drivers"
 	      :components (#+CMU
-	                   (:file "simple-cmu"))
+	                   (:file "simple-cmu")
+			   #+LISPWORKS4.1
+			   (:file "simple-lwl"))
 	      :depends-on ("base" "main"))))