31 files changed, 34 insertions, 34 deletions

diff --git a/.gitignore b/.gitignore
index c7706cd..d0c8bac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,12 @@
 ### Custom
-data/
-gen/
-ecgen
-econvert
+/data/
+/gen/
+/ecgen
+/econvert
 
 ### Doxygen
-docs/html/
-docs/latex/
+/docs/html/
+/docs/latex/
 
 ### C template
 # Prerequisites
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c59dc79..b696f5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ include_directories(lib)
 find_library(parson parson/libparson.a)
 find_library(sha1 sha1/libsha1.a)
 
-file(GLOB SRC "src/math/*.c" "src/cm/*.c" "src/invalid/*.c" "src/io/*.c" "src/exhaustive/*.c" "src/util/*.c")
+file(GLOB SRC "src/math/*.c" "src/gen/*.c" "src/cm/*.c" "src/invalid/*.c" "src/io/*.c" "src/exhaustive/*.c" "src/util/*.c")
 set(ECGEN_SRC "src/ecgen.c" ${SRC})
 set(ECONVERT_SRC "src/econvert.c")
 
diff --git a/src/exhaustive/anomalous.h b/src/exhaustive/anomalous.h
index 849cb55..9111919 100644
--- a/src/exhaustive/anomalous.h
+++ b/src/exhaustive/anomalous.h
@@ -10,8 +10,8 @@
 
 #include <pari/pari.h>
 #include "io/cli.h"
