diff --git a/debug.rkt b/debug.rkt
deleted file mode 100644
index 5696849..0000000
--- a/debug.rkt
+++ /dev/null
@@ -1,15 +0,0 @@
-#lang racket/base
-
-(provide report describe)
-
-(define-syntax-rule (report var)
-  (begin 
-    (displayln (format "~a = ~v" 'var var) (current-error-port)) 
-    var))
-
-(require (prefix-in williams: describe))
-
-(define (describe x)
-  (parameterize ([current-output-port (current-error-port)])
-    (williams:describe x))
-  x)
\ No newline at end of file
diff --git a/info.rkt b/info.rkt
index fce4e2b..30f42c4 100644
--- a/info.rkt
+++ b/info.rkt
@@ -1,4 +1,2 @@
-#lang info
-(define collection "sugar")
-(define scribblings '(("scribblings/sugar.scrbl" (multi-page))))
-(define deps '("describe"))
\ No newline at end of file
+#lang setup/infotab
+(define collection 'multi)
\ No newline at end of file
diff --git a/coerce.rkt b/sugar/coerce.rkt
similarity index 100%
rename from coerce.rkt
rename to sugar/coerce.rkt
diff --git a/coerce/contract.rkt b/sugar/coerce/contract.rkt
similarity index 100%
rename from coerce/contract.rkt
rename to sugar/coerce/contract.rkt
diff --git a/coerce/value.rkt b/sugar/coerce/value.rkt
similarity index 100%
rename from coerce/value.rkt
rename to sugar/coerce/value.rkt
diff --git a/container.rkt b/sugar/container.rkt
similarity index 100%
rename from container.rkt
rename to sugar/container.rkt
diff --git a/sugar/debug.rkt b/sugar/debug.rkt
new file mode 100644
index 0000000..b1e715c
--- /dev/null
+++ b/sugar/debug.rkt
@@ -0,0 +1,8 @@
+#lang racket/base
+
+(provide report)
+
+(define-syntax-rule (report var)
+  (begin 
+    (displayln (format "~a = ~v" 'var var) (current-error-port)) 
+    var))
diff --git a/define.rkt b/sugar/define.rkt
similarity index 100%
rename from define.rkt
rename to sugar/define.rkt
diff --git a/define/contract.rkt b/sugar/define/contract.rkt
similarity index 100%
rename from define/contract.rkt
rename to sugar/define/contract.rkt
diff --git a/define/provide.rkt b/sugar/define/provide.rkt
similarity index 100%
rename from define/provide.rkt
rename to sugar/define/provide.rkt
diff --git a/exception.rkt b/sugar/exception.rkt
similarity index 100%
rename from exception.rkt
rename to sugar/exception.rkt
diff --git a/file.rkt b/sugar/file.rkt
similarity index 100%
rename from file.rkt
rename to sugar/file.rkt
diff --git a/sugar/info.rkt b/sugar/info.rkt
new file mode 100644
index 0000000..7b5acae
--- /dev/null
+++ b/sugar/info.rkt
@@ -0,0 +1,2 @@
+#lang setup/infotab
+(define scribblings '(("scribblings/sugar.scrbl" (multi-page))))
\ No newline at end of file
diff --git a/len.rkt b/sugar/len.rkt
similarity index 100%
rename from len.rkt
rename to sugar/len.rkt
diff --git a/list.rkt b/sugar/list.rkt
similarity index 100%
rename from list.rkt
rename to sugar/list.rkt
diff --git a/macro.rkt b/sugar/macro.rkt
similarity index 100%
rename from macro.rkt
rename to sugar/macro.rkt
diff --git a/main.rkt b/sugar/main.rkt
similarity index 100%
rename from main.rkt
rename to sugar/main.rkt
diff --git a/misc.rkt b/sugar/misc.rkt
similarity index 100%
rename from misc.rkt
rename to sugar/misc.rkt
diff --git a/scribblings/coerce.scrbl b/sugar/scribblings/coerce.scrbl
similarity index 100%
rename from scribblings/coerce.scrbl
rename to sugar/scribblings/coerce.scrbl
diff --git a/scribblings/len.scrbl b/sugar/scribblings/len.scrbl
similarity index 100%
rename from scribblings/len.scrbl
rename to sugar/scribblings/len.scrbl
diff --git a/scribblings/sugar.scrbl b/sugar/scribblings/sugar.scrbl
similarity index 100%
rename from scribblings/sugar.scrbl
rename to sugar/scribblings/sugar.scrbl
diff --git a/string.rkt b/sugar/string.rkt
similarity index 100%
rename from string.rkt
rename to sugar/string.rkt
diff --git a/tests.rkt b/sugar/tests.rkt
similarity index 100%
rename from tests.rkt
rename to sugar/tests.rkt
diff --git a/tree.rkt b/sugar/tree.rkt
similarity index 100%
rename from tree.rkt
rename to sugar/tree.rkt
diff --git a/values.rkt b/sugar/values.rkt
similarity index 100%
rename from values.rkt
rename to sugar/values.rkt