28 files changed, 24 insertions, 13 deletions
diff --git a/src/math/bigint/info.txt b/src/math/bigint/info.txt
index 7892a6edf..6057c708e 100644
--- a/src/math/bigint/info.txt
+++ b/src/math/bigint/info.txt
@@ -5,13 +5,8 @@ define BIGINT
 <header:public>
 bigint.h
 divide.h
-mp_types.h
 </header:public>
 
-<header:internal>
-mp_core.h
-</header:internal>
-
 <source>
 big_code.cpp
 big_io.cpp
@@ -20,18 +15,11 @@ big_ops3.cpp
 big_rand.cpp
 bigint.cpp
 divide.cpp
-mp_asm.cpp
-mp_comba.cpp
-mp_karat.cpp
-mp_misc.cpp
-mp_shift.cpp
 </source>
 
 <requires>
 alloc
+mp
 hex
-mp_amd64|mp_msvc64|mp_asm64|mp_ia32|mp_ia32_msvc|mp_generic
-monty_generic
-mulop_generic
 rng
 </requires>
diff --git a/src/math/mp/info.txt b/src/math/mp/info.txt
new file mode 100644
index 000000000..a3c994d8b
--- /dev/null
+++ b/src/math/mp/info.txt
@@ -0,0 +1,23 @@
+define BIGINT_MP
+
+<source>
+mp_asm.cpp
+mp_comba.cpp
+mp_karat.cpp
+mp_misc.cpp
+mp_shift.cpp
+</source>
+
+<header:public>
+mp_types.h
+</header:public>
+
+<header:internal>
+mp_core.h
+</header:internal>
+
+<requires>
+mp_amd64|mp_msvc64|mp_asm64|mp_ia32|mp_ia32_msvc|mp_generic
+monty_generic
+mulop_generic
+</requires>
diff --git a/src/math/bigint/monty_generic/info.txt b/src/math/mp/monty_generic/info.txt
index cd05ccdc0..cd05ccdc0 100644
--- a/src/math/bigint/monty_generic/info.txt
+++ b/src/math/mp/monty_generic/info.txt
diff --git a/src/math/bigint/monty_generic/mp_monty.cpp b/src/math/mp/monty_generic/mp_monty.cpp
index bce35259a..bce35259a 100644
--- a/src/math/bigint/monty_generic/mp_monty.cpp
+++ b/src/math/mp/monty_generic/mp_monty.cpp
diff --git a/src/math/bigint/mp_amd64/info.txt b/src/math/mp/mp_amd64/info.txt
index 11cc380e2..11cc380e2 100644
--- a/src/math/bigint/mp_amd64/info.txt
+++ b/src/math/mp/mp_amd64/info.txt
diff --git a/src/math/bigint/mp_amd64/mp_asm.h b/src/math/mp/mp_amd64/mp_asm.h
index fa66d04f3..fa66d04f3 100644
--- a/src/math/bigint/mp_amd64/mp_asm.h
+++ b/src/math/mp/mp_amd64/mp_asm.h
diff --git a/src/math/bigint/mp_amd64/mp_asmi.h b/src/math/mp/mp_amd64/mp_asmi.h
index adf7774ef..adf7774ef 100644
--- a/src/math/bigint/mp_amd64/mp_asmi.h
+++ b/src/math/mp/mp_amd64/mp_asmi.h
diff --git a/src/math/bigint/mp_asm.cpp b/src/math/mp/mp_asm.cpp
index 4fcdee7a4..4fcdee7a4 100644
--- a/src/math/bigint/mp_asm.cpp
+++ b/src/math/mp/mp_asm.cpp
diff --git a/src/math/bigint/mp_asm64/info.txt b/src/math/mp/mp_asm64/info.txt
index fd0242a7a..fd0242a7a 100644
--- a/src/math/bigint/mp_asm64/info.txt
+++ b/src/math/mp/mp_asm64/info.txt
diff --git a/src/math/bigint/mp_asm64/mp_asm.h b/src/math/mp/mp_asm64/mp_asm.h
index b0906095d..b0906095d 100644
--- a/src/math/bigint/mp_asm64/mp_asm.h
+++ b/src/math/mp/mp_asm64/mp_asm.h
diff --git a/src/math/bigint/mp_comba.cpp b/src/math/mp/mp_comba.cpp
index 2770d3f0a..2770d3f0a 100644
--- a/src/math/bigint/mp_comba.cpp
+++ b/src/math/mp/mp_comba.cpp
diff --git a/src/math/bigint/mp_core.h b/src/math/mp/mp_core.h
index 63082795f..63082795f 100644
--- a/src/math/bigint/mp_core.h
+++ b/src/math/mp/mp_core.h
diff --git a/src/math/bigint/mp_generic/info.txt b/src/math/mp/mp_generic/info.txt
index ab4d7406a..ab4d7406a 100644
--- a/src/math/bigint/mp_generic/info.txt
+++ b/src/math/mp/mp_generic/info.txt
diff --git a/src/math/bigint/mp_generic/mp_asm.h b/src/math/mp/mp_generic/mp_asm.h
index 7c18343ef..7c18343ef 100644
--- a/src/math/bigint/mp_generic/mp_asm.h
+++ b/src/math/mp/mp_generic/mp_asm.h
diff --git a/src/math/bigint/mp_generic/mp_asmi.h b/src/math/mp/mp_generic/mp_asmi.h
index 8225f372d..8225f372d 100644
--- a/src/math/bigint/mp_generic/mp_asmi.h
+++ b/src/math/mp/mp_generic/mp_asmi.h
diff --git a/src/math/bigint/mp_ia32/info.txt b/src/math/mp/mp_ia32/info.txt
index 1659f74cf..1659f74cf 100644
--- a/src/math/bigint/mp_ia32/info.txt
+++ b/src/math/mp/mp_ia32/info.txt
diff --git a/src/math/bigint/mp_ia32/mp_asm.h b/src/math/mp/mp_ia32/mp_asm.h
index 4d3afc992..4d3afc992 100644
--- a/src/math/bigint/mp_ia32/mp_asm.h
+++ b/src/math/mp/mp_ia32/mp_asm.h
diff --git a/src/math/bigint/mp_ia32/mp_asmi.h b/src/math/mp/mp_ia32/mp_asmi.h
index c7b679e80..c7b679e80 100644
--- a/src/math/bigint/mp_ia32/mp_asmi.h
+++ b/src/math/mp/mp_ia32/mp_asmi.h
diff --git a/src/math/bigint/mp_ia32_msvc/info.txt b/src/math/mp/mp_ia32_msvc/info.txt
index 55a42c310..55a42c310 100644
--- a/src/math/bigint/mp_ia32_msvc/info.txt
+++ b/src/math/mp/mp_ia32_msvc/info.txt
diff --git a/src/math/bigint/mp_ia32_msvc/mp_asmi.h b/src/math/mp/mp_ia32_msvc/mp_asmi.h
index aee457d65..aee457d65 100644
--- a/src/math/bigint/mp_ia32_msvc/mp_asmi.h
+++ b/src/math/mp/mp_ia32_msvc/mp_asmi.h
diff --git a/src/math/bigint/mp_karat.cpp b/src/math/mp/mp_karat.cpp
index 8ae346f1e..8ae346f1e 100644
--- a/src/math/bigint/mp_karat.cpp
+++ b/src/math/mp/mp_karat.cpp
diff --git a/src/math/bigint/mp_misc.cpp b/src/math/mp/mp_misc.cpp
index 77b8e6f51..77b8e6f51 100644
--- a/src/math/bigint/mp_misc.cpp
+++ b/src/math/mp/mp_misc.cpp
diff --git a/src/math/bigint/mp_msvc64/info.txt b/src/math/mp/mp_msvc64/info.txt
index 56ae05927..56ae05927 100644
--- a/src/math/bigint/mp_msvc64/info.txt
+++ b/src/math/mp/mp_msvc64/info.txt
diff --git a/src/math/bigint/mp_msvc64/mp_asm.h b/src/math/mp/mp_msvc64/mp_asm.h
index 8e4535c35..8e4535c35 100644
--- a/src/math/bigint/mp_msvc64/mp_asm.h
+++ b/src/math/mp/mp_msvc64/mp_asm.h
diff --git a/src/math/bigint/mp_shift.cpp b/src/math/mp/mp_shift.cpp
index f1d609bfb..f1d609bfb 100644
--- a/src/math/bigint/mp_shift.cpp
+++ b/src/math/mp/mp_shift.cpp
diff --git a/src/math/bigint/mp_types.h b/src/math/mp/mp_types.h
index 1648713ed..1648713ed 100644
--- a/src/math/bigint/mp_types.h
+++ b/src/math/mp/mp_types.h
diff --git a/src/math/bigint/mulop_generic/info.txt b/src/math/mp/mulop_generic/info.txt
index 548d0f44b..548d0f44b 100644
--- a/src/math/bigint/mulop_generic/info.txt
+++ b/src/math/mp/mulop_generic/info.txt
diff --git a/src/math/bigint/mulop_generic/mp_mulop.cpp b/src/math/mp/mulop_generic/mp_mulop.cpp
index 33ee2af32..33ee2af32 100644
--- a/src/math/bigint/mulop_generic/mp_mulop.cpp
+++ b/src/math/mp/mulop_generic/mp_mulop.cpp