diff --git a/pkgs/math/COPYING.txt b/pkgs/math-pkgs/math-doc/COPYING.txt
similarity index 100%
rename from pkgs/math/COPYING.txt
rename to pkgs/math-pkgs/math-doc/COPYING.txt
diff --git a/pkgs/math/COPYING_LESSER.txt b/pkgs/math-pkgs/math-doc/COPYING_LESSER.txt
similarity index 100%
rename from pkgs/math/COPYING_LESSER.txt
rename to pkgs/math-pkgs/math-doc/COPYING_LESSER.txt
diff --git a/pkgs/math/LICENSE.txt b/pkgs/math-pkgs/math-doc/LICENSE.txt
similarity index 100%
rename from pkgs/math/LICENSE.txt
rename to pkgs/math-pkgs/math-doc/LICENSE.txt
diff --git a/pkgs/math-pkgs/math-doc/info.rkt b/pkgs/math-pkgs/math-doc/info.rkt
new file mode 100644
index 0000000000..ef783776cb
--- /dev/null
+++ b/pkgs/math-pkgs/math-doc/info.rkt
@@ -0,0 +1,20 @@
+#lang info
+
+(define collection 'multi)
+
+(define deps '("base"))
+
+(define build-deps '("at-exp-lib"
+                     "math-lib"
+                     "plot-doc"
+                     "plot-gui-lib"
+                     "racket-doc"
+                     "sandbox-lib"
+                     "scribble-lib"
+                     "typed-racket-doc"
+                     "typed-racket-lib"
+                     "unstable-2d"))
+
+(define pkg-desc "Math library documentation")
+
+(define pkg-authors '(ntoronto))
diff --git a/pkgs/math-pkgs/math-doc/math/info.rkt b/pkgs/math-pkgs/math-doc/math/info.rkt
new file mode 100644
index 0000000000..76b079e84c
--- /dev/null
+++ b/pkgs/math-pkgs/math-doc/math/info.rkt
@@ -0,0 +1,2 @@
+#lang info
+(define scribblings '(["scribblings/math.scrbl" (multi-page)]))
diff --git a/pkgs/math/scribblings/math-array.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math-array.scrbl
similarity index 100%
rename from pkgs/math/scribblings/math-array.scrbl
rename to pkgs/math-pkgs/math-doc/math/scribblings/math-array.scrbl
diff --git a/pkgs/math/scribblings/math-base.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math-base.scrbl
similarity index 100%
rename from pkgs/math/scribblings/math-base.scrbl
rename to pkgs/math-pkgs/math-doc/math/scribblings/math-base.scrbl
diff --git a/pkgs/math/scribblings/math-bigfloat.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math-bigfloat.scrbl
similarity index 100%
rename from pkgs/math/scribblings/math-bigfloat.scrbl
rename to pkgs/math-pkgs/math-doc/math/scribblings/math-bigfloat.scrbl
diff --git a/pkgs/math/scribblings/math-distributions.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math-distributions.scrbl
similarity index 100%
rename from pkgs/math/scribblings/math-distributions.scrbl
rename to pkgs/math-pkgs/math-doc/math/scribblings/math-distributions.scrbl
diff --git a/pkgs/math/scribblings/math-flonum.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math-flonum.scrbl
similarity index 100%
rename from pkgs/math/scribblings/math-flonum.scrbl
rename to pkgs/math-pkgs/math-doc/math/scribblings/math-flonum.scrbl
diff --git a/pkgs/math/scribblings/math-matrix.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math-matrix.scrbl
similarity index 100%
rename from pkgs/math/scribblings/math-matrix.scrbl
rename to pkgs/math-pkgs/math-doc/math/scribblings/math-matrix.scrbl
diff --git a/pkgs/math/scribblings/math-number-theory.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math-number-theory.scrbl
similarity index 100%
rename from pkgs/math/scribblings/math-number-theory.scrbl
rename to pkgs/math-pkgs/math-doc/math/scribblings/math-number-theory.scrbl
diff --git a/pkgs/math/scribblings/math-special-functions.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math-special-functions.scrbl
similarity index 100%
rename from pkgs/math/scribblings/math-special-functions.scrbl
rename to pkgs/math-pkgs/math-doc/math/scribblings/math-special-functions.scrbl
diff --git a/pkgs/math/scribblings/math-statistics.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math-statistics.scrbl
similarity index 100%
rename from pkgs/math/scribblings/math-statistics.scrbl
rename to pkgs/math-pkgs/math-doc/math/scribblings/math-statistics.scrbl
diff --git a/pkgs/math/scribblings/math-utils.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math-utils.scrbl
similarity index 100%
rename from pkgs/math/scribblings/math-utils.scrbl
rename to pkgs/math-pkgs/math-doc/math/scribblings/math-utils.scrbl
diff --git a/pkgs/math/scribblings/math.scrbl b/pkgs/math-pkgs/math-doc/math/scribblings/math.scrbl
similarity index 100%
rename from pkgs/math/scribblings/math.scrbl
rename to pkgs/math-pkgs/math-doc/math/scribblings/math.scrbl
diff --git a/pkgs/math/scribblings/rename-defines.rkt b/pkgs/math-pkgs/math-doc/math/scribblings/rename-defines.rkt
similarity index 100%
rename from pkgs/math/scribblings/rename-defines.rkt
rename to pkgs/math-pkgs/math-doc/math/scribblings/rename-defines.rkt
diff --git a/pkgs/math/scribblings/utils.rkt b/pkgs/math-pkgs/math-doc/math/scribblings/utils.rkt
similarity index 100%
rename from pkgs/math/scribblings/utils.rkt
rename to pkgs/math-pkgs/math-doc/math/scribblings/utils.rkt
diff --git a/pkgs/math-pkgs/math-lib/COPYING.txt b/pkgs/math-pkgs/math-lib/COPYING.txt
new file mode 100644
index 0000000000..4432540474
--- /dev/null
+++ b/pkgs/math-pkgs/math-lib/COPYING.txt
@@ -0,0 +1,676 @@
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+ 
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+  
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
diff --git a/pkgs/math-pkgs/math-lib/COPYING_LESSER.txt b/pkgs/math-pkgs/math-lib/COPYING_LESSER.txt
new file mode 100644
index 0000000000..fc8a5de7ed
--- /dev/null
+++ b/pkgs/math-pkgs/math-lib/COPYING_LESSER.txt
@@ -0,0 +1,165 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/pkgs/math-pkgs/math-lib/LICENSE.txt b/pkgs/math-pkgs/math-lib/LICENSE.txt
new file mode 100644
index 0000000000..0d5401b315
--- /dev/null
+++ b/pkgs/math-pkgs/math-lib/LICENSE.txt
@@ -0,0 +1,51 @@
+The math collection is distributed under the GNU Lesser General Public
+License Version 3 (LGPLv3) just like the majority of Racket's libraries.
+The LGPLv3 license text is included in the file "COPYING_LESSER.txt".
+
+Some of the math library code is derived from the C++ project Boost,
+from source files released under the Boost Software License Version 1.0
+(BSLv1.0). This license is compatible with the LGPLv3, provided the
+BSLv1.0 license text is distributed along with any source code derived
+from BSLv1.0 works.
+
+Some of the math library is derived from ubiquitous C libraries released
+under a license with similar terms.
+
+To comply with the terms of the BSLv1.0, its text is duplicated here:
+
+============================================================================
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+============================================================================
+
+
+To comply with the terms of the other license, its text is duplicated here:
+
+============================================================================
+Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+
+Developed at SunPro, a Sun Microsystems, Inc. business. Permission to use,
+copy, modify, and distribute this software is freely granted, provided that
+this notice is preserved.
+============================================================================
diff --git a/pkgs/math-pkgs/math-lib/info.rkt b/pkgs/math-pkgs/math-lib/info.rkt
new file mode 100644
index 0000000000..f043fbe72f
--- /dev/null
+++ b/pkgs/math-pkgs/math-lib/info.rkt
@@ -0,0 +1,19 @@
+#lang info
+
+(define collection 'multi)
+
+(define deps '("base"
+               "r6rs-lib"
+               "typed-racket-lib"
+               "typed-racket-more"
+               ("math-i386-macosx" #:platform "i386-macosx")
+               ("math-x86_64-macosx" #:platform "x86_64-macosx")
+               ("math-ppc-macosx" #:platform "ppc-macosx")
+               ("math-win32-i386" #:platform "win32\\i386")
+               ("math-win32-x86_64" #:platform "win32\\x86_64")))
+
+(define build-deps '())
+
+(define pkg-desc "Math library")
+
+(define pkg-authors '(ntoronto))
diff --git a/pkgs/math/array.rkt b/pkgs/math-pkgs/math-lib/math/array.rkt
similarity index 100%
rename from pkgs/math/array.rkt
rename to pkgs/math-pkgs/math-lib/math/array.rkt
diff --git a/pkgs/math/base.rkt b/pkgs/math-pkgs/math-lib/math/base.rkt
similarity index 100%
rename from pkgs/math/base.rkt
rename to pkgs/math-pkgs/math-lib/math/base.rkt
diff --git a/pkgs/math/bigfloat.rkt b/pkgs/math-pkgs/math-lib/math/bigfloat.rkt
similarity index 100%
rename from pkgs/math/bigfloat.rkt
rename to pkgs/math-pkgs/math-lib/math/bigfloat.rkt
diff --git a/pkgs/math/distributions.rkt b/pkgs/math-pkgs/math-lib/math/distributions.rkt
similarity index 100%
rename from pkgs/math/distributions.rkt
rename to pkgs/math-pkgs/math-lib/math/distributions.rkt
diff --git a/pkgs/math/flonum.rkt b/pkgs/math-pkgs/math-lib/math/flonum.rkt
similarity index 100%
rename from pkgs/math/flonum.rkt
rename to pkgs/math-pkgs/math-lib/math/flonum.rkt
diff --git a/pkgs/math-pkgs/math-lib/math/info.rkt b/pkgs/math-pkgs/math-lib/math/info.rkt
new file mode 100644
index 0000000000..e0c94f2762
--- /dev/null
+++ b/pkgs/math-pkgs/math-lib/math/info.rkt
@@ -0,0 +1 @@
+#lang info
diff --git a/pkgs/math/main.rkt b/pkgs/math-pkgs/math-lib/math/main.rkt
similarity index 100%
rename from pkgs/math/main.rkt
rename to pkgs/math-pkgs/math-lib/math/main.rkt
diff --git a/pkgs/math/matrix.rkt b/pkgs/math-pkgs/math-lib/math/matrix.rkt
similarity index 100%
rename from pkgs/math/matrix.rkt
rename to pkgs/math-pkgs/math-lib/math/matrix.rkt
diff --git a/pkgs/math/number-theory.rkt b/pkgs/math-pkgs/math-lib/math/number-theory.rkt
similarity index 100%
rename from pkgs/math/number-theory.rkt
rename to pkgs/math-pkgs/math-lib/math/number-theory.rkt
diff --git a/pkgs/math/private/array/array-broadcast.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-broadcast.rkt
similarity index 100%
rename from pkgs/math/private/array/array-broadcast.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/array-broadcast.rkt
diff --git a/pkgs/math/private/array/array-comprehension.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-comprehension.rkt
similarity index 100%
rename from pkgs/math/private/array/array-comprehension.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/array-comprehension.rkt
diff --git a/pkgs/math/private/array/array-constructors.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-constructors.rkt
similarity index 100%
rename from pkgs/math/private/array/array-constructors.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/array-constructors.rkt
diff --git a/pkgs/math/private/array/array-convert.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-convert.rkt
similarity index 100%
rename from pkgs/math/private/array/array-convert.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/array-convert.rkt
diff --git a/pkgs/math/private/array/array-fft.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-fft.rkt
similarity index 100%
rename from pkgs/math/private/array/array-fft.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/array-fft.rkt
diff --git a/pkgs/math/private/array/array-fold.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-fold.rkt
similarity index 100%
rename from pkgs/math/private/array/array-fold.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/array-fold.rkt
diff --git a/pkgs/math/private/array/array-indexing.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-indexing.rkt
similarity index 100%
rename from pkgs/math/private/array/array-indexing.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/array-indexing.rkt
diff --git a/pkgs/math/private/array/array-parallel.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-parallel.rkt
similarity index 100%
rename from pkgs/math/private/array/array-parallel.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/array-parallel.rkt
diff --git a/pkgs/math/private/array/array-pointwise.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-pointwise.rkt
similarity index 100%
rename from pkgs/math/private/array/array-pointwise.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/array-pointwise.rkt
diff --git a/pkgs/math/private/array/array-print.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-print.rkt
similarity index 100%
rename from pkgs/math/private/array/array-print.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/array-print.rkt
diff --git a/pkgs/math/private/array/array-sequence.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-sequence.rkt
similarity index 100%
rename from pkgs/math/private/array/array-sequence.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/array-sequence.rkt
diff --git a/pkgs/math/private/array/array-struct.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-struct.rkt
similarity index 100%
rename from pkgs/math/private/array/array-struct.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/array-struct.rkt
diff --git a/pkgs/math/private/array/array-syntax.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-syntax.rkt
similarity index 100%
rename from pkgs/math/private/array/array-syntax.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/array-syntax.rkt
diff --git a/pkgs/math/private/array/array-transform.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-transform.rkt
similarity index 100%
rename from pkgs/math/private/array/array-transform.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/array-transform.rkt
diff --git a/pkgs/math/private/array/array-unfold.rkt b/pkgs/math-pkgs/math-lib/math/private/array/array-unfold.rkt
similarity index 100%
rename from pkgs/math/private/array/array-unfold.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/array-unfold.rkt
diff --git a/pkgs/math/private/array/fcarray-pointwise.rkt b/pkgs/math-pkgs/math-lib/math/private/array/fcarray-pointwise.rkt
similarity index 100%
rename from pkgs/math/private/array/fcarray-pointwise.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/fcarray-pointwise.rkt
diff --git a/pkgs/math/private/array/fcarray-struct.rkt b/pkgs/math-pkgs/math-lib/math/private/array/fcarray-struct.rkt
similarity index 100%
rename from pkgs/math/private/array/fcarray-struct.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/fcarray-struct.rkt
diff --git a/pkgs/math/private/array/flarray-pointwise.rkt b/pkgs/math-pkgs/math-lib/math/private/array/flarray-pointwise.rkt
similarity index 100%
rename from pkgs/math/private/array/flarray-pointwise.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/flarray-pointwise.rkt
diff --git a/pkgs/math/private/array/flarray-struct.rkt b/pkgs/math-pkgs/math-lib/math/private/array/flarray-struct.rkt
similarity index 100%
rename from pkgs/math/private/array/flarray-struct.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/flarray-struct.rkt
diff --git a/pkgs/math/private/array/for-each.rkt b/pkgs/math-pkgs/math-lib/math/private/array/for-each.rkt
similarity index 100%
rename from pkgs/math/private/array/for-each.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/for-each.rkt
diff --git a/pkgs/math/private/array/mutable-array.rkt b/pkgs/math-pkgs/math-lib/math/private/array/mutable-array.rkt
similarity index 100%
rename from pkgs/math/private/array/mutable-array.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/mutable-array.rkt
diff --git a/pkgs/math/private/array/typed-array-constructors.rkt b/pkgs/math-pkgs/math-lib/math/private/array/typed-array-constructors.rkt
similarity index 100%
rename from pkgs/math/private/array/typed-array-constructors.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/typed-array-constructors.rkt
diff --git a/pkgs/math/private/array/typed-array-convert.rkt b/pkgs/math-pkgs/math-lib/math/private/array/typed-array-convert.rkt
similarity index 100%
rename from pkgs/math/private/array/typed-array-convert.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/typed-array-convert.rkt
diff --git a/pkgs/math/private/array/typed-array-fold.rkt b/pkgs/math-pkgs/math-lib/math/private/array/typed-array-fold.rkt
similarity index 100%
rename from pkgs/math/private/array/typed-array-fold.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/typed-array-fold.rkt
diff --git a/pkgs/math/private/array/typed-array-indexing.rkt b/pkgs/math-pkgs/math-lib/math/private/array/typed-array-indexing.rkt
similarity index 100%
rename from pkgs/math/private/array/typed-array-indexing.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/typed-array-indexing.rkt
diff --git a/pkgs/math/private/array/typed-array-pointwise.rkt b/pkgs/math-pkgs/math-lib/math/private/array/typed-array-pointwise.rkt
similarity index 100%
rename from pkgs/math/private/array/typed-array-pointwise.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/typed-array-pointwise.rkt
diff --git a/pkgs/math/private/array/typed-array-sequence.rkt b/pkgs/math-pkgs/math-lib/math/private/array/typed-array-sequence.rkt
similarity index 100%
rename from pkgs/math/private/array/typed-array-sequence.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/typed-array-sequence.rkt
diff --git a/pkgs/math/private/array/typed-array-struct.rkt b/pkgs/math-pkgs/math-lib/math/private/array/typed-array-struct.rkt
similarity index 100%
rename from pkgs/math/private/array/typed-array-struct.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/typed-array-struct.rkt
diff --git a/pkgs/math/private/array/typed-array-transform.rkt b/pkgs/math-pkgs/math-lib/math/private/array/typed-array-transform.rkt
similarity index 100%
rename from pkgs/math/private/array/typed-array-transform.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/typed-array-transform.rkt
diff --git a/pkgs/math/private/array/typed-mutable-array.rkt b/pkgs/math-pkgs/math-lib/math/private/array/typed-mutable-array.rkt
similarity index 100%
rename from pkgs/math/private/array/typed-mutable-array.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/typed-mutable-array.rkt
diff --git a/pkgs/math/private/array/typed-utils.rkt b/pkgs/math-pkgs/math-lib/math/private/array/typed-utils.rkt
similarity index 100%
rename from pkgs/math/private/array/typed-utils.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/typed-utils.rkt
diff --git a/pkgs/math/private/array/untyped-array-convert.rkt b/pkgs/math-pkgs/math-lib/math/private/array/untyped-array-convert.rkt
similarity index 100%
rename from pkgs/math/private/array/untyped-array-convert.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/untyped-array-convert.rkt
diff --git a/pkgs/math/private/array/untyped-array-pointwise.rkt b/pkgs/math-pkgs/math-lib/math/private/array/untyped-array-pointwise.rkt
similarity index 100%
rename from pkgs/math/private/array/untyped-array-pointwise.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/untyped-array-pointwise.rkt
diff --git a/pkgs/math/private/array/utils.rkt b/pkgs/math-pkgs/math-lib/math/private/array/utils.rkt
similarity index 100%
rename from pkgs/math/private/array/utils.rkt
rename to pkgs/math-pkgs/math-lib/math/private/array/utils.rkt
diff --git a/pkgs/math/private/base/base-constants.rkt b/pkgs/math-pkgs/math-lib/math/private/base/base-constants.rkt
similarity index 100%
rename from pkgs/math/private/base/base-constants.rkt
rename to pkgs/math-pkgs/math-lib/math/private/base/base-constants.rkt
diff --git a/pkgs/math/private/base/base-functions.rkt b/pkgs/math-pkgs/math-lib/math/private/base/base-functions.rkt
similarity index 100%
rename from pkgs/math/private/base/base-functions.rkt
rename to pkgs/math-pkgs/math-lib/math/private/base/base-functions.rkt
diff --git a/pkgs/math/private/base/base-random.rkt b/pkgs/math-pkgs/math-lib/math/private/base/base-random.rkt
similarity index 100%
rename from pkgs/math/private/base/base-random.rkt
rename to pkgs/math-pkgs/math-lib/math/private/base/base-random.rkt
diff --git a/pkgs/math/private/bigfloat/bigfloat-beta.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-beta.rkt
similarity index 100%
rename from pkgs/math/private/bigfloat/bigfloat-beta.rkt
rename to pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-beta.rkt
diff --git a/pkgs/math/private/bigfloat/bigfloat-constants.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-constants.rkt
similarity index 100%
rename from pkgs/math/private/bigfloat/bigfloat-constants.rkt
rename to pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-constants.rkt
diff --git a/pkgs/math/private/bigfloat/bigfloat-continued-fraction.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-continued-fraction.rkt
similarity index 100%
rename from pkgs/math/private/bigfloat/bigfloat-continued-fraction.rkt
rename to pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-continued-fraction.rkt
diff --git a/pkgs/math/private/bigfloat/bigfloat-hurwitz-zeta.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-hurwitz-zeta.rkt
similarity index 100%
rename from pkgs/math/private/bigfloat/bigfloat-hurwitz-zeta.rkt
rename to pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-hurwitz-zeta.rkt
diff --git a/pkgs/math/private/bigfloat/bigfloat-incomplete-beta.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-incomplete-beta.rkt
similarity index 100%
rename from pkgs/math/private/bigfloat/bigfloat-incomplete-beta.rkt
rename to pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-incomplete-beta.rkt
diff --git a/pkgs/math/private/bigfloat/bigfloat-incomplete-gamma.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-incomplete-gamma.rkt
similarity index 100%
rename from pkgs/math/private/bigfloat/bigfloat-incomplete-gamma.rkt
rename to pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-incomplete-gamma.rkt
diff --git a/pkgs/math/private/bigfloat/bigfloat-log-arithmetic.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-log-arithmetic.rkt
similarity index 100%
rename from pkgs/math/private/bigfloat/bigfloat-log-arithmetic.rkt
rename to pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-log-arithmetic.rkt
diff --git a/pkgs/math/private/bigfloat/bigfloat-mpfr.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-mpfr.rkt
similarity index 100%
rename from pkgs/math/private/bigfloat/bigfloat-mpfr.rkt
rename to pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-mpfr.rkt
diff --git a/pkgs/math/private/bigfloat/bigfloat-struct.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-struct.rkt
similarity index 100%
rename from pkgs/math/private/bigfloat/bigfloat-struct.rkt
rename to pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-struct.rkt
diff --git a/pkgs/math/private/bigfloat/bigfloat-syntax.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-syntax.rkt
similarity index 100%
rename from pkgs/math/private/bigfloat/bigfloat-syntax.rkt
rename to pkgs/math-pkgs/math-lib/math/private/bigfloat/bigfloat-syntax.rkt
diff --git a/pkgs/math/private/bigfloat/gmp.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/gmp.rkt
similarity index 100%
rename from pkgs/math/private/bigfloat/gmp.rkt
rename to pkgs/math-pkgs/math-lib/math/private/bigfloat/gmp.rkt
diff --git a/pkgs/math/private/bigfloat/mpfr.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/mpfr.rkt
similarity index 100%
rename from pkgs/math/private/bigfloat/mpfr.rkt
rename to pkgs/math-pkgs/math-lib/math/private/bigfloat/mpfr.rkt
diff --git a/pkgs/math/private/bigfloat/utils.rkt b/pkgs/math-pkgs/math-lib/math/private/bigfloat/utils.rkt
similarity index 100%
rename from pkgs/math/private/bigfloat/utils.rkt
rename to pkgs/math-pkgs/math-lib/math/private/bigfloat/utils.rkt
diff --git a/pkgs/math/private/distributions/bernoulli-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/bernoulli-dist.rkt
similarity index 100%
rename from pkgs/math/private/distributions/bernoulli-dist.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/bernoulli-dist.rkt
diff --git a/pkgs/math/private/distributions/beta-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/beta-dist.rkt
similarity index 100%
rename from pkgs/math/private/distributions/beta-dist.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/beta-dist.rkt
diff --git a/pkgs/math/private/distributions/binomial-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/binomial-dist.rkt
similarity index 100%
rename from pkgs/math/private/distributions/binomial-dist.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/binomial-dist.rkt
diff --git a/pkgs/math/private/distributions/cauchy-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/cauchy-dist.rkt
similarity index 100%
rename from pkgs/math/private/distributions/cauchy-dist.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/cauchy-dist.rkt
diff --git a/pkgs/math/private/distributions/delta-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/delta-dist.rkt
similarity index 100%
rename from pkgs/math/private/distributions/delta-dist.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/delta-dist.rkt
diff --git a/pkgs/math/private/distributions/discrete-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/discrete-dist.rkt
similarity index 100%
rename from pkgs/math/private/distributions/discrete-dist.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/discrete-dist.rkt
diff --git a/pkgs/math/private/distributions/dist-struct.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/dist-struct.rkt
similarity index 100%
rename from pkgs/math/private/distributions/dist-struct.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/dist-struct.rkt
diff --git a/pkgs/math/private/distributions/exponential-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/exponential-dist.rkt
similarity index 100%
rename from pkgs/math/private/distributions/exponential-dist.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/exponential-dist.rkt
diff --git a/pkgs/math/private/distributions/gamma-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/gamma-dist.rkt
similarity index 100%
rename from pkgs/math/private/distributions/gamma-dist.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/gamma-dist.rkt
diff --git a/pkgs/math/private/distributions/geometric-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/geometric-dist.rkt
similarity index 100%
rename from pkgs/math/private/distributions/geometric-dist.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/geometric-dist.rkt
diff --git a/pkgs/math/private/distributions/impl/beta-inv-cdf.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/beta-inv-cdf.rkt
similarity index 100%
rename from pkgs/math/private/distributions/impl/beta-inv-cdf.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/impl/beta-inv-cdf.rkt
diff --git a/pkgs/math/private/distributions/impl/beta-pdf.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/beta-pdf.rkt
similarity index 100%
rename from pkgs/math/private/distributions/impl/beta-pdf.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/impl/beta-pdf.rkt
diff --git a/pkgs/math/private/distributions/impl/beta-utils.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/beta-utils.rkt
similarity index 100%
rename from pkgs/math/private/distributions/impl/beta-utils.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/impl/beta-utils.rkt
diff --git a/pkgs/math/private/distributions/impl/binomial-pdf.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/binomial-pdf.rkt
similarity index 100%
rename from pkgs/math/private/distributions/impl/binomial-pdf.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/impl/binomial-pdf.rkt
diff --git a/pkgs/math/private/distributions/impl/binomial-random.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/binomial-random.rkt
similarity index 100%
rename from pkgs/math/private/distributions/impl/binomial-random.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/impl/binomial-random.rkt
diff --git a/pkgs/math/private/distributions/impl/delta-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/delta-dist.rkt
similarity index 100%
rename from pkgs/math/private/distributions/impl/delta-dist.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/impl/delta-dist.rkt
diff --git a/pkgs/math/private/distributions/impl/gamma-inv-cdf.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/gamma-inv-cdf.rkt
similarity index 100%
rename from pkgs/math/private/distributions/impl/gamma-inv-cdf.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/impl/gamma-inv-cdf.rkt
diff --git a/pkgs/math/private/distributions/impl/gamma-pdf.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/gamma-pdf.rkt
similarity index 100%
rename from pkgs/math/private/distributions/impl/gamma-pdf.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/impl/gamma-pdf.rkt
diff --git a/pkgs/math/private/distributions/impl/gamma-random.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/gamma-random.rkt
similarity index 100%
rename from pkgs/math/private/distributions/impl/gamma-random.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/impl/gamma-random.rkt
diff --git a/pkgs/math/private/distributions/impl/normal-cdf.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-cdf.rkt
similarity index 100%
rename from pkgs/math/private/distributions/impl/normal-cdf.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-cdf.rkt
diff --git a/pkgs/math/private/distributions/impl/normal-inv-cdf.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-inv-cdf.rkt
similarity index 100%
rename from pkgs/math/private/distributions/impl/normal-inv-cdf.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-inv-cdf.rkt
diff --git a/pkgs/math/private/distributions/impl/normal-pdf.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-pdf.rkt
similarity index 100%
rename from pkgs/math/private/distributions/impl/normal-pdf.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-pdf.rkt
diff --git a/pkgs/math/private/distributions/impl/normal-random.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-random.rkt
similarity index 100%
rename from pkgs/math/private/distributions/impl/normal-random.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-random.rkt
diff --git a/pkgs/math/private/distributions/impl/normal-utils.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-utils.rkt
similarity index 100%
rename from pkgs/math/private/distributions/impl/normal-utils.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/impl/normal-utils.rkt
diff --git a/pkgs/math/private/distributions/impl/poisson-pdf.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/poisson-pdf.rkt
similarity index 100%
rename from pkgs/math/private/distributions/impl/poisson-pdf.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/impl/poisson-pdf.rkt
diff --git a/pkgs/math/private/distributions/impl/poisson-random.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/poisson-random.rkt
similarity index 100%
rename from pkgs/math/private/distributions/impl/poisson-random.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/impl/poisson-random.rkt
diff --git a/pkgs/math/private/distributions/impl/walker-table.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/impl/walker-table.rkt
similarity index 100%
rename from pkgs/math/private/distributions/impl/walker-table.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/impl/walker-table.rkt
diff --git a/pkgs/math/private/distributions/logistic-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/logistic-dist.rkt
similarity index 100%
rename from pkgs/math/private/distributions/logistic-dist.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/logistic-dist.rkt
diff --git a/pkgs/math/private/distributions/normal-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/normal-dist.rkt
similarity index 100%
rename from pkgs/math/private/distributions/normal-dist.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/normal-dist.rkt
diff --git a/pkgs/math/private/distributions/poisson-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/poisson-dist.rkt
similarity index 100%
rename from pkgs/math/private/distributions/poisson-dist.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/poisson-dist.rkt
diff --git a/pkgs/math/private/distributions/triangle-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/triangle-dist.rkt
similarity index 100%
rename from pkgs/math/private/distributions/triangle-dist.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/triangle-dist.rkt
diff --git a/pkgs/math/private/distributions/truncated-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/truncated-dist.rkt
similarity index 100%
rename from pkgs/math/private/distributions/truncated-dist.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/truncated-dist.rkt
diff --git a/pkgs/math/private/distributions/uniform-dist.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/uniform-dist.rkt
similarity index 100%
rename from pkgs/math/private/distributions/uniform-dist.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/uniform-dist.rkt
diff --git a/pkgs/math/private/distributions/utils.rkt b/pkgs/math-pkgs/math-lib/math/private/distributions/utils.rkt
similarity index 100%
rename from pkgs/math/private/distributions/utils.rkt
rename to pkgs/math-pkgs/math-lib/math/private/distributions/utils.rkt
diff --git a/pkgs/math/private/exception.rkt b/pkgs/math-pkgs/math-lib/math/private/exception.rkt
similarity index 100%
rename from pkgs/math/private/exception.rkt
rename to pkgs/math-pkgs/math-lib/math/private/exception.rkt
diff --git a/pkgs/math/private/flonum/expansion/expansion-base.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/expansion/expansion-base.rkt
similarity index 100%
rename from pkgs/math/private/flonum/expansion/expansion-base.rkt
rename to pkgs/math-pkgs/math-lib/math/private/flonum/expansion/expansion-base.rkt
diff --git a/pkgs/math/private/flonum/expansion/expansion-exp-reduction.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/expansion/expansion-exp-reduction.rkt
similarity index 100%
rename from pkgs/math/private/flonum/expansion/expansion-exp-reduction.rkt
rename to pkgs/math-pkgs/math-lib/math/private/flonum/expansion/expansion-exp-reduction.rkt
diff --git a/pkgs/math/private/flonum/expansion/expansion-exp.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/expansion/expansion-exp.rkt
similarity index 100%
rename from pkgs/math/private/flonum/expansion/expansion-exp.rkt
rename to pkgs/math-pkgs/math-lib/math/private/flonum/expansion/expansion-exp.rkt
diff --git a/pkgs/math/private/flonum/expansion/expansion-log.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/expansion/expansion-log.rkt
similarity index 100%
rename from pkgs/math/private/flonum/expansion/expansion-log.rkt
rename to pkgs/math-pkgs/math-lib/math/private/flonum/expansion/expansion-log.rkt
diff --git a/pkgs/math/private/flonum/flonum-bits.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-bits.rkt
similarity index 100%
rename from pkgs/math/private/flonum/flonum-bits.rkt
rename to pkgs/math-pkgs/math-lib/math/private/flonum/flonum-bits.rkt
diff --git a/pkgs/math/private/flonum/flonum-constants.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-constants.rkt
similarity index 100%
rename from pkgs/math/private/flonum/flonum-constants.rkt
rename to pkgs/math-pkgs/math-lib/math/private/flonum/flonum-constants.rkt
diff --git a/pkgs/math/private/flonum/flonum-error.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-error.rkt
similarity index 100%
rename from pkgs/math/private/flonum/flonum-error.rkt
rename to pkgs/math-pkgs/math-lib/math/private/flonum/flonum-error.rkt
diff --git a/pkgs/math/private/flonum/flonum-exp.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-exp.rkt
similarity index 100%
rename from pkgs/math/private/flonum/flonum-exp.rkt
rename to pkgs/math-pkgs/math-lib/math/private/flonum/flonum-exp.rkt
diff --git a/pkgs/math/private/flonum/flonum-factorial.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-factorial.rkt
similarity index 100%
rename from pkgs/math/private/flonum/flonum-factorial.rkt
rename to pkgs/math-pkgs/math-lib/math/private/flonum/flonum-factorial.rkt
diff --git a/pkgs/math/private/flonum/flonum-functions.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-functions.rkt
similarity index 100%
rename from pkgs/math/private/flonum/flonum-functions.rkt
rename to pkgs/math-pkgs/math-lib/math/private/flonum/flonum-functions.rkt
diff --git a/pkgs/math/private/flonum/flonum-log.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-log.rkt
similarity index 100%
rename from pkgs/math/private/flonum/flonum-log.rkt
rename to pkgs/math-pkgs/math-lib/math/private/flonum/flonum-log.rkt
diff --git a/pkgs/math/private/flonum/flonum-log1pmx.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-log1pmx.rkt
similarity index 100%
rename from pkgs/math/private/flonum/flonum-log1pmx.rkt
rename to pkgs/math-pkgs/math-lib/math/private/flonum/flonum-log1pmx.rkt
diff --git a/pkgs/math/private/flonum/flonum-more-functions.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-more-functions.rkt
similarity index 100%
rename from pkgs/math/private/flonum/flonum-more-functions.rkt
rename to pkgs/math-pkgs/math-lib/math/private/flonum/flonum-more-functions.rkt
diff --git a/pkgs/math/private/flonum/flonum-polyfun.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-polyfun.rkt
similarity index 100%
rename from pkgs/math/private/flonum/flonum-polyfun.rkt
rename to pkgs/math-pkgs/math-lib/math/private/flonum/flonum-polyfun.rkt
diff --git a/pkgs/math/private/flonum/flonum-search.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flonum-search.rkt
similarity index 100%
rename from pkgs/math/private/flonum/flonum-search.rkt
rename to pkgs/math-pkgs/math-lib/math/private/flonum/flonum-search.rkt
diff --git a/pkgs/math/private/flonum/flvector-syntax.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flvector-syntax.rkt
similarity index 100%
rename from pkgs/math/private/flonum/flvector-syntax.rkt
rename to pkgs/math-pkgs/math-lib/math/private/flonum/flvector-syntax.rkt
diff --git a/pkgs/math/private/flonum/flvector.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/flvector.rkt
similarity index 100%
rename from pkgs/math/private/flonum/flvector.rkt
rename to pkgs/math-pkgs/math-lib/math/private/flonum/flvector.rkt
diff --git a/pkgs/math/private/flonum/utils.rkt b/pkgs/math-pkgs/math-lib/math/private/flonum/utils.rkt
similarity index 100%
rename from pkgs/math/private/flonum/utils.rkt
rename to pkgs/math-pkgs/math-lib/math/private/flonum/utils.rkt
diff --git a/pkgs/math/private/functions/beta.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/beta.rkt
similarity index 100%
rename from pkgs/math/private/functions/beta.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/beta.rkt
diff --git a/pkgs/math/private/functions/continued-fraction.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/continued-fraction.rkt
similarity index 100%
rename from pkgs/math/private/functions/continued-fraction.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/continued-fraction.rkt
diff --git a/pkgs/math/private/functions/erf.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/erf.rkt
similarity index 100%
rename from pkgs/math/private/functions/erf.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/erf.rkt
diff --git a/pkgs/math/private/functions/gamma.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/gamma.rkt
similarity index 100%
rename from pkgs/math/private/functions/gamma.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/gamma.rkt
diff --git a/pkgs/math/private/functions/hurwitz-zeta.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/hurwitz-zeta.rkt
similarity index 100%
rename from pkgs/math/private/functions/hurwitz-zeta.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/hurwitz-zeta.rkt
diff --git a/pkgs/math/private/functions/incomplete-beta-asym.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-beta-asym.rkt
similarity index 100%
rename from pkgs/math/private/functions/incomplete-beta-asym.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/incomplete-beta-asym.rkt
diff --git a/pkgs/math/private/functions/incomplete-beta.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-beta.rkt
similarity index 100%
rename from pkgs/math/private/functions/incomplete-beta.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/incomplete-beta.rkt
diff --git a/pkgs/math/private/functions/incomplete-gamma.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma.rkt
similarity index 100%
rename from pkgs/math/private/functions/incomplete-gamma.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma.rkt
diff --git a/pkgs/math/private/functions/incomplete-gamma/gamma-gautschi.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-gautschi.rkt
similarity index 100%
rename from pkgs/math/private/functions/incomplete-gamma/gamma-gautschi.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-gautschi.rkt
diff --git a/pkgs/math/private/functions/incomplete-gamma/gamma-lower-series.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-lower-series.rkt
similarity index 100%
rename from pkgs/math/private/functions/incomplete-gamma/gamma-lower-series.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-lower-series.rkt
diff --git a/pkgs/math/private/functions/incomplete-gamma/gamma-normal.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-normal.rkt
similarity index 100%
rename from pkgs/math/private/functions/incomplete-gamma/gamma-normal.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-normal.rkt
diff --git a/pkgs/math/private/functions/incomplete-gamma/gamma-temme.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-temme.rkt
similarity index 100%
rename from pkgs/math/private/functions/incomplete-gamma/gamma-temme.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-temme.rkt
diff --git a/pkgs/math/private/functions/incomplete-gamma/gamma-upper-frac.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-upper-frac.rkt
similarity index 100%
rename from pkgs/math/private/functions/incomplete-gamma/gamma-upper-frac.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-upper-frac.rkt
diff --git a/pkgs/math/private/functions/incomplete-gamma/gamma-utils.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-utils.rkt
similarity index 100%
rename from pkgs/math/private/functions/incomplete-gamma/gamma-utils.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/incomplete-gamma/gamma-utils.rkt
diff --git a/pkgs/math/private/functions/lambert.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/lambert.rkt
similarity index 100%
rename from pkgs/math/private/functions/lambert.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/lambert.rkt
diff --git a/pkgs/math/private/functions/lanczos.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/lanczos.rkt
similarity index 100%
rename from pkgs/math/private/functions/lanczos.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/lanczos.rkt
diff --git a/pkgs/math/private/functions/log-gamma-zeros.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/log-gamma-zeros.rkt
similarity index 100%
rename from pkgs/math/private/functions/log-gamma-zeros.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/log-gamma-zeros.rkt
diff --git a/pkgs/math/private/functions/log-gamma.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/log-gamma.rkt
similarity index 100%
rename from pkgs/math/private/functions/log-gamma.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/log-gamma.rkt
diff --git a/pkgs/math/private/functions/psi.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/psi.rkt
similarity index 100%
rename from pkgs/math/private/functions/psi.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/psi.rkt
diff --git a/pkgs/math/private/functions/stirling-error.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/stirling-error.rkt
similarity index 100%
rename from pkgs/math/private/functions/stirling-error.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/stirling-error.rkt
diff --git a/pkgs/math/private/functions/tan-diff.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/tan-diff.rkt
similarity index 100%
rename from pkgs/math/private/functions/tan-diff.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/tan-diff.rkt
diff --git a/pkgs/math/private/functions/zeta.rkt b/pkgs/math-pkgs/math-lib/math/private/functions/zeta.rkt
similarity index 100%
rename from pkgs/math/private/functions/zeta.rkt
rename to pkgs/math-pkgs/math-lib/math/private/functions/zeta.rkt
diff --git a/pkgs/math/private/inline-sort.rkt b/pkgs/math-pkgs/math-lib/math/private/inline-sort.rkt
similarity index 100%
rename from pkgs/math/private/inline-sort.rkt
rename to pkgs/math-pkgs/math-lib/math/private/inline-sort.rkt
diff --git a/pkgs/math/private/matrix/matrix-2d.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-2d.rkt
similarity index 100%
rename from pkgs/math/private/matrix/matrix-2d.rkt
rename to pkgs/math-pkgs/math-lib/math/private/matrix/matrix-2d.rkt
diff --git a/pkgs/math/private/matrix/matrix-arithmetic.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-arithmetic.rkt
similarity index 100%
rename from pkgs/math/private/matrix/matrix-arithmetic.rkt
rename to pkgs/math-pkgs/math-lib/math/private/matrix/matrix-arithmetic.rkt
diff --git a/pkgs/math/private/matrix/matrix-basic.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-basic.rkt
similarity index 100%
rename from pkgs/math/private/matrix/matrix-basic.rkt
rename to pkgs/math-pkgs/math-lib/math/private/matrix/matrix-basic.rkt
diff --git a/pkgs/math/private/matrix/matrix-comprehension.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-comprehension.rkt
similarity index 100%
rename from pkgs/math/private/matrix/matrix-comprehension.rkt
rename to pkgs/math-pkgs/math-lib/math/private/matrix/matrix-comprehension.rkt
diff --git a/pkgs/math/private/matrix/matrix-constructors.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-constructors.rkt
similarity index 100%
rename from pkgs/math/private/matrix/matrix-constructors.rkt
rename to pkgs/math-pkgs/math-lib/math/private/matrix/matrix-constructors.rkt
diff --git a/pkgs/math/private/matrix/matrix-conversion.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-conversion.rkt
similarity index 100%
rename from pkgs/math/private/matrix/matrix-conversion.rkt
rename to pkgs/math-pkgs/math-lib/math/private/matrix/matrix-conversion.rkt
diff --git a/pkgs/math/private/matrix/matrix-expt.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-expt.rkt
similarity index 100%
rename from pkgs/math/private/matrix/matrix-expt.rkt
rename to pkgs/math-pkgs/math-lib/math/private/matrix/matrix-expt.rkt
diff --git a/pkgs/math/private/matrix/matrix-gauss-elim.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-gauss-elim.rkt
similarity index 100%
rename from pkgs/math/private/matrix/matrix-gauss-elim.rkt
rename to pkgs/math-pkgs/math-lib/math/private/matrix/matrix-gauss-elim.rkt
diff --git a/pkgs/math/private/matrix/matrix-gram-schmidt.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-gram-schmidt.rkt
similarity index 100%
rename from pkgs/math/private/matrix/matrix-gram-schmidt.rkt
rename to pkgs/math-pkgs/math-lib/math/private/matrix/matrix-gram-schmidt.rkt
diff --git a/pkgs/math/private/matrix/matrix-lu.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-lu.rkt
similarity index 100%
rename from pkgs/math/private/matrix/matrix-lu.rkt
rename to pkgs/math-pkgs/math-lib/math/private/matrix/matrix-lu.rkt
diff --git a/pkgs/math/private/matrix/matrix-operator-norm.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-operator-norm.rkt
similarity index 100%
rename from pkgs/math/private/matrix/matrix-operator-norm.rkt
rename to pkgs/math-pkgs/math-lib/math/private/matrix/matrix-operator-norm.rkt
diff --git a/pkgs/math/private/matrix/matrix-qr.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-qr.rkt
similarity index 100%
rename from pkgs/math/private/matrix/matrix-qr.rkt
rename to pkgs/math-pkgs/math-lib/math/private/matrix/matrix-qr.rkt
diff --git a/pkgs/math/private/matrix/matrix-solve.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-solve.rkt
similarity index 100%
rename from pkgs/math/private/matrix/matrix-solve.rkt
rename to pkgs/math-pkgs/math-lib/math/private/matrix/matrix-solve.rkt
diff --git a/pkgs/math/private/matrix/matrix-subspace.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-subspace.rkt
similarity index 100%
rename from pkgs/math/private/matrix/matrix-subspace.rkt
rename to pkgs/math-pkgs/math-lib/math/private/matrix/matrix-subspace.rkt
diff --git a/pkgs/math/private/matrix/matrix-syntax.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-syntax.rkt
similarity index 100%
rename from pkgs/math/private/matrix/matrix-syntax.rkt
rename to pkgs/math-pkgs/math-lib/math/private/matrix/matrix-syntax.rkt
diff --git a/pkgs/math/private/matrix/matrix-types.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/matrix-types.rkt
similarity index 100%
rename from pkgs/math/private/matrix/matrix-types.rkt
rename to pkgs/math-pkgs/math-lib/math/private/matrix/matrix-types.rkt
diff --git a/pkgs/math/private/matrix/typed-matrix-arithmetic.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/typed-matrix-arithmetic.rkt
similarity index 100%
rename from pkgs/math/private/matrix/typed-matrix-arithmetic.rkt
rename to pkgs/math-pkgs/math-lib/math/private/matrix/typed-matrix-arithmetic.rkt
diff --git a/pkgs/math/private/matrix/untyped-matrix-arithmetic.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/untyped-matrix-arithmetic.rkt
similarity index 100%
rename from pkgs/math/private/matrix/untyped-matrix-arithmetic.rkt
rename to pkgs/math-pkgs/math-lib/math/private/matrix/untyped-matrix-arithmetic.rkt
diff --git a/pkgs/math/private/matrix/utils.rkt b/pkgs/math-pkgs/math-lib/math/private/matrix/utils.rkt
similarity index 100%
rename from pkgs/math/private/matrix/utils.rkt
rename to pkgs/math-pkgs/math-lib/math/private/matrix/utils.rkt
diff --git a/pkgs/math/private/number-theory/bernoulli.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/bernoulli.rkt
similarity index 100%
rename from pkgs/math/private/number-theory/bernoulli.rkt
rename to pkgs/math-pkgs/math-lib/math/private/number-theory/bernoulli.rkt
diff --git a/pkgs/math/private/number-theory/binomial.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/binomial.rkt
similarity index 100%
rename from pkgs/math/private/number-theory/binomial.rkt
rename to pkgs/math-pkgs/math-lib/math/private/number-theory/binomial.rkt
diff --git a/pkgs/math/private/number-theory/divisibility.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/divisibility.rkt
similarity index 100%
rename from pkgs/math/private/number-theory/divisibility.rkt
rename to pkgs/math-pkgs/math-lib/math/private/number-theory/divisibility.rkt
diff --git a/pkgs/math/private/number-theory/eulerian-number.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/eulerian-number.rkt
similarity index 100%
rename from pkgs/math/private/number-theory/eulerian-number.rkt
rename to pkgs/math-pkgs/math-lib/math/private/number-theory/eulerian-number.rkt
diff --git a/pkgs/math/private/number-theory/factorial.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/factorial.rkt
similarity index 100%
rename from pkgs/math/private/number-theory/factorial.rkt
rename to pkgs/math-pkgs/math-lib/math/private/number-theory/factorial.rkt
diff --git a/pkgs/math/private/number-theory/farey.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/farey.rkt
similarity index 100%
rename from pkgs/math/private/number-theory/farey.rkt
rename to pkgs/math-pkgs/math-lib/math/private/number-theory/farey.rkt
diff --git a/pkgs/math/private/number-theory/fibonacci.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/fibonacci.rkt
similarity index 100%
rename from pkgs/math/private/number-theory/fibonacci.rkt
rename to pkgs/math-pkgs/math-lib/math/private/number-theory/fibonacci.rkt
diff --git a/pkgs/math/private/number-theory/modular-arithmetic-base.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/modular-arithmetic-base.rkt
similarity index 100%
rename from pkgs/math/private/number-theory/modular-arithmetic-base.rkt
rename to pkgs/math-pkgs/math-lib/math/private/number-theory/modular-arithmetic-base.rkt
diff --git a/pkgs/math/private/number-theory/modular-arithmetic.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/modular-arithmetic.rkt
similarity index 100%
rename from pkgs/math/private/number-theory/modular-arithmetic.rkt
rename to pkgs/math-pkgs/math-lib/math/private/number-theory/modular-arithmetic.rkt
diff --git a/pkgs/math/private/number-theory/number-theory.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/number-theory.rkt
similarity index 100%
rename from pkgs/math/private/number-theory/number-theory.rkt
rename to pkgs/math-pkgs/math-lib/math/private/number-theory/number-theory.rkt
diff --git a/pkgs/math/private/number-theory/partitions.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/partitions.rkt
similarity index 100%
rename from pkgs/math/private/number-theory/partitions.rkt
rename to pkgs/math-pkgs/math-lib/math/private/number-theory/partitions.rkt
diff --git a/pkgs/math/private/number-theory/polygonal.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/polygonal.rkt
similarity index 100%
rename from pkgs/math/private/number-theory/polygonal.rkt
rename to pkgs/math-pkgs/math-lib/math/private/number-theory/polygonal.rkt
diff --git a/pkgs/math/private/number-theory/primitive-roots.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/primitive-roots.rkt
similarity index 100%
rename from pkgs/math/private/number-theory/primitive-roots.rkt
rename to pkgs/math-pkgs/math-lib/math/private/number-theory/primitive-roots.rkt
diff --git a/pkgs/math/private/number-theory/quadratic-residues.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/quadratic-residues.rkt
similarity index 100%
rename from pkgs/math/private/number-theory/quadratic-residues.rkt
rename to pkgs/math-pkgs/math-lib/math/private/number-theory/quadratic-residues.rkt
diff --git a/pkgs/math/private/number-theory/quadratic.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/quadratic.rkt
similarity index 100%
rename from pkgs/math/private/number-theory/quadratic.rkt
rename to pkgs/math-pkgs/math-lib/math/private/number-theory/quadratic.rkt
diff --git a/pkgs/math/private/number-theory/small-primes.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/small-primes.rkt
similarity index 100%
rename from pkgs/math/private/number-theory/small-primes.rkt
rename to pkgs/math-pkgs/math-lib/math/private/number-theory/small-primes.rkt
diff --git a/pkgs/math/private/number-theory/tangent-number.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/tangent-number.rkt
similarity index 100%
rename from pkgs/math/private/number-theory/tangent-number.rkt
rename to pkgs/math-pkgs/math-lib/math/private/number-theory/tangent-number.rkt
diff --git a/pkgs/math/private/number-theory/types.rkt b/pkgs/math-pkgs/math-lib/math/private/number-theory/types.rkt
similarity index 100%
rename from pkgs/math/private/number-theory/types.rkt
rename to pkgs/math-pkgs/math-lib/math/private/number-theory/types.rkt
diff --git a/pkgs/math/private/parameters.rkt b/pkgs/math-pkgs/math-lib/math/private/parameters.rkt
similarity index 100%
rename from pkgs/math/private/parameters.rkt
rename to pkgs/math-pkgs/math-lib/math/private/parameters.rkt
diff --git a/pkgs/math/private/polynomial/chebyshev.rkt b/pkgs/math-pkgs/math-lib/math/private/polynomial/chebyshev.rkt
similarity index 100%
rename from pkgs/math/private/polynomial/chebyshev.rkt
rename to pkgs/math-pkgs/math-lib/math/private/polynomial/chebyshev.rkt
diff --git a/pkgs/math/private/statistics/correlation.rkt b/pkgs/math-pkgs/math-lib/math/private/statistics/correlation.rkt
similarity index 100%
rename from pkgs/math/private/statistics/correlation.rkt
rename to pkgs/math-pkgs/math-lib/math/private/statistics/correlation.rkt
diff --git a/pkgs/math/private/statistics/counting.rkt b/pkgs/math-pkgs/math-lib/math/private/statistics/counting.rkt
similarity index 100%
rename from pkgs/math/private/statistics/counting.rkt
rename to pkgs/math-pkgs/math-lib/math/private/statistics/counting.rkt
diff --git a/pkgs/math/private/statistics/expected-values.rkt b/pkgs/math-pkgs/math-lib/math/private/statistics/expected-values.rkt
similarity index 100%
rename from pkgs/math/private/statistics/expected-values.rkt
rename to pkgs/math-pkgs/math-lib/math/private/statistics/expected-values.rkt
diff --git a/pkgs/math/private/statistics/order-statistics.rkt b/pkgs/math-pkgs/math-lib/math/private/statistics/order-statistics.rkt
similarity index 100%
rename from pkgs/math/private/statistics/order-statistics.rkt
rename to pkgs/math-pkgs/math-lib/math/private/statistics/order-statistics.rkt
diff --git a/pkgs/math/private/statistics/quickselect.rkt b/pkgs/math-pkgs/math-lib/math/private/statistics/quickselect.rkt
similarity index 100%
rename from pkgs/math/private/statistics/quickselect.rkt
rename to pkgs/math-pkgs/math-lib/math/private/statistics/quickselect.rkt
diff --git a/pkgs/math/private/statistics/statistics-struct.rkt b/pkgs/math-pkgs/math-lib/math/private/statistics/statistics-struct.rkt
similarity index 100%
rename from pkgs/math/private/statistics/statistics-struct.rkt
rename to pkgs/math-pkgs/math-lib/math/private/statistics/statistics-struct.rkt
diff --git a/pkgs/math/private/statistics/statistics-utils.rkt b/pkgs/math-pkgs/math-lib/math/private/statistics/statistics-utils.rkt
similarity index 100%
rename from pkgs/math/private/statistics/statistics-utils.rkt
rename to pkgs/math-pkgs/math-lib/math/private/statistics/statistics-utils.rkt
diff --git a/pkgs/math/private/syntax-utils.rkt b/pkgs/math-pkgs/math-lib/math/private/syntax-utils.rkt
similarity index 100%
rename from pkgs/math/private/syntax-utils.rkt
rename to pkgs/math-pkgs/math-lib/math/private/syntax-utils.rkt
diff --git a/pkgs/math/private/unsafe.rkt b/pkgs/math-pkgs/math-lib/math/private/unsafe.rkt
similarity index 100%
rename from pkgs/math/private/unsafe.rkt
rename to pkgs/math-pkgs/math-lib/math/private/unsafe.rkt
diff --git a/pkgs/math/private/utils.rkt b/pkgs/math-pkgs/math-lib/math/private/utils.rkt
similarity index 100%
rename from pkgs/math/private/utils.rkt
rename to pkgs/math-pkgs/math-lib/math/private/utils.rkt
diff --git a/pkgs/math/private/utils/flonum-tests.rkt b/pkgs/math-pkgs/math-lib/math/private/utils/flonum-tests.rkt
similarity index 100%
rename from pkgs/math/private/utils/flonum-tests.rkt
rename to pkgs/math-pkgs/math-lib/math/private/utils/flonum-tests.rkt
diff --git a/pkgs/math/private/vector/vector-fft.rkt b/pkgs/math-pkgs/math-lib/math/private/vector/vector-fft.rkt
similarity index 100%
rename from pkgs/math/private/vector/vector-fft.rkt
rename to pkgs/math-pkgs/math-lib/math/private/vector/vector-fft.rkt
diff --git a/pkgs/math/private/vector/vector-mutate.rkt b/pkgs/math-pkgs/math-lib/math/private/vector/vector-mutate.rkt
similarity index 100%
rename from pkgs/math/private/vector/vector-mutate.rkt
rename to pkgs/math-pkgs/math-lib/math/private/vector/vector-mutate.rkt
diff --git a/pkgs/math/private/vector/vector.rkt b/pkgs/math-pkgs/math-lib/math/private/vector/vector.rkt
similarity index 100%
rename from pkgs/math/private/vector/vector.rkt
rename to pkgs/math-pkgs/math-lib/math/private/vector/vector.rkt
diff --git a/pkgs/math/special-functions.rkt b/pkgs/math-pkgs/math-lib/math/special-functions.rkt
similarity index 100%
rename from pkgs/math/special-functions.rkt
rename to pkgs/math-pkgs/math-lib/math/special-functions.rkt
diff --git a/pkgs/math/statistics.rkt b/pkgs/math-pkgs/math-lib/math/statistics.rkt
similarity index 100%
rename from pkgs/math/statistics.rkt
rename to pkgs/math-pkgs/math-lib/math/statistics.rkt
diff --git a/pkgs/math/utils.rkt b/pkgs/math-pkgs/math-lib/math/utils.rkt
similarity index 100%
rename from pkgs/math/utils.rkt
rename to pkgs/math-pkgs/math-lib/math/utils.rkt
diff --git a/pkgs/math/vector.rkt b/pkgs/math-pkgs/math-lib/math/vector.rkt
similarity index 100%
rename from pkgs/math/vector.rkt
rename to pkgs/math-pkgs/math-lib/math/vector.rkt
diff --git a/pkgs/math-pkgs/math-test/COPYING.txt b/pkgs/math-pkgs/math-test/COPYING.txt
new file mode 100644
index 0000000000..4432540474
--- /dev/null
+++ b/pkgs/math-pkgs/math-test/COPYING.txt
@@ -0,0 +1,676 @@
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+ 
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+  
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
diff --git a/pkgs/math-pkgs/math-test/COPYING_LESSER.txt b/pkgs/math-pkgs/math-test/COPYING_LESSER.txt
new file mode 100644
index 0000000000..fc8a5de7ed
--- /dev/null
+++ b/pkgs/math-pkgs/math-test/COPYING_LESSER.txt
@@ -0,0 +1,165 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/pkgs/math-pkgs/math-test/LICENSE.txt b/pkgs/math-pkgs/math-test/LICENSE.txt
new file mode 100644
index 0000000000..0d5401b315
--- /dev/null
+++ b/pkgs/math-pkgs/math-test/LICENSE.txt
@@ -0,0 +1,51 @@
+The math collection is distributed under the GNU Lesser General Public
+License Version 3 (LGPLv3) just like the majority of Racket's libraries.
+The LGPLv3 license text is included in the file "COPYING_LESSER.txt".
+
+Some of the math library code is derived from the C++ project Boost,
+from source files released under the Boost Software License Version 1.0
+(BSLv1.0). This license is compatible with the LGPLv3, provided the
+BSLv1.0 license text is distributed along with any source code derived
+from BSLv1.0 works.
+
+Some of the math library is derived from ubiquitous C libraries released
+under a license with similar terms.
+
+To comply with the terms of the BSLv1.0, its text is duplicated here:
+
+============================================================================
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+============================================================================
+
+
+To comply with the terms of the other license, its text is duplicated here:
+
+============================================================================
+Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+
+Developed at SunPro, a Sun Microsystems, Inc. business. Permission to use,
+copy, modify, and distribute this software is freely granted, provided that
+this notice is preserved.
+============================================================================
diff --git a/pkgs/math-pkgs/math-test/info.rkt b/pkgs/math-pkgs/math-test/info.rkt
new file mode 100644
index 0000000000..04197301ec
--- /dev/null
+++ b/pkgs/math-pkgs/math-test/info.rkt
@@ -0,0 +1,16 @@
+#lang info
+
+(define collection 'multi)
+
+(define deps '("base"
+               "math-lib"
+               "racket-test"
+               "rackunit-lib"
+               "typed-racket-lib"
+               "typed-racket-more"))
+
+(define build-deps '())
+
+(define pkg-desc "Math library tests")
+
+(define pkg-authors '(ntoronto))
diff --git a/pkgs/math-pkgs/math-test/math/info.rkt b/pkgs/math-pkgs/math-test/math/info.rkt
new file mode 100644
index 0000000000..38d2700d4e
--- /dev/null
+++ b/pkgs/math-pkgs/math-test/math/info.rkt
@@ -0,0 +1,2 @@
+#lang info
+(define compile-omit-paths '("tests"))
diff --git a/pkgs/math/tests/array-strictness-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/array-strictness-tests.rkt
similarity index 100%
rename from pkgs/math/tests/array-strictness-tests.rkt
rename to pkgs/math-pkgs/math-test/math/tests/array-strictness-tests.rkt
diff --git a/pkgs/math/tests/array-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/array-tests.rkt
similarity index 100%
rename from pkgs/math/tests/array-tests.rkt
rename to pkgs/math-pkgs/math-test/math/tests/array-tests.rkt
diff --git a/pkgs/math/tests/array-untyped-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/array-untyped-tests.rkt
similarity index 100%
rename from pkgs/math/tests/array-untyped-tests.rkt
rename to pkgs/math-pkgs/math-test/math/tests/array-untyped-tests.rkt
diff --git a/pkgs/math/tests/bigfloat-custodian.rkt b/pkgs/math-pkgs/math-test/math/tests/bigfloat-custodian.rkt
similarity index 100%
rename from pkgs/math/tests/bigfloat-custodian.rkt
rename to pkgs/math-pkgs/math-test/math/tests/bigfloat-custodian.rkt
diff --git a/pkgs/math/tests/bigfloat-stress-test.rkt b/pkgs/math-pkgs/math-test/math/tests/bigfloat-stress-test.rkt
similarity index 100%
rename from pkgs/math/tests/bigfloat-stress-test.rkt
rename to pkgs/math-pkgs/math-test/math/tests/bigfloat-stress-test.rkt
diff --git a/pkgs/math/tests/bigfloat-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/bigfloat-tests.rkt
similarity index 100%
rename from pkgs/math/tests/bigfloat-tests.rkt
rename to pkgs/math-pkgs/math-test/math/tests/bigfloat-tests.rkt
diff --git a/pkgs/math/tests/flonum-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/flonum-tests.rkt
similarity index 100%
rename from pkgs/math/tests/flonum-tests.rkt
rename to pkgs/math-pkgs/math-test/math/tests/flonum-tests.rkt
diff --git a/pkgs/math/tests/function-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/function-tests.rkt
similarity index 100%
rename from pkgs/math/tests/function-tests.rkt
rename to pkgs/math-pkgs/math-test/math/tests/function-tests.rkt
diff --git a/pkgs/math/tests/mandelbrot-test.rkt b/pkgs/math-pkgs/math-test/math/tests/mandelbrot-test.rkt
similarity index 100%
rename from pkgs/math/tests/mandelbrot-test.rkt
rename to pkgs/math-pkgs/math-test/math/tests/mandelbrot-test.rkt
diff --git a/pkgs/math/tests/matrix-strictness-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/matrix-strictness-tests.rkt
similarity index 100%
rename from pkgs/math/tests/matrix-strictness-tests.rkt
rename to pkgs/math-pkgs/math-test/math/tests/matrix-strictness-tests.rkt
diff --git a/pkgs/math/tests/matrix-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/matrix-tests.rkt
similarity index 100%
rename from pkgs/math/tests/matrix-tests.rkt
rename to pkgs/math-pkgs/math-test/math/tests/matrix-tests.rkt
diff --git a/pkgs/math/tests/matrix-untyped-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/matrix-untyped-tests.rkt
similarity index 100%
rename from pkgs/math/tests/matrix-untyped-tests.rkt
rename to pkgs/math-pkgs/math-test/math/tests/matrix-untyped-tests.rkt
diff --git a/pkgs/math/tests/number-theory-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/number-theory-tests.rkt
similarity index 100%
rename from pkgs/math/tests/number-theory-tests.rkt
rename to pkgs/math-pkgs/math-test/math/tests/number-theory-tests.rkt
diff --git a/pkgs/math/tests/statistics-tests.rkt b/pkgs/math-pkgs/math-test/math/tests/statistics-tests.rkt
similarity index 100%
rename from pkgs/math/tests/statistics-tests.rkt
rename to pkgs/math-pkgs/math-test/math/tests/statistics-tests.rkt
diff --git a/pkgs/math/tests/stress/beta-test.rkt b/pkgs/math-pkgs/math-test/math/tests/stress/beta-test.rkt
similarity index 100%
rename from pkgs/math/tests/stress/beta-test.rkt
rename to pkgs/math-pkgs/math-test/math/tests/stress/beta-test.rkt
diff --git a/pkgs/math/tests/stress/mpfr-ffi-call-vs-racket.rkt b/pkgs/math-pkgs/math-test/math/tests/stress/mpfr-ffi-call-vs-racket.rkt
similarity index 100%
rename from pkgs/math/tests/stress/mpfr-ffi-call-vs-racket.rkt
rename to pkgs/math-pkgs/math-test/math/tests/stress/mpfr-ffi-call-vs-racket.rkt
diff --git a/pkgs/math/tests/strictness-memory-leak-test.rkt b/pkgs/math-pkgs/math-test/math/tests/strictness-memory-leak-test.rkt
similarity index 100%
rename from pkgs/math/tests/strictness-memory-leak-test.rkt
rename to pkgs/math-pkgs/math-test/math/tests/strictness-memory-leak-test.rkt
diff --git a/pkgs/math/tests/test-utils.rkt b/pkgs/math-pkgs/math-test/math/tests/test-utils.rkt
similarity index 100%
rename from pkgs/math/tests/test-utils.rkt
rename to pkgs/math-pkgs/math-test/math/tests/test-utils.rkt
diff --git a/pkgs/math-pkgs/math/info.rkt b/pkgs/math-pkgs/math/info.rkt
new file mode 100644
index 0000000000..fa97aaf83a
--- /dev/null
+++ b/pkgs/math-pkgs/math/info.rkt
@@ -0,0 +1,10 @@
+#lang info
+
+(define collection 'multi)
+
+(define deps '("math-lib" "math-doc" "math-test"))
+(define implies '("math-lib" "math-doc" "math-test"))
+
+(define pkg-desc "Functions and data structures useful for working with numbers and collections of numbers, along with docs and tests")
+
+(define pkg-authors '(ntoronto))
diff --git a/pkgs/math/info.rkt b/pkgs/math/info.rkt
deleted file mode 100644
index fd97790621..0000000000
--- a/pkgs/math/info.rkt
+++ /dev/null
@@ -1,28 +0,0 @@
-#lang info
-
-(define collection "math")
-
-(define scribblings '(["scribblings/math.scrbl" (multi-page)]))
-
-(define compile-omit-paths '("tests"))
-(define deps '("r6rs-lib"
-               "base"
-               "typed-racket-lib"
-               "typed-racket-more"
-               ("math-i386-macosx" #:platform "i386-macosx")
-               ("math-x86_64-macosx" #:platform "x86_64-macosx")
-               ("math-ppc-macosx" #:platform "ppc-macosx")
-               ("math-win32-i386" #:platform "win32\\i386")
-               ("math-win32-x86_64" #:platform "win32\\x86_64")))
-(define build-deps '("racket-doc"
-                     "typed-racket-doc"
-                     "at-exp-lib"
-                     "gui-lib"
-                     "plot"
-                     "sandbox-lib"
-                     "scribble-lib"
-                     "unstable-2d"))
-
-(define pkg-desc "Functions and data structures useful for working with numbers and collections of numbers")
-
-(define pkg-authors '(ntoronto))