From 20d3294a937ce1c3c955f0ab2495b2590aabf3f2 Mon Sep 17 00:00:00 2001
From: Luke Weiler <lukew25073@gmail.com>
Date: Mon, 19 Dec 2022 02:06:10 -0500
Subject: [PATCH] Remove asterisk imports from subject inits (#391)

* removed asterisk imports from subject inits

* import Generator from the right init level
---
 mathgenerator/funcs/__init__.py                             | 6 ------
 mathgenerator/funcs/algebra/__init__.py                     | 2 --
 mathgenerator/funcs/algebra/basic_algebra.py                | 2 +-
 mathgenerator/funcs/algebra/combine_like_terms.py           | 2 +-
 mathgenerator/funcs/algebra/complex_quadratic.py            | 2 +-
 mathgenerator/funcs/algebra/compound_interest.py            | 2 +-
 mathgenerator/funcs/algebra/distance_two_points.py          | 2 +-
 mathgenerator/funcs/algebra/expanding.py                    | 2 +-
 mathgenerator/funcs/algebra/factoring.py                    | 2 +-
 mathgenerator/funcs/algebra/int_matrix_22_determinant.py    | 2 +-
 mathgenerator/funcs/algebra/intersection_of_two_lines.py    | 2 +-
 mathgenerator/funcs/algebra/invert_matrix.py                | 2 +-
 mathgenerator/funcs/algebra/linear_equations.py             | 2 +-
 mathgenerator/funcs/algebra/log.py                          | 2 +-
 mathgenerator/funcs/algebra/matrix_multiplication.py        | 2 +-
 mathgenerator/funcs/algebra/midpoint_of_two_points.py       | 2 +-
 mathgenerator/funcs/algebra/multiply_complex_numbers.py     | 2 +-
 mathgenerator/funcs/algebra/multiply_int_to_22_matrix.py    | 2 +-
 mathgenerator/funcs/algebra/quadratic_equation.py           | 2 +-
 mathgenerator/funcs/algebra/simple_interest.py              | 2 +-
 mathgenerator/funcs/algebra/system_of_equations.py          | 2 +-
 mathgenerator/funcs/algebra/vector_cross.py                 | 2 +-
 mathgenerator/funcs/algebra/vector_dot.py                   | 2 +-
 mathgenerator/funcs/basic_math/__init__.py                  | 2 --
 mathgenerator/funcs/basic_math/absolute_difference.py       | 2 +-
 mathgenerator/funcs/basic_math/addition.py                  | 2 +-
 mathgenerator/funcs/basic_math/compare_fractions.py         | 2 +-
 mathgenerator/funcs/basic_math/complex_division.py          | 2 +-
 mathgenerator/funcs/basic_math/cube_root.py                 | 2 +-
 mathgenerator/funcs/basic_math/divide_fractions.py          | 2 +-
 mathgenerator/funcs/basic_math/division.py                  | 2 +-
 mathgenerator/funcs/basic_math/exponentiation.py            | 2 +-
 mathgenerator/funcs/basic_math/factorial.py                 | 2 +-
 mathgenerator/funcs/basic_math/fraction_multiplication.py   | 2 +-
 mathgenerator/funcs/basic_math/greatest_common_divisor.py   | 2 +-
 mathgenerator/funcs/basic_math/is_composite.py              | 2 +-
 mathgenerator/funcs/basic_math/is_prime.py                  | 2 +-
 mathgenerator/funcs/basic_math/multiplication.py            | 2 +-
 mathgenerator/funcs/basic_math/percentage.py                | 2 +-
 mathgenerator/funcs/basic_math/percentage_difference.py     | 2 +-
 mathgenerator/funcs/basic_math/percentage_error.py          | 2 +-
 mathgenerator/funcs/basic_math/power_of_powers.py           | 2 +-
 mathgenerator/funcs/basic_math/square.py                    | 2 +-
 mathgenerator/funcs/basic_math/square_root.py               | 2 +-
 mathgenerator/funcs/basic_math/subtraction.py               | 2 +-
 mathgenerator/funcs/calculus/__init__.py                    | 2 --
 mathgenerator/funcs/calculus/definite_integral.py           | 2 +-
 mathgenerator/funcs/calculus/differentiation.py             | 2 +-
 mathgenerator/funcs/calculus/power_rule_differentiation.py  | 2 +-
 mathgenerator/funcs/calculus/power_rule_integration.py      | 2 +-
 mathgenerator/funcs/calculus/stationary_points.py           | 2 +-
 mathgenerator/funcs/computer_science/__init__.py            | 2 --
 mathgenerator/funcs/computer_science/bcd_to_decimal.py      | 2 +-
 .../funcs/computer_science/binary_2s_complement.py          | 2 +-
 .../funcs/computer_science/binary_complement_1s.py          | 2 +-
 mathgenerator/funcs/computer_science/binary_to_decimal.py   | 2 +-
 mathgenerator/funcs/computer_science/binary_to_hex.py       | 2 +-
 mathgenerator/funcs/computer_science/decimal_to_bcd.py      | 2 +-
 mathgenerator/funcs/computer_science/decimal_to_binary.py   | 2 +-
 mathgenerator/funcs/computer_science/decimal_to_hexadeci.py | 2 +-
 mathgenerator/funcs/computer_science/decimal_to_octal.py    | 2 +-
 mathgenerator/funcs/computer_science/fibonacci_series.py    | 2 +-
 mathgenerator/funcs/computer_science/modulo_division.py     | 2 +-
 .../funcs/computer_science/nth_fibonacci_number.py          | 2 +-
 mathgenerator/funcs/geometry/__init__.py                    | 2 --
 mathgenerator/funcs/geometry/angle_btw_vectors.py           | 2 +-
 mathgenerator/funcs/geometry/angle_regular_polygon.py       | 2 +-
 mathgenerator/funcs/geometry/arc_length.py                  | 2 +-
 mathgenerator/funcs/geometry/area_of_circle.py              | 2 +-
 .../funcs/geometry/area_of_circle_given_center_and_point.py | 2 +-
 mathgenerator/funcs/geometry/area_of_triangle.py            | 2 +-
 mathgenerator/funcs/geometry/basic_trigonometry.py          | 2 +-
 mathgenerator/funcs/geometry/circumference.py               | 2 +-
 .../funcs/geometry/curved_surface_area_cylinder.py          | 2 +-
 mathgenerator/funcs/geometry/degree_to_rad.py               | 2 +-
 .../funcs/geometry/equation_of_line_from_two_points.py      | 2 +-
 .../funcs/geometry/fourth_angle_of_quadrilateral.py         | 2 +-
 mathgenerator/funcs/geometry/perimeter_of_polygons.py       | 2 +-
 mathgenerator/funcs/geometry/pythagorean_theorem.py         | 2 +-
 mathgenerator/funcs/geometry/radian_to_deg.py               | 2 +-
 mathgenerator/funcs/geometry/sector_area.py                 | 2 +-
 mathgenerator/funcs/geometry/sum_of_polygon_angles.py       | 2 +-
 mathgenerator/funcs/geometry/surface_area_cone.py           | 2 +-
 mathgenerator/funcs/geometry/surface_area_cube.py           | 2 +-
 mathgenerator/funcs/geometry/surface_area_cuboid.py         | 2 +-
 mathgenerator/funcs/geometry/surface_area_cylinder.py       | 2 +-
 mathgenerator/funcs/geometry/surface_area_pyramid.py        | 2 +-
 mathgenerator/funcs/geometry/surface_area_sphere.py         | 2 +-
 mathgenerator/funcs/geometry/third_angle_of_triangle.py     | 2 +-
 mathgenerator/funcs/geometry/valid_triangle.py              | 2 +-
 mathgenerator/funcs/geometry/volume_cone.py                 | 2 +-
 mathgenerator/funcs/geometry/volume_cube.py                 | 2 +-
 mathgenerator/funcs/geometry/volume_cuboid.py               | 2 +-
 mathgenerator/funcs/geometry/volume_cylinder.py             | 2 +-
 mathgenerator/funcs/geometry/volume_frustum.py              | 2 +-
 mathgenerator/funcs/geometry/volume_hemisphere.py           | 2 +-
 mathgenerator/funcs/geometry/volume_pyramid.py              | 2 +-
 mathgenerator/funcs/geometry/volume_sphere.py               | 2 +-
 mathgenerator/funcs/misc/__init__.py                        | 2 --
 mathgenerator/funcs/misc/arithmetic_progression_sum.py      | 2 +-
 mathgenerator/funcs/misc/arithmetic_progression_term.py     | 2 +-
 mathgenerator/funcs/misc/base_conversion.py                 | 2 +-
 mathgenerator/funcs/misc/binomial_distribution.py           | 2 +-
 mathgenerator/funcs/misc/celsius_to_fahrenheit.py           | 2 +-
 mathgenerator/funcs/misc/common_factors.py                  | 2 +-
 mathgenerator/funcs/misc/complex_to_polar.py                | 2 +-
 mathgenerator/funcs/misc/decimal_to_roman_numerals.py       | 2 +-
 mathgenerator/funcs/misc/euclidian_norm.py                  | 2 +-
 mathgenerator/funcs/misc/factors.py                         | 2 +-
 mathgenerator/funcs/misc/gcd.py                             | 2 +-
 mathgenerator/funcs/misc/geometric_mean.py                  | 2 +-
 mathgenerator/funcs/misc/geometric_progression.py           | 2 +-
 mathgenerator/funcs/misc/harmonic_mean.py                   | 2 +-
 mathgenerator/funcs/misc/hcf.py                             | 2 +-
 mathgenerator/funcs/misc/is_leap_year.py                    | 2 +-
 mathgenerator/funcs/misc/lcm.py                             | 2 +-
 mathgenerator/funcs/misc/minutes_to_hours.py                | 2 +-
 mathgenerator/funcs/misc/prime_factors.py                   | 2 +-
 mathgenerator/funcs/misc/product_of_scientific_notations.py | 2 +-
 mathgenerator/funcs/misc/profit_loss_percent.py             | 2 +-
 mathgenerator/funcs/misc/quotient_of_power_same_base.py     | 2 +-
 mathgenerator/funcs/misc/quotient_of_power_same_power.py    | 2 +-
 mathgenerator/funcs/misc/set_operation.py                   | 2 +-
 mathgenerator/funcs/misc/signum_function.py                 | 2 +-
 mathgenerator/funcs/misc/surds_comparison.py                | 2 +-
 mathgenerator/funcs/statistics/__init__.py                  | 2 --
 mathgenerator/funcs/statistics/combinations.py              | 2 +-
 mathgenerator/funcs/statistics/conditional_probability.py   | 2 +-
 mathgenerator/funcs/statistics/confidence_interval.py       | 2 +-
 mathgenerator/funcs/statistics/data_summary.py              | 2 +-
 mathgenerator/funcs/statistics/dice_sum_probability.py      | 2 +-
 mathgenerator/funcs/statistics/mean_median.py               | 2 +-
 mathgenerator/funcs/statistics/permutation.py               | 2 +-
 scripts/adoptGenerator.py                                   | 2 +-
 134 files changed, 126 insertions(+), 146 deletions(-)

diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py
index f09884d..c563d37 100644
--- a/mathgenerator/funcs/__init__.py
+++ b/mathgenerator/funcs/__init__.py
@@ -1,9 +1,3 @@
-import random
-import math
-import fractions
-
-from ..__init__ import *
-
 from .algebra import *
 from .basic_math import *
 from .calculus import *
diff --git a/mathgenerator/funcs/algebra/__init__.py b/mathgenerator/funcs/algebra/__init__.py
index caf42dc..83e192f 100644
--- a/mathgenerator/funcs/algebra/__init__.py
+++ b/mathgenerator/funcs/algebra/__init__.py
@@ -1,5 +1,3 @@
-from ...__init__ import *
-
 from .basic_algebra import basic_algebra
 from .combine_like_terms import combine_like_terms
 from .complex_quadratic import complex_quadratic
diff --git a/mathgenerator/funcs/algebra/basic_algebra.py b/mathgenerator/funcs/algebra/basic_algebra.py
index 419b54f..1ef0b21 100644
--- a/mathgenerator/funcs/algebra/basic_algebra.py
+++ b/mathgenerator/funcs/algebra/basic_algebra.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/algebra/combine_like_terms.py b/mathgenerator/funcs/algebra/combine_like_terms.py
index 521095a..ff12459 100644
--- a/mathgenerator/funcs/algebra/combine_like_terms.py
+++ b/mathgenerator/funcs/algebra/combine_like_terms.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/algebra/complex_quadratic.py b/mathgenerator/funcs/algebra/complex_quadratic.py
index a5d48b8..30763bc 100644
--- a/mathgenerator/funcs/algebra/complex_quadratic.py
+++ b/mathgenerator/funcs/algebra/complex_quadratic.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/algebra/compound_interest.py b/mathgenerator/funcs/algebra/compound_interest.py
index d6f919b..abe34b8 100644
--- a/mathgenerator/funcs/algebra/compound_interest.py
+++ b/mathgenerator/funcs/algebra/compound_interest.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/algebra/distance_two_points.py b/mathgenerator/funcs/algebra/distance_two_points.py
index 34ca61f..80da6ba 100644
--- a/mathgenerator/funcs/algebra/distance_two_points.py
+++ b/mathgenerator/funcs/algebra/distance_two_points.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/algebra/expanding.py b/mathgenerator/funcs/algebra/expanding.py
index 339c46d..7e88a9a 100644
--- a/mathgenerator/funcs/algebra/expanding.py
+++ b/mathgenerator/funcs/algebra/expanding.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/algebra/factoring.py b/mathgenerator/funcs/algebra/factoring.py
index 239d8d3..02a8bc2 100644
--- a/mathgenerator/funcs/algebra/factoring.py
+++ b/mathgenerator/funcs/algebra/factoring.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/algebra/int_matrix_22_determinant.py b/mathgenerator/funcs/algebra/int_matrix_22_determinant.py
index 5a12efe..15923c1 100644
--- a/mathgenerator/funcs/algebra/int_matrix_22_determinant.py
+++ b/mathgenerator/funcs/algebra/int_matrix_22_determinant.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/algebra/intersection_of_two_lines.py b/mathgenerator/funcs/algebra/intersection_of_two_lines.py
index 2b89fed..42f2615 100644
--- a/mathgenerator/funcs/algebra/intersection_of_two_lines.py
+++ b/mathgenerator/funcs/algebra/intersection_of_two_lines.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import fractions
 
diff --git a/mathgenerator/funcs/algebra/invert_matrix.py b/mathgenerator/funcs/algebra/invert_matrix.py
index e5c2d70..cbad277 100644
--- a/mathgenerator/funcs/algebra/invert_matrix.py
+++ b/mathgenerator/funcs/algebra/invert_matrix.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 import sympy
diff --git a/mathgenerator/funcs/algebra/linear_equations.py b/mathgenerator/funcs/algebra/linear_equations.py
index 951a01e..d4dd146 100644
--- a/mathgenerator/funcs/algebra/linear_equations.py
+++ b/mathgenerator/funcs/algebra/linear_equations.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/algebra/log.py b/mathgenerator/funcs/algebra/log.py
index 930965d..6f5c37e 100644
--- a/mathgenerator/funcs/algebra/log.py
+++ b/mathgenerator/funcs/algebra/log.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/algebra/matrix_multiplication.py b/mathgenerator/funcs/algebra/matrix_multiplication.py
index 29bfb12..ab29b97 100644
--- a/mathgenerator/funcs/algebra/matrix_multiplication.py
+++ b/mathgenerator/funcs/algebra/matrix_multiplication.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/algebra/midpoint_of_two_points.py b/mathgenerator/funcs/algebra/midpoint_of_two_points.py
index 73e54ef..df8b035 100644
--- a/mathgenerator/funcs/algebra/midpoint_of_two_points.py
+++ b/mathgenerator/funcs/algebra/midpoint_of_two_points.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/algebra/multiply_complex_numbers.py b/mathgenerator/funcs/algebra/multiply_complex_numbers.py
index c94b539..b6f1db8 100644
--- a/mathgenerator/funcs/algebra/multiply_complex_numbers.py
+++ b/mathgenerator/funcs/algebra/multiply_complex_numbers.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/algebra/multiply_int_to_22_matrix.py b/mathgenerator/funcs/algebra/multiply_int_to_22_matrix.py
index b16c077..56db80d 100644
--- a/mathgenerator/funcs/algebra/multiply_int_to_22_matrix.py
+++ b/mathgenerator/funcs/algebra/multiply_int_to_22_matrix.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/algebra/quadratic_equation.py b/mathgenerator/funcs/algebra/quadratic_equation.py
index d53ee13..b474d77 100644
--- a/mathgenerator/funcs/algebra/quadratic_equation.py
+++ b/mathgenerator/funcs/algebra/quadratic_equation.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/algebra/simple_interest.py b/mathgenerator/funcs/algebra/simple_interest.py
index 5de696b..9c1170a 100644
--- a/mathgenerator/funcs/algebra/simple_interest.py
+++ b/mathgenerator/funcs/algebra/simple_interest.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/algebra/system_of_equations.py b/mathgenerator/funcs/algebra/system_of_equations.py
index fc686ba..1f85975 100644
--- a/mathgenerator/funcs/algebra/system_of_equations.py
+++ b/mathgenerator/funcs/algebra/system_of_equations.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/algebra/vector_cross.py b/mathgenerator/funcs/algebra/vector_cross.py
index b6c03a5..8b44121 100644
--- a/mathgenerator/funcs/algebra/vector_cross.py
+++ b/mathgenerator/funcs/algebra/vector_cross.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/algebra/vector_dot.py b/mathgenerator/funcs/algebra/vector_dot.py
index d1b1817..3561edb 100644
--- a/mathgenerator/funcs/algebra/vector_dot.py
+++ b/mathgenerator/funcs/algebra/vector_dot.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/__init__.py b/mathgenerator/funcs/basic_math/__init__.py
index b2ba76d..59c0e7a 100644
--- a/mathgenerator/funcs/basic_math/__init__.py
+++ b/mathgenerator/funcs/basic_math/__init__.py
@@ -1,5 +1,3 @@
-from ...__init__ import *
-
 from .absolute_difference import absolute_difference
 from .addition import addition
 from .compare_fractions import compare_fractions
diff --git a/mathgenerator/funcs/basic_math/absolute_difference.py b/mathgenerator/funcs/basic_math/absolute_difference.py
index a1eb0ad..47fc1df 100644
--- a/mathgenerator/funcs/basic_math/absolute_difference.py
+++ b/mathgenerator/funcs/basic_math/absolute_difference.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/addition.py b/mathgenerator/funcs/basic_math/addition.py
index ba09ab4..c4bede1 100644
--- a/mathgenerator/funcs/basic_math/addition.py
+++ b/mathgenerator/funcs/basic_math/addition.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/compare_fractions.py b/mathgenerator/funcs/basic_math/compare_fractions.py
index a5cc252..536d8d5 100644
--- a/mathgenerator/funcs/basic_math/compare_fractions.py
+++ b/mathgenerator/funcs/basic_math/compare_fractions.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/complex_division.py b/mathgenerator/funcs/basic_math/complex_division.py
index 1af1138..141ae9e 100644
--- a/mathgenerator/funcs/basic_math/complex_division.py
+++ b/mathgenerator/funcs/basic_math/complex_division.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/cube_root.py b/mathgenerator/funcs/basic_math/cube_root.py
index 582e43f..8cd631c 100644
--- a/mathgenerator/funcs/basic_math/cube_root.py
+++ b/mathgenerator/funcs/basic_math/cube_root.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/divide_fractions.py b/mathgenerator/funcs/basic_math/divide_fractions.py
index c1c5f72..d7ef64e 100644
--- a/mathgenerator/funcs/basic_math/divide_fractions.py
+++ b/mathgenerator/funcs/basic_math/divide_fractions.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/division.py b/mathgenerator/funcs/basic_math/division.py
index be453d7..1208a3b 100644
--- a/mathgenerator/funcs/basic_math/division.py
+++ b/mathgenerator/funcs/basic_math/division.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/exponentiation.py b/mathgenerator/funcs/basic_math/exponentiation.py
index 1fea6fe..4f699a0 100644
--- a/mathgenerator/funcs/basic_math/exponentiation.py
+++ b/mathgenerator/funcs/basic_math/exponentiation.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/factorial.py b/mathgenerator/funcs/basic_math/factorial.py
index 89351f4..d3a8fb2 100644
--- a/mathgenerator/funcs/basic_math/factorial.py
+++ b/mathgenerator/funcs/basic_math/factorial.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/fraction_multiplication.py b/mathgenerator/funcs/basic_math/fraction_multiplication.py
index 3076b3a..070179f 100644
--- a/mathgenerator/funcs/basic_math/fraction_multiplication.py
+++ b/mathgenerator/funcs/basic_math/fraction_multiplication.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/greatest_common_divisor.py b/mathgenerator/funcs/basic_math/greatest_common_divisor.py
index cb0cf34..4f69519 100644
--- a/mathgenerator/funcs/basic_math/greatest_common_divisor.py
+++ b/mathgenerator/funcs/basic_math/greatest_common_divisor.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/is_composite.py b/mathgenerator/funcs/basic_math/is_composite.py
index 69d2113..43afeac 100644
--- a/mathgenerator/funcs/basic_math/is_composite.py
+++ b/mathgenerator/funcs/basic_math/is_composite.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/is_prime.py b/mathgenerator/funcs/basic_math/is_prime.py
index e705bb9..4e1141b 100644
--- a/mathgenerator/funcs/basic_math/is_prime.py
+++ b/mathgenerator/funcs/basic_math/is_prime.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/multiplication.py b/mathgenerator/funcs/basic_math/multiplication.py
index e89aad8..b7958e9 100644
--- a/mathgenerator/funcs/basic_math/multiplication.py
+++ b/mathgenerator/funcs/basic_math/multiplication.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/percentage.py b/mathgenerator/funcs/basic_math/percentage.py
index 3c9b87a..9f73621 100644
--- a/mathgenerator/funcs/basic_math/percentage.py
+++ b/mathgenerator/funcs/basic_math/percentage.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/percentage_difference.py b/mathgenerator/funcs/basic_math/percentage_difference.py
index f29fe69..9368211 100644
--- a/mathgenerator/funcs/basic_math/percentage_difference.py
+++ b/mathgenerator/funcs/basic_math/percentage_difference.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/percentage_error.py b/mathgenerator/funcs/basic_math/percentage_error.py
index c04a39d..a193b1e 100644
--- a/mathgenerator/funcs/basic_math/percentage_error.py
+++ b/mathgenerator/funcs/basic_math/percentage_error.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/power_of_powers.py b/mathgenerator/funcs/basic_math/power_of_powers.py
index da6eb42..6989786 100644
--- a/mathgenerator/funcs/basic_math/power_of_powers.py
+++ b/mathgenerator/funcs/basic_math/power_of_powers.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/square.py b/mathgenerator/funcs/basic_math/square.py
index 57c19a3..916f73c 100644
--- a/mathgenerator/funcs/basic_math/square.py
+++ b/mathgenerator/funcs/basic_math/square.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/square_root.py b/mathgenerator/funcs/basic_math/square_root.py
index 7af77fd..c44ce44 100644
--- a/mathgenerator/funcs/basic_math/square_root.py
+++ b/mathgenerator/funcs/basic_math/square_root.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/basic_math/subtraction.py b/mathgenerator/funcs/basic_math/subtraction.py
index a6ed94e..29eebba 100644
--- a/mathgenerator/funcs/basic_math/subtraction.py
+++ b/mathgenerator/funcs/basic_math/subtraction.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/calculus/__init__.py b/mathgenerator/funcs/calculus/__init__.py
index 82b298a..abb977d 100644
--- a/mathgenerator/funcs/calculus/__init__.py
+++ b/mathgenerator/funcs/calculus/__init__.py
@@ -1,5 +1,3 @@
-from ...__init__ import *
-
 from .definite_integral import definite_integral
 from .differentiation import differentiation
 from .power_rule_differentiation import power_rule_differentiation
diff --git a/mathgenerator/funcs/calculus/definite_integral.py b/mathgenerator/funcs/calculus/definite_integral.py
index d79a993..e6a9728 100644
--- a/mathgenerator/funcs/calculus/definite_integral.py
+++ b/mathgenerator/funcs/calculus/definite_integral.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 from scipy.integrate import quad
 
diff --git a/mathgenerator/funcs/calculus/differentiation.py b/mathgenerator/funcs/calculus/differentiation.py
index 74dbef5..c880283 100644
--- a/mathgenerator/funcs/calculus/differentiation.py
+++ b/mathgenerator/funcs/calculus/differentiation.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import sympy
 
diff --git a/mathgenerator/funcs/calculus/power_rule_differentiation.py b/mathgenerator/funcs/calculus/power_rule_differentiation.py
index 504b346..f225eec 100644
--- a/mathgenerator/funcs/calculus/power_rule_differentiation.py
+++ b/mathgenerator/funcs/calculus/power_rule_differentiation.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/calculus/power_rule_integration.py b/mathgenerator/funcs/calculus/power_rule_integration.py
index 5cef9d4..3351b68 100644
--- a/mathgenerator/funcs/calculus/power_rule_integration.py
+++ b/mathgenerator/funcs/calculus/power_rule_integration.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/calculus/stationary_points.py b/mathgenerator/funcs/calculus/stationary_points.py
index 2f96316..ca69379 100644
--- a/mathgenerator/funcs/calculus/stationary_points.py
+++ b/mathgenerator/funcs/calculus/stationary_points.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import sympy
 
diff --git a/mathgenerator/funcs/computer_science/__init__.py b/mathgenerator/funcs/computer_science/__init__.py
index 410f250..720e0c1 100644
--- a/mathgenerator/funcs/computer_science/__init__.py
+++ b/mathgenerator/funcs/computer_science/__init__.py
@@ -1,5 +1,3 @@
-from ...__init__ import *
-
 from .bcd_to_decimal import bcd_to_decimal
 from .binary_2s_complement import binary_2s_complement
 from .binary_complement_1s import binary_complement_1s
diff --git a/mathgenerator/funcs/computer_science/bcd_to_decimal.py b/mathgenerator/funcs/computer_science/bcd_to_decimal.py
index 187a2ce..6b2eed6 100644
--- a/mathgenerator/funcs/computer_science/bcd_to_decimal.py
+++ b/mathgenerator/funcs/computer_science/bcd_to_decimal.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/computer_science/binary_2s_complement.py b/mathgenerator/funcs/computer_science/binary_2s_complement.py
index 030a641..60a00d2 100644
--- a/mathgenerator/funcs/computer_science/binary_2s_complement.py
+++ b/mathgenerator/funcs/computer_science/binary_2s_complement.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/computer_science/binary_complement_1s.py b/mathgenerator/funcs/computer_science/binary_complement_1s.py
index 6adaaad..14b5094 100644
--- a/mathgenerator/funcs/computer_science/binary_complement_1s.py
+++ b/mathgenerator/funcs/computer_science/binary_complement_1s.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/computer_science/binary_to_decimal.py b/mathgenerator/funcs/computer_science/binary_to_decimal.py
index e240d33..17db52e 100644
--- a/mathgenerator/funcs/computer_science/binary_to_decimal.py
+++ b/mathgenerator/funcs/computer_science/binary_to_decimal.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/computer_science/binary_to_hex.py b/mathgenerator/funcs/computer_science/binary_to_hex.py
index 9ee4519..01a17bd 100644
--- a/mathgenerator/funcs/computer_science/binary_to_hex.py
+++ b/mathgenerator/funcs/computer_science/binary_to_hex.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/computer_science/decimal_to_bcd.py b/mathgenerator/funcs/computer_science/decimal_to_bcd.py
index 31e9d1f..ed6c43b 100644
--- a/mathgenerator/funcs/computer_science/decimal_to_bcd.py
+++ b/mathgenerator/funcs/computer_science/decimal_to_bcd.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/computer_science/decimal_to_binary.py b/mathgenerator/funcs/computer_science/decimal_to_binary.py
index e409f18..b187f9d 100644
--- a/mathgenerator/funcs/computer_science/decimal_to_binary.py
+++ b/mathgenerator/funcs/computer_science/decimal_to_binary.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/computer_science/decimal_to_hexadeci.py b/mathgenerator/funcs/computer_science/decimal_to_hexadeci.py
index 2486ce0..e11482a 100644
--- a/mathgenerator/funcs/computer_science/decimal_to_hexadeci.py
+++ b/mathgenerator/funcs/computer_science/decimal_to_hexadeci.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/computer_science/decimal_to_octal.py b/mathgenerator/funcs/computer_science/decimal_to_octal.py
index d867ab3..d066859 100644
--- a/mathgenerator/funcs/computer_science/decimal_to_octal.py
+++ b/mathgenerator/funcs/computer_science/decimal_to_octal.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/computer_science/fibonacci_series.py b/mathgenerator/funcs/computer_science/fibonacci_series.py
index 86dfe01..0fa62e3 100644
--- a/mathgenerator/funcs/computer_science/fibonacci_series.py
+++ b/mathgenerator/funcs/computer_science/fibonacci_series.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/computer_science/modulo_division.py b/mathgenerator/funcs/computer_science/modulo_division.py
index 660df08..9bdd760 100644
--- a/mathgenerator/funcs/computer_science/modulo_division.py
+++ b/mathgenerator/funcs/computer_science/modulo_division.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/computer_science/nth_fibonacci_number.py b/mathgenerator/funcs/computer_science/nth_fibonacci_number.py
index c44e656..4c54081 100644
--- a/mathgenerator/funcs/computer_science/nth_fibonacci_number.py
+++ b/mathgenerator/funcs/computer_science/nth_fibonacci_number.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/geometry/__init__.py b/mathgenerator/funcs/geometry/__init__.py
index 37be55a..7ad1e4b 100644
--- a/mathgenerator/funcs/geometry/__init__.py
+++ b/mathgenerator/funcs/geometry/__init__.py
@@ -1,5 +1,3 @@
-from ...__init__ import *
-
 from .angle_btw_vectors import angle_btw_vectors
 from .angle_regular_polygon import angle_regular_polygon
 from .arc_length import arc_length
diff --git a/mathgenerator/funcs/geometry/angle_btw_vectors.py b/mathgenerator/funcs/geometry/angle_btw_vectors.py
index 741abe2..eec8aa8 100644
--- a/mathgenerator/funcs/geometry/angle_btw_vectors.py
+++ b/mathgenerator/funcs/geometry/angle_btw_vectors.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/geometry/angle_regular_polygon.py b/mathgenerator/funcs/geometry/angle_regular_polygon.py
index 93c8d0f..2da5275 100644
--- a/mathgenerator/funcs/geometry/angle_regular_polygon.py
+++ b/mathgenerator/funcs/geometry/angle_regular_polygon.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/geometry/arc_length.py b/mathgenerator/funcs/geometry/arc_length.py
index 63475a1..7b9db1d 100644
--- a/mathgenerator/funcs/geometry/arc_length.py
+++ b/mathgenerator/funcs/geometry/arc_length.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/geometry/area_of_circle.py b/mathgenerator/funcs/geometry/area_of_circle.py
index 399edc6..1f0fff4 100644
--- a/mathgenerator/funcs/geometry/area_of_circle.py
+++ b/mathgenerator/funcs/geometry/area_of_circle.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/geometry/area_of_circle_given_center_and_point.py b/mathgenerator/funcs/geometry/area_of_circle_given_center_and_point.py
index c1178e1..4d14ec4 100644
--- a/mathgenerator/funcs/geometry/area_of_circle_given_center_and_point.py
+++ b/mathgenerator/funcs/geometry/area_of_circle_given_center_and_point.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 from math import cos, sin, pi
 
diff --git a/mathgenerator/funcs/geometry/area_of_triangle.py b/mathgenerator/funcs/geometry/area_of_triangle.py
index 5fab027..8fa6485 100644
--- a/mathgenerator/funcs/geometry/area_of_triangle.py
+++ b/mathgenerator/funcs/geometry/area_of_triangle.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/geometry/basic_trigonometry.py b/mathgenerator/funcs/geometry/basic_trigonometry.py
index 3281323..2401c9d 100644
--- a/mathgenerator/funcs/geometry/basic_trigonometry.py
+++ b/mathgenerator/funcs/geometry/basic_trigonometry.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/geometry/circumference.py b/mathgenerator/funcs/geometry/circumference.py
index d5dc3e1..9255daf 100644
--- a/mathgenerator/funcs/geometry/circumference.py
+++ b/mathgenerator/funcs/geometry/circumference.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/geometry/curved_surface_area_cylinder.py b/mathgenerator/funcs/geometry/curved_surface_area_cylinder.py
index 5be2191..d195948 100644
--- a/mathgenerator/funcs/geometry/curved_surface_area_cylinder.py
+++ b/mathgenerator/funcs/geometry/curved_surface_area_cylinder.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/geometry/degree_to_rad.py b/mathgenerator/funcs/geometry/degree_to_rad.py
index 86ec044..dce79e1 100644
--- a/mathgenerator/funcs/geometry/degree_to_rad.py
+++ b/mathgenerator/funcs/geometry/degree_to_rad.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/geometry/equation_of_line_from_two_points.py b/mathgenerator/funcs/geometry/equation_of_line_from_two_points.py
index 55635b1..d9db817 100644
--- a/mathgenerator/funcs/geometry/equation_of_line_from_two_points.py
+++ b/mathgenerator/funcs/geometry/equation_of_line_from_two_points.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/geometry/fourth_angle_of_quadrilateral.py b/mathgenerator/funcs/geometry/fourth_angle_of_quadrilateral.py
index 1d07100..2b02366 100644
--- a/mathgenerator/funcs/geometry/fourth_angle_of_quadrilateral.py
+++ b/mathgenerator/funcs/geometry/fourth_angle_of_quadrilateral.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/geometry/perimeter_of_polygons.py b/mathgenerator/funcs/geometry/perimeter_of_polygons.py
index 649dff6..3b569c5 100644
--- a/mathgenerator/funcs/geometry/perimeter_of_polygons.py
+++ b/mathgenerator/funcs/geometry/perimeter_of_polygons.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/geometry/pythagorean_theorem.py b/mathgenerator/funcs/geometry/pythagorean_theorem.py
index f95ded0..75887a3 100644
--- a/mathgenerator/funcs/geometry/pythagorean_theorem.py
+++ b/mathgenerator/funcs/geometry/pythagorean_theorem.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/geometry/radian_to_deg.py b/mathgenerator/funcs/geometry/radian_to_deg.py
index 4923810..98aa982 100644
--- a/mathgenerator/funcs/geometry/radian_to_deg.py
+++ b/mathgenerator/funcs/geometry/radian_to_deg.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/geometry/sector_area.py b/mathgenerator/funcs/geometry/sector_area.py
index f3bb6a1..8ba7d37 100644
--- a/mathgenerator/funcs/geometry/sector_area.py
+++ b/mathgenerator/funcs/geometry/sector_area.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/geometry/sum_of_polygon_angles.py b/mathgenerator/funcs/geometry/sum_of_polygon_angles.py
index 940314d..d31c6ae 100644
--- a/mathgenerator/funcs/geometry/sum_of_polygon_angles.py
+++ b/mathgenerator/funcs/geometry/sum_of_polygon_angles.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/geometry/surface_area_cone.py b/mathgenerator/funcs/geometry/surface_area_cone.py
index c47b079..fbd336b 100644
--- a/mathgenerator/funcs/geometry/surface_area_cone.py
+++ b/mathgenerator/funcs/geometry/surface_area_cone.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/geometry/surface_area_cube.py b/mathgenerator/funcs/geometry/surface_area_cube.py
index eb5e827..f728329 100644
--- a/mathgenerator/funcs/geometry/surface_area_cube.py
+++ b/mathgenerator/funcs/geometry/surface_area_cube.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/geometry/surface_area_cuboid.py b/mathgenerator/funcs/geometry/surface_area_cuboid.py
index 66004f7..66564ab 100644
--- a/mathgenerator/funcs/geometry/surface_area_cuboid.py
+++ b/mathgenerator/funcs/geometry/surface_area_cuboid.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/geometry/surface_area_cylinder.py b/mathgenerator/funcs/geometry/surface_area_cylinder.py
index 8e3cdc2..3b0c857 100644
--- a/mathgenerator/funcs/geometry/surface_area_cylinder.py
+++ b/mathgenerator/funcs/geometry/surface_area_cylinder.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/geometry/surface_area_pyramid.py b/mathgenerator/funcs/geometry/surface_area_pyramid.py
index c8f56e6..216d07f 100644
--- a/mathgenerator/funcs/geometry/surface_area_pyramid.py
+++ b/mathgenerator/funcs/geometry/surface_area_pyramid.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 # List of Pythagorean triplets
diff --git a/mathgenerator/funcs/geometry/surface_area_sphere.py b/mathgenerator/funcs/geometry/surface_area_sphere.py
index d8c0eb6..140eaac 100644
--- a/mathgenerator/funcs/geometry/surface_area_sphere.py
+++ b/mathgenerator/funcs/geometry/surface_area_sphere.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/geometry/third_angle_of_triangle.py b/mathgenerator/funcs/geometry/third_angle_of_triangle.py
index c175a76..47df5cc 100644
--- a/mathgenerator/funcs/geometry/third_angle_of_triangle.py
+++ b/mathgenerator/funcs/geometry/third_angle_of_triangle.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/geometry/valid_triangle.py b/mathgenerator/funcs/geometry/valid_triangle.py
index bcbc32d..0b2fe81 100644
--- a/mathgenerator/funcs/geometry/valid_triangle.py
+++ b/mathgenerator/funcs/geometry/valid_triangle.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/geometry/volume_cone.py b/mathgenerator/funcs/geometry/volume_cone.py
index c2fba7b..1f08ee5 100644
--- a/mathgenerator/funcs/geometry/volume_cone.py
+++ b/mathgenerator/funcs/geometry/volume_cone.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/geometry/volume_cube.py b/mathgenerator/funcs/geometry/volume_cube.py
index 165b2a5..2f947ed 100644
--- a/mathgenerator/funcs/geometry/volume_cube.py
+++ b/mathgenerator/funcs/geometry/volume_cube.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/geometry/volume_cuboid.py b/mathgenerator/funcs/geometry/volume_cuboid.py
index b14ab73..31eac5a 100644
--- a/mathgenerator/funcs/geometry/volume_cuboid.py
+++ b/mathgenerator/funcs/geometry/volume_cuboid.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/geometry/volume_cylinder.py b/mathgenerator/funcs/geometry/volume_cylinder.py
index 6a8971c..67f9642 100644
--- a/mathgenerator/funcs/geometry/volume_cylinder.py
+++ b/mathgenerator/funcs/geometry/volume_cylinder.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/geometry/volume_frustum.py b/mathgenerator/funcs/geometry/volume_frustum.py
index 07cade5..7d0a330 100644
--- a/mathgenerator/funcs/geometry/volume_frustum.py
+++ b/mathgenerator/funcs/geometry/volume_frustum.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/geometry/volume_hemisphere.py b/mathgenerator/funcs/geometry/volume_hemisphere.py
index 8eb5d48..75df0f2 100644
--- a/mathgenerator/funcs/geometry/volume_hemisphere.py
+++ b/mathgenerator/funcs/geometry/volume_hemisphere.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/geometry/volume_pyramid.py b/mathgenerator/funcs/geometry/volume_pyramid.py
index c019002..12eb4c1 100644
--- a/mathgenerator/funcs/geometry/volume_pyramid.py
+++ b/mathgenerator/funcs/geometry/volume_pyramid.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/geometry/volume_sphere.py b/mathgenerator/funcs/geometry/volume_sphere.py
index 92ebd9b..015e69c 100644
--- a/mathgenerator/funcs/geometry/volume_sphere.py
+++ b/mathgenerator/funcs/geometry/volume_sphere.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/misc/__init__.py b/mathgenerator/funcs/misc/__init__.py
index ee9d054..3e88173 100644
--- a/mathgenerator/funcs/misc/__init__.py
+++ b/mathgenerator/funcs/misc/__init__.py
@@ -1,5 +1,3 @@
-from ...__init__ import *
-
 from .arithmetic_progression_sum import arithmetic_progression_sum
 from .arithmetic_progression_term import arithmetic_progression_term
 from .base_conversion import base_conversion
diff --git a/mathgenerator/funcs/misc/arithmetic_progression_sum.py b/mathgenerator/funcs/misc/arithmetic_progression_sum.py
index 44da588..b3fd7cf 100644
--- a/mathgenerator/funcs/misc/arithmetic_progression_sum.py
+++ b/mathgenerator/funcs/misc/arithmetic_progression_sum.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/arithmetic_progression_term.py b/mathgenerator/funcs/misc/arithmetic_progression_term.py
index 4a97a6d..7e09b92 100644
--- a/mathgenerator/funcs/misc/arithmetic_progression_term.py
+++ b/mathgenerator/funcs/misc/arithmetic_progression_term.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/base_conversion.py b/mathgenerator/funcs/misc/base_conversion.py
index a465e3e..2f74f3f 100644
--- a/mathgenerator/funcs/misc/base_conversion.py
+++ b/mathgenerator/funcs/misc/base_conversion.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/binomial_distribution.py b/mathgenerator/funcs/misc/binomial_distribution.py
index bfd16ca..3f37da8 100644
--- a/mathgenerator/funcs/misc/binomial_distribution.py
+++ b/mathgenerator/funcs/misc/binomial_distribution.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/celsius_to_fahrenheit.py b/mathgenerator/funcs/misc/celsius_to_fahrenheit.py
index 4b46e36..176c14b 100644
--- a/mathgenerator/funcs/misc/celsius_to_fahrenheit.py
+++ b/mathgenerator/funcs/misc/celsius_to_fahrenheit.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/common_factors.py b/mathgenerator/funcs/misc/common_factors.py
index ba03806..20b7ea5 100644
--- a/mathgenerator/funcs/misc/common_factors.py
+++ b/mathgenerator/funcs/misc/common_factors.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/complex_to_polar.py b/mathgenerator/funcs/misc/complex_to_polar.py
index 982d46e..95219ea 100644
--- a/mathgenerator/funcs/misc/complex_to_polar.py
+++ b/mathgenerator/funcs/misc/complex_to_polar.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/misc/decimal_to_roman_numerals.py b/mathgenerator/funcs/misc/decimal_to_roman_numerals.py
index 5bde099..2812b09 100644
--- a/mathgenerator/funcs/misc/decimal_to_roman_numerals.py
+++ b/mathgenerator/funcs/misc/decimal_to_roman_numerals.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/misc/euclidian_norm.py b/mathgenerator/funcs/misc/euclidian_norm.py
index 3da6b41..2d5b4a2 100644
--- a/mathgenerator/funcs/misc/euclidian_norm.py
+++ b/mathgenerator/funcs/misc/euclidian_norm.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/misc/factors.py b/mathgenerator/funcs/misc/factors.py
index 5666e63..91d35ee 100644
--- a/mathgenerator/funcs/misc/factors.py
+++ b/mathgenerator/funcs/misc/factors.py
@@ -1,4 +1,4 @@
-from .. import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/gcd.py b/mathgenerator/funcs/misc/gcd.py
index 692a250..f160bcf 100644
--- a/mathgenerator/funcs/misc/gcd.py
+++ b/mathgenerator/funcs/misc/gcd.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/geometric_mean.py b/mathgenerator/funcs/misc/geometric_mean.py
index 1be3e10..640562b 100644
--- a/mathgenerator/funcs/misc/geometric_mean.py
+++ b/mathgenerator/funcs/misc/geometric_mean.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/geometric_progression.py b/mathgenerator/funcs/misc/geometric_progression.py
index 9edbf2c..4d74c23 100644
--- a/mathgenerator/funcs/misc/geometric_progression.py
+++ b/mathgenerator/funcs/misc/geometric_progression.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/harmonic_mean.py b/mathgenerator/funcs/misc/harmonic_mean.py
index cce3608..72c99dd 100644
--- a/mathgenerator/funcs/misc/harmonic_mean.py
+++ b/mathgenerator/funcs/misc/harmonic_mean.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/hcf.py b/mathgenerator/funcs/misc/hcf.py
index 278eead..43caf0b 100644
--- a/mathgenerator/funcs/misc/hcf.py
+++ b/mathgenerator/funcs/misc/hcf.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/is_leap_year.py b/mathgenerator/funcs/misc/is_leap_year.py
index 46214bf..b59f840 100644
--- a/mathgenerator/funcs/misc/is_leap_year.py
+++ b/mathgenerator/funcs/misc/is_leap_year.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/lcm.py b/mathgenerator/funcs/misc/lcm.py
index 3bcd89f..0d9aa57 100644
--- a/mathgenerator/funcs/misc/lcm.py
+++ b/mathgenerator/funcs/misc/lcm.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/minutes_to_hours.py b/mathgenerator/funcs/misc/minutes_to_hours.py
index 43995a6..14d0909 100644
--- a/mathgenerator/funcs/misc/minutes_to_hours.py
+++ b/mathgenerator/funcs/misc/minutes_to_hours.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/prime_factors.py b/mathgenerator/funcs/misc/prime_factors.py
index 7444ef9..9c31d44 100644
--- a/mathgenerator/funcs/misc/prime_factors.py
+++ b/mathgenerator/funcs/misc/prime_factors.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/product_of_scientific_notations.py b/mathgenerator/funcs/misc/product_of_scientific_notations.py
index e1191f0..d7ee4f4 100644
--- a/mathgenerator/funcs/misc/product_of_scientific_notations.py
+++ b/mathgenerator/funcs/misc/product_of_scientific_notations.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/profit_loss_percent.py b/mathgenerator/funcs/misc/profit_loss_percent.py
index 6f8711c..7122962 100644
--- a/mathgenerator/funcs/misc/profit_loss_percent.py
+++ b/mathgenerator/funcs/misc/profit_loss_percent.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/quotient_of_power_same_base.py b/mathgenerator/funcs/misc/quotient_of_power_same_base.py
index d50007e..66914c6 100644
--- a/mathgenerator/funcs/misc/quotient_of_power_same_base.py
+++ b/mathgenerator/funcs/misc/quotient_of_power_same_base.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/quotient_of_power_same_power.py b/mathgenerator/funcs/misc/quotient_of_power_same_power.py
index 9a1d8d3..58ef209 100644
--- a/mathgenerator/funcs/misc/quotient_of_power_same_power.py
+++ b/mathgenerator/funcs/misc/quotient_of_power_same_power.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/set_operation.py b/mathgenerator/funcs/misc/set_operation.py
index e8139a4..45d98c1 100644
--- a/mathgenerator/funcs/misc/set_operation.py
+++ b/mathgenerator/funcs/misc/set_operation.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/signum_function.py b/mathgenerator/funcs/misc/signum_function.py
index d56e856..3ddc580 100644
--- a/mathgenerator/funcs/misc/signum_function.py
+++ b/mathgenerator/funcs/misc/signum_function.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/misc/surds_comparison.py b/mathgenerator/funcs/misc/surds_comparison.py
index a02e223..50d8066 100644
--- a/mathgenerator/funcs/misc/surds_comparison.py
+++ b/mathgenerator/funcs/misc/surds_comparison.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/statistics/__init__.py b/mathgenerator/funcs/statistics/__init__.py
index 83f3171..267b98e 100644
--- a/mathgenerator/funcs/statistics/__init__.py
+++ b/mathgenerator/funcs/statistics/__init__.py
@@ -1,5 +1,3 @@
-from ...__init__ import *
-
 from .combinations import combinations
 from .conditional_probability import conditional_probability
 from .confidence_interval import confidence_interval
diff --git a/mathgenerator/funcs/statistics/combinations.py b/mathgenerator/funcs/statistics/combinations.py
index 8bfa2cc..a9ad9c3 100644
--- a/mathgenerator/funcs/statistics/combinations.py
+++ b/mathgenerator/funcs/statistics/combinations.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/statistics/conditional_probability.py b/mathgenerator/funcs/statistics/conditional_probability.py
index b0752dc..b659c3b 100644
--- a/mathgenerator/funcs/statistics/conditional_probability.py
+++ b/mathgenerator/funcs/statistics/conditional_probability.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/statistics/confidence_interval.py b/mathgenerator/funcs/statistics/confidence_interval.py
index 03cd145..8137704 100644
--- a/mathgenerator/funcs/statistics/confidence_interval.py
+++ b/mathgenerator/funcs/statistics/confidence_interval.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/mathgenerator/funcs/statistics/data_summary.py b/mathgenerator/funcs/statistics/data_summary.py
index 262e227..6f350af 100644
--- a/mathgenerator/funcs/statistics/data_summary.py
+++ b/mathgenerator/funcs/statistics/data_summary.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/statistics/dice_sum_probability.py b/mathgenerator/funcs/statistics/dice_sum_probability.py
index c213140..f2ecaed 100644
--- a/mathgenerator/funcs/statistics/dice_sum_probability.py
+++ b/mathgenerator/funcs/statistics/dice_sum_probability.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/statistics/mean_median.py b/mathgenerator/funcs/statistics/mean_median.py
index 0bf9e5f..e282709 100644
--- a/mathgenerator/funcs/statistics/mean_median.py
+++ b/mathgenerator/funcs/statistics/mean_median.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 
 
diff --git a/mathgenerator/funcs/statistics/permutation.py b/mathgenerator/funcs/statistics/permutation.py
index 2cbab13..5f374d5 100644
--- a/mathgenerator/funcs/statistics/permutation.py
+++ b/mathgenerator/funcs/statistics/permutation.py
@@ -1,4 +1,4 @@
-from ..__init__ import Generator
+from ...__init__ import Generator
 import random
 import math
 
diff --git a/scripts/adoptGenerator.py b/scripts/adoptGenerator.py
index 59283f3..f05d86a 100644
--- a/scripts/adoptGenerator.py
+++ b/scripts/adoptGenerator.py
@@ -30,7 +30,7 @@ subjects = ['algebra', 'basic_math', 'calculus',
 for subject in subjects:
     full_file_paths = get_filepaths(subject)
     full_file_paths.sort()
-    lines = ["from ...__init__ import *\n", "\n"]
+    lines = []
     for item in full_file_paths:
         if item[:2] != '__':
             lines.append(f"from .{item} import {item}\n")