diff --git a/info.rkt b/info.rkt
index 0b1dc1d..29c8e3d 100644
--- a/info.rkt
+++ b/info.rkt
@@ -1,7 +1,7 @@
 #lang info
-(define collection "sugar")
+(define collection 'multi)
 (define version "0.2")
 (define deps '("base"))
 (define build-deps '("scribble-lib" "racket-doc"))
-(define scribblings '(("scribblings/sugar.scrbl" ())))
-(define compile-omit-paths '("test"))
\ No newline at end of file
+(define scribblings '(("sugar/scribblings/sugar.scrbl" ())))
+(define compile-omit-paths '("sugar/test"))
\ No newline at end of file
diff --git a/cache.rkt b/sugar/cache.rkt
similarity index 100%
rename from cache.rkt
rename to sugar/cache.rkt
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/base.rkt b/sugar/coerce/base.rkt
similarity index 100%
rename from coerce/base.rkt
rename to sugar/coerce/base.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/debug.rkt b/sugar/debug.rkt
similarity index 100%
rename from debug.rkt
rename to sugar/debug.rkt
diff --git a/define.rkt b/sugar/define.rkt
similarity index 100%
rename from define.rkt
rename to sugar/define.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/list.rkt b/sugar/list.rkt
similarity index 100%
rename from list.rkt
rename to sugar/list.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/scribblings/cache.scrbl b/sugar/scribblings/cache.scrbl
similarity index 100%
rename from scribblings/cache.scrbl
rename to sugar/scribblings/cache.scrbl
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/container.scrbl b/sugar/scribblings/container.scrbl
similarity index 100%
rename from scribblings/container.scrbl
rename to sugar/scribblings/container.scrbl
diff --git a/scribblings/debug.scrbl b/sugar/scribblings/debug.scrbl
similarity index 100%
rename from scribblings/debug.scrbl
rename to sugar/scribblings/debug.scrbl
diff --git a/scribblings/file-extensions.scrbl b/sugar/scribblings/file-extensions.scrbl
similarity index 100%
rename from scribblings/file-extensions.scrbl
rename to sugar/scribblings/file-extensions.scrbl
diff --git a/scribblings/include.scrbl b/sugar/scribblings/include.scrbl
similarity index 100%
rename from scribblings/include.scrbl
rename to sugar/scribblings/include.scrbl
diff --git a/scribblings/installation.scrbl b/sugar/scribblings/installation.scrbl
similarity index 100%
rename from scribblings/installation.scrbl
rename to sugar/scribblings/installation.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/license.scrbl b/sugar/scribblings/license.scrbl
similarity index 100%
rename from scribblings/license.scrbl
rename to sugar/scribblings/license.scrbl
diff --git a/scribblings/list.scrbl b/sugar/scribblings/list.scrbl
similarity index 100%
rename from scribblings/list.scrbl
rename to sugar/scribblings/list.scrbl
diff --git a/scribblings/string.scrbl b/sugar/scribblings/string.scrbl
similarity index 100%
rename from scribblings/string.scrbl
rename to sugar/scribblings/string.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/scribblings/xml.scrbl b/sugar/scribblings/xml.scrbl
similarity index 100%
rename from scribblings/xml.scrbl
rename to sugar/scribblings/xml.scrbl
diff --git a/test.rkt b/sugar/test.rkt
similarity index 100%
rename from test.rkt
rename to sugar/test.rkt
diff --git a/test/debug-meta-lang.rkt b/sugar/test/debug-meta-lang.rkt
similarity index 100%
rename from test/debug-meta-lang.rkt
rename to sugar/test/debug-meta-lang.rkt
diff --git a/test/main.rkt b/sugar/test/main.rkt
similarity index 100%
rename from test/main.rkt
rename to sugar/test/main.rkt
diff --git a/test/test-require-modes.rkt b/sugar/test/test-require-modes.rkt
similarity index 100%
rename from test/test-require-modes.rkt
rename to sugar/test/test-require-modes.rkt
diff --git a/unstable/container.rkt b/sugar/unstable/container.rkt
similarity index 100%
rename from unstable/container.rkt
rename to sugar/unstable/container.rkt
diff --git a/unstable/include.rkt b/sugar/unstable/include.rkt
similarity index 100%
rename from unstable/include.rkt
rename to sugar/unstable/include.rkt
diff --git a/unstable/len.rkt b/sugar/unstable/len.rkt
similarity index 100%
rename from unstable/len.rkt
rename to sugar/unstable/len.rkt
diff --git a/unstable/misc.rkt b/sugar/unstable/misc.rkt
similarity index 100%
rename from unstable/misc.rkt
rename to sugar/unstable/misc.rkt
diff --git a/unstable/no-lang-line-source.txt b/sugar/unstable/no-lang-line-source.txt
similarity index 100%
rename from unstable/no-lang-line-source.txt
rename to sugar/unstable/no-lang-line-source.txt
diff --git a/unstable/source.rkt b/sugar/unstable/source.rkt
similarity index 100%
rename from unstable/source.rkt
rename to sugar/unstable/source.rkt
diff --git a/unstable/string.rkt b/sugar/unstable/string.rkt
similarity index 100%
rename from unstable/string.rkt
rename to sugar/unstable/string.rkt
diff --git a/xml.rkt b/sugar/xml.rkt
similarity index 100%
rename from xml.rkt
rename to sugar/xml.rkt