diff --git a/.gitignore b/.gitignore
index 1a59348..defa695 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@
 .\#*
 .DS_Store
 compiled/
-/doc/
+/*/doc/
diff --git a/.travis.yml b/.travis.yml
index 3f6653d..a8a8fab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,7 @@ before_install:
 - export PATH="${RACKET_DIR}/bin:${PATH}" #install-racket.sh can't set for us
 
 install:
- - raco pkg install -j 1 --deps search-auto
+ - raco pkg install -j 1 --deps search-auto ./typed-map ./typed-map-lib ./typed-map-test
 
 before_script:
 
@@ -50,8 +50,8 @@ before_script:
 # `raco pkg install --deps search-auto` to install any required
 # packages without it getting stuck on a confirmation prompt.
 script:
- - raco test -p typed-map
- - raco setup --check-pkg-deps --pkgs typed-map
+ - raco test -p typed-map typed-map-lib typed-map-test
+ - raco setup --check-pkg-deps --pkgs typed-map typed-map-lib typed-map-test
  - raco pkg install --deps search-auto doc-coverage
  - raco doc-coverage typed-map
 
diff --git a/info.rkt b/typed-map-doc/info.rkt
similarity index 64%
rename from info.rkt
rename to typed-map-doc/info.rkt
index 51d8bb6..4962375 100644
--- a/info.rkt
+++ b/typed-map-doc/info.rkt
@@ -1,16 +1,13 @@
 #lang info
 (define collection "typed-map")
-(define deps '("base"
-               "rackunit-lib"
-               "typed-racket-lib"
-               "typed-racket-more"))
+(define deps '("base"))
 (define build-deps '("scribble-lib"
                      "racket-doc"
-                     "aful"
                      "typed-racket-doc"))
 (define scribblings '(("scribblings/typed-map.scrbl" ())))
 (define pkg-desc
-  (string-append "Type inference helper for map with Typed/Racket."
+  (string-append "Documentation for typed-map-lib, a"
+                 " type inference helper for map with Typed/Racket."
                  " Supports afl, un-annotated lambdas and polymorphic"
                  " functions."))
 (define version "1.0")
diff --git a/scribblings/typed-map.scrbl b/typed-map-doc/scribblings/typed-map.scrbl
similarity index 98%
rename from scribblings/typed-map.scrbl
rename to typed-map-doc/scribblings/typed-map.scrbl
index d58f5c5..87cba90 100644
--- a/scribblings/typed-map.scrbl
+++ b/typed-map-doc/scribblings/typed-map.scrbl
@@ -30,7 +30,7 @@
            (let ([l '(4 5 6)])
              (map (λ (x) (* x 2)) l))]
 
- This enables the use of @racket[#,(hash-lang) #,(racketmodname afl)] for
+ This enables the use of @racket[#,(hash-lang) #,(racketmodname aful)] for
  @racket[map] in Typed Racket.
 
  Furthermore, when @racket[f] is a polymorphic function, type annotations are
diff --git a/LICENSE.txt b/typed-map-lib/LICENSE.txt
similarity index 100%
rename from LICENSE.txt
rename to typed-map-lib/LICENSE.txt
diff --git a/README.md b/typed-map-lib/README.md
similarity index 100%
rename from README.md
rename to typed-map-lib/README.md
diff --git a/typed-map-lib/info.rkt b/typed-map-lib/info.rkt
new file mode 100644
index 0000000..d2846be
--- /dev/null
+++ b/typed-map-lib/info.rkt
@@ -0,0 +1,11 @@
+#lang info
+(define collection "typed-map")
+(define deps '("base"
+               "typed-racket-lib"))
+(define build-deps '())
+(define pkg-desc
+  (string-append "Type inference helper for map with Typed/Racket."
+                 " Supports afl, un-annotated lambdas and polymorphic"
+                 " functions."))
+(define version "1.0")
+(define pkg-authors '("Georges Dupéron"))
diff --git a/main.rkt b/typed-map-lib/main.rkt
similarity index 100%
rename from main.rkt
rename to typed-map-lib/main.rkt
diff --git a/typed-map-test/info.rkt b/typed-map-test/info.rkt
new file mode 100644
index 0000000..3072512
--- /dev/null
+++ b/typed-map-test/info.rkt
@@ -0,0 +1,12 @@
+#lang info
+(define collection "typed-map")
+(define deps '("base"
+               "rackunit-lib"
+               "typed-racket-lib"
+               "typed-racket-more"
+               "typed-map-lib"))
+(define build-deps '("aful"))
+(define scribblings '(("scribblings/typed-map.scrbl" ())))
+(define pkg-desc "Tests for typed-map-lib")
+(define version "1.0")
+(define pkg-authors '("Georges Dupéron"))
diff --git a/test/test-map.rkt b/typed-map-test/test/test-map.rkt
similarity index 100%
rename from test/test-map.rkt
rename to typed-map-test/test/test-map.rkt
diff --git a/typed-map/info.rkt b/typed-map/info.rkt
new file mode 100644
index 0000000..7969348
--- /dev/null
+++ b/typed-map/info.rkt
@@ -0,0 +1,13 @@
+#lang info
+(define collection 'multi)
+(define deps '("typed-map-lib"
+               "typed-map-test"))
+(define implies '("typed-map-lib"
+                  "typed-map-test"))
+(define build-deps '())
+(define pkg-desc
+  (string-append "Type inference helper for map with Typed/Racket."
+                 " Supports afl, un-annotated lambdas and polymorphic"
+                 " functions."))
+(define version "1.0")
+(define pkg-authors '("Georges Dupéron"))