diff --git a/s48/cml/AUTHORS b/s48/cml/AUTHORS
index cccfd5c..53bf9fe 100644
--- a/s48/cml/AUTHORS
+++ b/s48/cml/AUTHORS
@@ -1 +1 @@
-Mike Sperber
+Copyright (c) 2003 Mike Sperber
diff --git a/s48/cml/NEWS b/s48/cml/NEWS
new file mode 100644
index 0000000..26f793c
--- /dev/null
+++ b/s48/cml/NEWS
@@ -0,0 +1,2 @@
+version 0.0
+* New package system.
diff --git a/s48/cml/interfaces.scm b/s48/cml/interfaces.scm
deleted file mode 100644
index 0cb5a9f..0000000
--- a/s48/cml/interfaces.scm
+++ /dev/null
@@ -1,45 +0,0 @@
-
-(define-interface trans-ids-interface
-  (export enter-cr! leave-cr!
-	  leave-cr-and-block!
-	  trans-id?
-	  make-trans-id
-	  cr-trans-id-wait cr-trans-id-wakeup cr-maybe-trans-id-wakeup
-	  trans-id-thread-uid trans-id-cancelled?))
-
-(define-interface rendezvous-interface
-  (export always-rv never-rv
-	  guard with-nack choose wrap
-	  sync
-	  select))
-
-(define-interface make-rendezvous-interface
-  (export make-blocked make-enabled make-base))
-
-(define-interface rendezvous-channels-interface
-  (export make-channel
-	  channel?
-	  send-rv send
-	  receive-rv receive))
-
-(define-interface rendezvous-async-channels-interface
-  (export make-async-channel
-	  async-channel?
-	  send-async
-	  receive-async-rv
-	  receive-async))
-
-(define-interface rendezvous-placeholders-interface
-  (export make-placeholder
-	  placeholder?
-	  placeholder-value
-	  placeholder-set!
-	  placeholder-value-rv))
-
-(define-interface rendezvous-jars-interface
-  (export make-jar
-	  jar?
-	  jar-take
-	  jar-put!
-	  jar-take-rv))
-
diff --git a/s48/cml/packages.scm b/s48/cml/load.scm
similarity index 56%
rename from s48/cml/packages.scm
rename to s48/cml/load.scm
index 56bf1d1..3e32002 100644
--- a/s48/cml/packages.scm
+++ b/s48/cml/load.scm
@@ -1,3 +1,47 @@
+(define-interface trans-ids-interface
+  (export enter-cr! leave-cr!
+	  leave-cr-and-block!
+	  trans-id?
+	  make-trans-id
+	  cr-trans-id-wait cr-trans-id-wakeup cr-maybe-trans-id-wakeup
+	  trans-id-thread-uid trans-id-cancelled?))
+
+(define-interface rendezvous-interface
+  (export always-rv never-rv
+	  guard with-nack choose wrap
+	  sync
+	  select))
+
+(define-interface make-rendezvous-interface
+  (export make-blocked make-enabled make-base))
+
+(define-interface rendezvous-channels-interface
+  (export make-channel
+	  channel?
+	  send-rv send
+	  receive-rv receive))
+
+(define-interface rendezvous-async-channels-interface
+  (export make-async-channel
+	  async-channel?
+	  send-async
+	  receive-async-rv
+	  receive-async))
+
+(define-interface rendezvous-placeholders-interface
+  (export make-placeholder
+	  placeholder?
+	  placeholder-value
+	  placeholder-set!
+	  placeholder-value-rv))
+
+(define-interface rendezvous-jars-interface
+  (export make-jar
+	  jar?
+	  jar-take
+	  jar-put!
+	  jar-take-rv))
+
 (define-structure trans-ids trans-ids-interface
   (open scheme
 	srfi-9 big-util
diff --git a/s48/cml/pkg-def.scm b/s48/cml/pkg-def.scm
new file mode 100644
index 0000000..d12c1f1
--- /dev/null
+++ b/s48/cml/pkg-def.scm
@@ -0,0 +1,21 @@
+(define-package "cml"
+  (0 0)
+  ()
+  (install-file "load.scm" 'base)
+  (install-file "README" 'doc)
+  (install-file "NEWS" 'doc)
+  (install-string (COPYING) "COPYING" 'doc)
+  (install-file "async-channels.scm" 'scheme)
+  (install-file "placeholder.scm" 'scheme)
+  (install-file "trans-id.scm" 'scheme)
+  (install-file "channel.scm" 'scheme)
+  (install-file "jar.scm" 'scheme)
+  (install-file "rendezvous.scm" 'scheme))
+
+
+
+
+
+
+
+