diff --git a/docs/cpp_api/archive.rst b/docs/cpp_api/archive.rst
new file mode 100644
index 00000000..aa80c161
--- /dev/null
+++ b/docs/cpp_api/archive.rst
@@ -0,0 +1,5 @@
+Archive
+=======
+
+.. doxygenclass:: Brush::Pop::Archive
+   :members:
diff --git a/docs/cpp_api/engine.rst b/docs/cpp_api/engine.rst
new file mode 100644
index 00000000..60274e88
--- /dev/null
+++ b/docs/cpp_api/engine.rst
@@ -0,0 +1,9 @@
+Engine (and parameters)
+=======================
+
+.. doxygenclass:: Brush::Parameters
+   :members:
+
+.. doxygenclass:: Brush::Engine
+   :members:
+
diff --git a/docs/cpp_api/evaluation.rst b/docs/cpp_api/evaluation.rst
new file mode 100644
index 00000000..e3aaf620
--- /dev/null
+++ b/docs/cpp_api/evaluation.rst
@@ -0,0 +1,8 @@
+Evaluation
+==========
+
+.. doxygenclass:: Brush::Eval::Evaluation
+   :members:
+
+.. doxygenclass:: Brush::Scorer
+   :members:
diff --git a/docs/cpp_api/index.md b/docs/cpp_api/index.md
index 226702d5..5d6ba358 100644
--- a/docs/cpp_api/index.md
+++ b/docs/cpp_api/index.md
@@ -13,5 +13,11 @@ search_space
 program
 node
 nodetypes
+individual
+evaluation
+population
 variation
+selection
+archive
+engine
 ```
\ No newline at end of file
diff --git a/docs/cpp_api/individual.rst b/docs/cpp_api/individual.rst
new file mode 100644
index 00000000..e781b865
--- /dev/null
+++ b/docs/cpp_api/individual.rst
@@ -0,0 +1,8 @@
+Individual and Fitness
+======================
+
+.. doxygenclass:: Brush::Pop::Individual
+   :members:
+
+.. doxygenclass:: Brush::Fitness
+   :members:
\ No newline at end of file
diff --git a/docs/cpp_api/population.rst b/docs/cpp_api/population.rst
new file mode 100644
index 00000000..d8616e56
--- /dev/null
+++ b/docs/cpp_api/population.rst
@@ -0,0 +1,5 @@
+Population
+==========
+
+.. doxygenclass:: Brush::Pop::Population
+   :members:
\ No newline at end of file
diff --git a/docs/cpp_api/selection.rst b/docs/cpp_api/selection.rst
new file mode 100644
index 00000000..b9fa1429
--- /dev/null
+++ b/docs/cpp_api/selection.rst
@@ -0,0 +1,14 @@
+Selection
+=========
+
+.. doxygenclass:: Brush::Sel::Selection
+   :members:
+
+.. doxygenclass:: Brush::Sel::SelectionOperator
+   :members:
+
+.. doxygenclass:: Brush::Sel::NSGA2
+   :members:
+
+.. doxygenclass:: Brush::Sel::Lexicase
+   :members:
diff --git a/docs/cpp_api/variation.rst b/docs/cpp_api/variation.rst
index f92847f5..295f2972 100644
--- a/docs/cpp_api/variation.rst
+++ b/docs/cpp_api/variation.rst
@@ -1,4 +1,8 @@
 Variation (Crossover/Mutation)
 ==============================
 
-.. doxygenfile:: variation.h
\ No newline at end of file
+.. doxygenclass:: Brush::Vary::MutationBase
+   :members:
+
+.. doxygenclass:: Brush::Vary::Variation
+   :members:
diff --git a/docs/python_api/classifier.rst b/docs/python_api/classifier.rst
index c0317657..789af014 100644
--- a/docs/python_api/classifier.rst
+++ b/docs/python_api/classifier.rst
@@ -1,7 +1,6 @@
 BrushClassifier
 ===============
 
-
-.. autoclass:: brush.estimator.BrushClassifier
+.. autoclass:: pybrush.BrushClassifier
    :members:
    :undoc-members:
\ No newline at end of file
diff --git a/docs/python_api/estimator.rst b/docs/python_api/estimator.rst
index 7ed540ed..48a2e1de 100644
--- a/docs/python_api/estimator.rst
+++ b/docs/python_api/estimator.rst
@@ -1,6 +1,6 @@
 BrushEstimator
 ==============
 
-.. autoclass:: brush.estimator.BrushEstimator
+.. autoclass:: pybrush.BrushEstimator
    :members:
    :undoc-members:
\ No newline at end of file
diff --git a/docs/python_api/index.md b/docs/python_api/index.md
index 74c1d0f2..cff7926b 100644
--- a/docs/python_api/index.md
+++ b/docs/python_api/index.md
@@ -4,4 +4,5 @@
 estimator
 regressor
 classifier
+python_api
 ```
\ No newline at end of file
diff --git a/docs/python_api/python_api.rst b/docs/python_api/python_api.rst
index 49c1e879..701cd786 100644
--- a/docs/python_api/python_api.rst
+++ b/docs/python_api/python_api.rst
@@ -3,7 +3,7 @@ Python API
 
 .. With doxygennamespace:
 
-.. .. doxygennamespace:: brush
+.. .. doxygennamespace:: pybrush
 ..    :members: 
 
 
diff --git a/docs/python_api/regressor.rst b/docs/python_api/regressor.rst
index 9289f85d..7fd3b9a8 100644
--- a/docs/python_api/regressor.rst
+++ b/docs/python_api/regressor.rst
@@ -1,6 +1,6 @@
 BrushRegressor
 ==============
 
-.. autoclass:: brush.estimator.BrushRegressor
+.. autoclass:: pybrush.BrushRegressor
    :members:
    :undoc-members:
\ No newline at end of file