-#include "math/arg.h"
-#include "math/types.h"
+#include "arg.h"
+#include "gen/types.h"
 
 typedef struct disc_t {
 	GEN d;
diff --git a/src/math/arg.c b/src/exhaustive/arg.c
index 6b11777..6b11777 100644
--- a/src/math/arg.c
+++ b/src/exhaustive/arg.c
diff --git a/src/math/arg.h b/src/exhaustive/arg.h
index c0f2f6f..1a4d0ed 100644
--- a/src/math/arg.h
+++ b/src/exhaustive/arg.h
@@ -8,7 +8,7 @@
 #ifndef ECGEN_ARG_H
 #define ECGEN_ARG_H
 
-#include "types.h"
+#include "gen/types.h"
 
 /**
  * @brief
diff --git a/src/exhaustive/exhaustive.c b/src/exhaustive/exhaustive.c
index d070b60..f2c555b 100644
--- a/src/exhaustive/exhaustive.c
+++ b/src/exhaustive/exhaustive.c
@@ -5,13 +5,13 @@
 #include "exhaustive.h"
 #include "anomalous.h"
 #include "io/output.h"
-#include "math/curve.h"
-#include "math/equation.h"
-#include "math/field.h"
-#include "math/gens.h"
-#include "math/order.h"
-#include "math/point.h"
-#include "math/seed.h"
+#include "gen/curve.h"
+#include "gen/equation.h"
+#include "gen/field.h"
+#include "gen/gens.h"
+#include "gen/order.h"
+#include "gen/point.h"
+#include "gen/seed.h"
 #include "util/memory.h"
 
 static void exhaustive_ginit(gen_t *generators, const config_t *cfg) {
diff --git a/src/exhaustive/exhaustive.h b/src/exhaustive/exhaustive.h
index afcdc5b..3b26d73 100644
--- a/src/exhaustive/exhaustive.h
+++ b/src/exhaustive/exhaustive.h
@@ -8,7 +8,7 @@
 #ifndef ECGEN_GENERATORS_H
 #define ECGEN_GENERATORS_H
 
-#include "math/types.h"
+#include "gen/types.h"
 
 /**
  *
diff --git a/src/math/curve.c b/src/gen/curve.c
index bc382cd..bc382cd 100644
--- a/src/math/curve.c
+++ b/src/gen/curve.c
diff --git a/src/math/curve.h b/src/gen/curve.h
index 2e7651f..2e7651f 100644
--- a/src/math/curve.h
+++ b/src/gen/curve.h
diff --git a/src/math/equation.c b/src/gen/equation.c
index 20313cb..14409b4 100644
--- a/src/math/equation.c
+++ b/src/gen/equation.c
@@ -4,7 +4,7 @@
  */
 #include "equation.h"
 #include "io/input.h"
-#include "math/field.h"
+#include "field.h"
 
 GENERATOR(a_gen_random) {
 	curve->a = genrand(curve->field);
diff --git a/src/math/equation.h b/src/gen/equation.h
index 741517c..741517c 100644
--- a/src/math/equation.h
+++ b/src/gen/equation.h
diff --git a/src/math/field.c b/src/gen/field.c
index 685036a..8bf2bf0 100644
--- a/src/math/field.c
+++ b/src/gen/field.c
@@ -4,7 +4,7 @@
  */
 #include "field.h"
 #include "io/input.h"
-#include "poly.h"
+#include "math/poly.h"
 
 static GEN field_primer(unsigned long bits) { return random_prime(bits); }
 
diff --git a/src/math/field.h b/src/gen/field.h
index 04af2c6..04af2c6 100644
--- a/src/math/field.h
+++ b/src/gen/field.h
diff --git a/src/math/gens.c b/src/gen/gens.c
index f5f9fcb..f5f9fcb 100644
--- a/src/math/gens.c
+++ b/src/gen/gens.c
diff --git a/src/math/gens.h b/src/gen/gens.h
index f46efbf..f46efbf 100644
--- a/src/math/gens.h
+++ b/src/gen/gens.h
diff --git a/src/math/order.c b/src/gen/order.c
index 2c963f6..2c963f6 100644
--- a/src/math/order.c
+++ b/src/gen/order.c
diff --git a/src/math/order.h b/src/gen/order.h
index bdb6ec0..bdb6ec0 100644
--- a/src/math/order.h
+++ b/src/gen/order.h
diff --git a/src/math/point.c b/src/gen/point.c
index 4251913..4251913 100644
--- a/src/math/point.c
+++ b/src/gen/point.c
diff --git a/src/math/point.h b/src/gen/point.h
index 1a0b348..1a0b348 100644
--- a/src/math/point.h
+++ b/src/gen/point.h
diff --git a/src/math/seed.c b/src/gen/seed.c
index 44663c8..44663c8 100644
--- a/src/math/seed.c
+++ b/src/gen/seed.c
diff --git a/src/math/seed.h b/src/gen/seed.h
index 89c7e07..e4b7ac0 100644
--- a/src/math/seed.h
+++ b/src/gen/seed.h
@@ -9,7 +9,7 @@
 #define ECGEN_SEED_H
 
 #include "io/input.h"
-#include "math/types.h"
+#include "types.h"
 
 /**
  *
diff --git a/src/math/types.c b/src/gen/types.c
index afd6542..afd6542 100644
--- a/src/math/types.c
+++ b/src/gen/types.c
diff --git a/src/math/types.h b/src/gen/types.h
index a6494cf..a6494cf 100644
--- a/src/math/types.h
+++ b/src/gen/types.h
diff --git a/src/invalid/invalid.c b/src/invalid/invalid.c
index dee5c0a..00daf24 100644
--- a/src/invalid/invalid.c
+++ b/src/invalid/invalid.c
@@ -6,12 +6,12 @@
 #include "exhaustive/exhaustive.h"
 #include "invalid_thread.h"
 #include "io/output.h"
-#include "math/curve.h"
-#include "math/equation.h"
-#include "math/field.h"
-#include "math/gens.h"
-#include "math/order.h"
-#include "math/point.h"
+#include "gen/curve.h"
+#include "gen/equation.h"
+#include "gen/field.h"
+#include "gen/gens.h"
+#include "gen/order.h"
+#include "gen/point.h"
 #include "util/memory.h"
 
 static void invalid_original_ginit(gen_t *generators, const config_t *cfg) {
diff --git a/src/invalid/invalid_thread.c b/src/invalid/invalid_thread.c
index 66aca66..3d86b47 100644
--- a/src/invalid/invalid_thread.c
+++ b/src/invalid/invalid_thread.c
@@ -6,8 +6,8 @@
 #include "invalid_thread.h"
 #include "exhaustive/exhaustive.h"
 #include "io/output.h"
-#include "math/curve.h"
-#include "math/random.h"
+#include "gen/curve.h"
+#include "util/random.h"
 
 void *invalid_thread(void *arg) {
 	thread_t *thread = (thread_t *)arg;
diff --git a/src/invalid/invalid_thread.h b/src/invalid/invalid_thread.h
index 2c6275f..bedaf60 100644
--- a/src/invalid/invalid_thread.h
+++ b/src/invalid/invalid_thread.h
@@ -9,7 +9,7 @@
 #define ECGEN_INVALID_THREAD_H
 
 #include <pthread.h>
-#include "math/types.h"
+#include "gen/types.h"
 
 typedef enum { STATE_FREE, STATE_GENERATING, STATE_GENERATED } state_e;
 
diff --git a/src/io/input.h b/src/io/input.h
index fa69503..5db3964 100644
--- a/src/io/input.h
+++ b/src/io/input.h
@@ -8,8 +8,8 @@
 #ifndef ECGEN_INPUT_H
 #define ECGEN_INPUT_H
 
-#include "math/random.h"
-#include "math/types.h"
+#include "util/random.h"
+#include "gen/types.h"
 
 /**
  *
diff --git a/src/io/output.c b/src/io/output.c
index 1904a22..272faa2 100644
--- a/src/io/output.c
+++ b/src/io/output.c
@@ -5,7 +5,7 @@
 
 #include "output.h"
 #include <parson/parson.h>
-#include "math/field.h"
+#include "gen/field.h"
 #include "util/memory.h"
 
 FILE *out;
diff --git a/src/io/output.h b/src/io/output.h
index f04e665..5c098e1 100644
--- a/src/io/output.h
+++ b/src/io/output.h
@@ -10,7 +10,7 @@
 
 #include <pari/pari.h>
 #include <stdbool.h>
-#include "math/types.h"
+#include "gen/types.h"
 
 #ifdef DEBUG
 
diff --git a/src/math/random.c b/src/util/random.c
index 519ce6b..519ce6b 100644
--- a/src/math/random.c
+++ b/src/util/random.c
diff --git a/src/math/random.h b/src/util/random.h
index 96eb210..96eb210 100644
--- a/src/math/random.h
+++ b/src/util/random.h