diff --git a/CLASH.system b/CLASH.system
index 9db5fb6..dbcb6bc 100644
--- a/CLASH.system
+++ b/CLASH.system
@@ -24,16 +24,20 @@
      (:file "socket" :depends-on ("package"))))
 
 (defsystem "CLASH"
-    :source-pathname "src"
+    :source-pathname #.(merge-pathnames
+			"src/"
+			(make-pathname :name nil :type nil :version nil
+				       :defaults *load-truename*))
     :source-extension "cl"
     :components
     ((:module "base"
 	      :source-pathname ""
-	      :components ((:file "package")))
+	      :components ((:file "package")
+			   (:file "utility" :depends-on ("package"))))
      (:module "main"
 	      :source-pathname "main"
-	      :components ((:file "conditions")
-			   (:file "status-codes")
+	      :components ((:file "status-codes")
+			   (:file "conditions" :depends-on ("status-codes"))
 			   (:file "url"
 				  :depends-on ("conditions" "status-codes"))
 			   (:file "version"
@@ -43,14 +47,14 @@
 			   (:file "connection"
 				  :depends-on ("http-io"))
 			   (:file "method")
-			   (:file "namespace"
-				  :depends-on ("url"))
 			   (:file "messages"
 				  :depends-on ("url" "version"))
 			   (:file "entity"
 				  :depends-on ("http-io" "url"))
 			   (:file "resource"
 				  :depends-on ("entity" "method"))
+			   (:file "namespace"
+				  :depends-on ("url" "resource"))
 			   (:file "server"
 				  :depends-on ("namespace" "messages"
 							   "resource"))