diff --git a/mathgenerator/funcs/algebra/__init__.py b/mathgenerator/funcs/algebra/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/mathgenerator/funcs/basic_algebra.py b/mathgenerator/funcs/algebra/basic_algebra.py
similarity index 100%
rename from mathgenerator/funcs/basic_algebra.py
rename to mathgenerator/funcs/algebra/basic_algebra.py
diff --git a/mathgenerator/funcs/combine_like_terms.py b/mathgenerator/funcs/algebra/combine_like_terms.py
similarity index 100%
rename from mathgenerator/funcs/combine_like_terms.py
rename to mathgenerator/funcs/algebra/combine_like_terms.py
diff --git a/mathgenerator/funcs/complex_quadratic.py b/mathgenerator/funcs/algebra/complex_quadratic.py
similarity index 100%
rename from mathgenerator/funcs/complex_quadratic.py
rename to mathgenerator/funcs/algebra/complex_quadratic.py
diff --git a/mathgenerator/funcs/compound_interest.py b/mathgenerator/funcs/algebra/compound_interest.py
similarity index 100%
rename from mathgenerator/funcs/compound_interest.py
rename to mathgenerator/funcs/algebra/compound_interest.py
diff --git a/mathgenerator/funcs/distance_two_points.py b/mathgenerator/funcs/algebra/distance_two_points.py
similarity index 100%
rename from mathgenerator/funcs/distance_two_points.py
rename to mathgenerator/funcs/algebra/distance_two_points.py
diff --git a/mathgenerator/funcs/expanding.py b/mathgenerator/funcs/algebra/expanding.py
similarity index 100%
rename from mathgenerator/funcs/expanding.py
rename to mathgenerator/funcs/algebra/expanding.py
diff --git a/mathgenerator/funcs/factoring.py b/mathgenerator/funcs/algebra/factoring.py
similarity index 100%
rename from mathgenerator/funcs/factoring.py
rename to mathgenerator/funcs/algebra/factoring.py
diff --git a/mathgenerator/funcs/int_matrix_22_determinant.py b/mathgenerator/funcs/algebra/int_matrix_22_determinant.py
similarity index 100%
rename from mathgenerator/funcs/int_matrix_22_determinant.py
rename to mathgenerator/funcs/algebra/int_matrix_22_determinant.py
diff --git a/mathgenerator/funcs/intersection_of_two_lines.py b/mathgenerator/funcs/algebra/intersection_of_two_lines.py
similarity index 100%
rename from mathgenerator/funcs/intersection_of_two_lines.py
rename to mathgenerator/funcs/algebra/intersection_of_two_lines.py
diff --git a/mathgenerator/funcs/invert_matrix.py b/mathgenerator/funcs/algebra/invert_matrix.py
similarity index 100%
rename from mathgenerator/funcs/invert_matrix.py
rename to mathgenerator/funcs/algebra/invert_matrix.py
diff --git a/mathgenerator/funcs/linear_equations.py b/mathgenerator/funcs/algebra/linear_equations.py
similarity index 100%
rename from mathgenerator/funcs/linear_equations.py
rename to mathgenerator/funcs/algebra/linear_equations.py
diff --git a/mathgenerator/funcs/log.py b/mathgenerator/funcs/algebra/log.py
similarity index 100%
rename from mathgenerator/funcs/log.py
rename to mathgenerator/funcs/algebra/log.py
diff --git a/mathgenerator/funcs/matrix_multiplication.py b/mathgenerator/funcs/algebra/matrix_multiplication.py
similarity index 100%
rename from mathgenerator/funcs/matrix_multiplication.py
rename to mathgenerator/funcs/algebra/matrix_multiplication.py
diff --git a/mathgenerator/funcs/midpoint_of_two_points.py b/mathgenerator/funcs/algebra/midpoint_of_two_points.py
similarity index 100%
rename from mathgenerator/funcs/midpoint_of_two_points.py
rename to mathgenerator/funcs/algebra/midpoint_of_two_points.py
diff --git a/mathgenerator/funcs/multiply_complex_numbers.py b/mathgenerator/funcs/algebra/multiply_complex_numbers.py
similarity index 100%
rename from mathgenerator/funcs/multiply_complex_numbers.py
rename to mathgenerator/funcs/algebra/multiply_complex_numbers.py
diff --git a/mathgenerator/funcs/multiply_int_to_22_matrix.py b/mathgenerator/funcs/algebra/multiply_int_to_22_matrix.py
similarity index 100%
rename from mathgenerator/funcs/multiply_int_to_22_matrix.py
rename to mathgenerator/funcs/algebra/multiply_int_to_22_matrix.py
diff --git a/mathgenerator/funcs/quadratic_equation.py b/mathgenerator/funcs/algebra/quadratic_equation.py
similarity index 100%
rename from mathgenerator/funcs/quadratic_equation.py
rename to mathgenerator/funcs/algebra/quadratic_equation.py
diff --git a/mathgenerator/funcs/simple_interest.py b/mathgenerator/funcs/algebra/simple_interest.py
similarity index 100%
rename from mathgenerator/funcs/simple_interest.py
rename to mathgenerator/funcs/algebra/simple_interest.py
diff --git a/mathgenerator/funcs/system_of_equations.py b/mathgenerator/funcs/algebra/system_of_equations.py
similarity index 100%
rename from mathgenerator/funcs/system_of_equations.py
rename to mathgenerator/funcs/algebra/system_of_equations.py
diff --git a/mathgenerator/funcs/vector_cross.py b/mathgenerator/funcs/algebra/vector_cross.py
similarity index 100%
rename from mathgenerator/funcs/vector_cross.py
rename to mathgenerator/funcs/algebra/vector_cross.py
diff --git a/mathgenerator/funcs/vector_dot.py b/mathgenerator/funcs/algebra/vector_dot.py
similarity index 100%
rename from mathgenerator/funcs/vector_dot.py
rename to mathgenerator/funcs/algebra/vector_dot.py
diff --git a/mathgenerator/funcs/basic_math/__init__.py b/mathgenerator/funcs/basic_math/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/mathgenerator/funcs/absolute_difference.py b/mathgenerator/funcs/basic_math/absolute_difference.py
similarity index 100%
rename from mathgenerator/funcs/absolute_difference.py
rename to mathgenerator/funcs/basic_math/absolute_difference.py
diff --git a/mathgenerator/funcs/addition.py b/mathgenerator/funcs/basic_math/addition.py
similarity index 100%
rename from mathgenerator/funcs/addition.py
rename to mathgenerator/funcs/basic_math/addition.py
diff --git a/mathgenerator/funcs/compare_fractions.py b/mathgenerator/funcs/basic_math/compare_fractions.py
similarity index 100%
rename from mathgenerator/funcs/compare_fractions.py
rename to mathgenerator/funcs/basic_math/compare_fractions.py
diff --git a/mathgenerator/funcs/complex_division.py b/mathgenerator/funcs/basic_math/complex_division.py
similarity index 100%
rename from mathgenerator/funcs/complex_division.py
rename to mathgenerator/funcs/basic_math/complex_division.py
diff --git a/mathgenerator/funcs/cube_root.py b/mathgenerator/funcs/basic_math/cube_root.py
similarity index 100%
rename from mathgenerator/funcs/cube_root.py
rename to mathgenerator/funcs/basic_math/cube_root.py
diff --git a/mathgenerator/funcs/divide_fractions.py b/mathgenerator/funcs/basic_math/divide_fractions.py
similarity index 100%
rename from mathgenerator/funcs/divide_fractions.py
rename to mathgenerator/funcs/basic_math/divide_fractions.py
diff --git a/mathgenerator/funcs/division.py b/mathgenerator/funcs/basic_math/division.py
similarity index 100%
rename from mathgenerator/funcs/division.py
rename to mathgenerator/funcs/basic_math/division.py
diff --git a/mathgenerator/funcs/exponentiation.py b/mathgenerator/funcs/basic_math/exponentiation.py
similarity index 100%
rename from mathgenerator/funcs/exponentiation.py
rename to mathgenerator/funcs/basic_math/exponentiation.py
diff --git a/mathgenerator/funcs/factorial.py b/mathgenerator/funcs/basic_math/factorial.py
similarity index 100%
rename from mathgenerator/funcs/factorial.py
rename to mathgenerator/funcs/basic_math/factorial.py
diff --git a/mathgenerator/funcs/fraction_multiplication.py b/mathgenerator/funcs/basic_math/fraction_multiplication.py
similarity index 100%
rename from mathgenerator/funcs/fraction_multiplication.py
rename to mathgenerator/funcs/basic_math/fraction_multiplication.py
diff --git a/mathgenerator/funcs/is_prime.py b/mathgenerator/funcs/basic_math/is_prime.py
similarity index 100%
rename from mathgenerator/funcs/is_prime.py
rename to mathgenerator/funcs/basic_math/is_prime.py
diff --git a/mathgenerator/funcs/multiplication.py b/mathgenerator/funcs/basic_math/multiplication.py
similarity index 100%
rename from mathgenerator/funcs/multiplication.py
rename to mathgenerator/funcs/basic_math/multiplication.py
diff --git a/mathgenerator/funcs/percentage.py b/mathgenerator/funcs/basic_math/percentage.py
similarity index 100%
rename from mathgenerator/funcs/percentage.py
rename to mathgenerator/funcs/basic_math/percentage.py
diff --git a/mathgenerator/funcs/power_of_powers.py b/mathgenerator/funcs/basic_math/power_of_powers.py
similarity index 100%
rename from mathgenerator/funcs/power_of_powers.py
rename to mathgenerator/funcs/basic_math/power_of_powers.py
diff --git a/mathgenerator/funcs/square.py b/mathgenerator/funcs/basic_math/square.py
similarity index 100%
rename from mathgenerator/funcs/square.py
rename to mathgenerator/funcs/basic_math/square.py
diff --git a/mathgenerator/funcs/square_root.py b/mathgenerator/funcs/basic_math/square_root.py
similarity index 100%
rename from mathgenerator/funcs/square_root.py
rename to mathgenerator/funcs/basic_math/square_root.py
diff --git a/mathgenerator/funcs/subtraction.py b/mathgenerator/funcs/basic_math/subtraction.py
similarity index 100%
rename from mathgenerator/funcs/subtraction.py
rename to mathgenerator/funcs/basic_math/subtraction.py
diff --git a/mathgenerator/funcs/calculus/__init__.py b/mathgenerator/funcs/calculus/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/mathgenerator/funcs/definite_integral.py b/mathgenerator/funcs/calculus/definite_integral.py
similarity index 100%
rename from mathgenerator/funcs/definite_integral.py
rename to mathgenerator/funcs/calculus/definite_integral.py
diff --git a/mathgenerator/funcs/differentiation.py b/mathgenerator/funcs/calculus/differentiation.py
similarity index 100%
rename from mathgenerator/funcs/differentiation.py
rename to mathgenerator/funcs/calculus/differentiation.py
diff --git a/mathgenerator/funcs/power_rule_differentiation.py b/mathgenerator/funcs/calculus/power_rule_differentiation.py
similarity index 100%
rename from mathgenerator/funcs/power_rule_differentiation.py
rename to mathgenerator/funcs/calculus/power_rule_differentiation.py
diff --git a/mathgenerator/funcs/power_rule_integration.py b/mathgenerator/funcs/calculus/power_rule_integration.py
similarity index 100%
rename from mathgenerator/funcs/power_rule_integration.py
rename to mathgenerator/funcs/calculus/power_rule_integration.py
diff --git a/mathgenerator/funcs/stationary_points.py b/mathgenerator/funcs/calculus/stationary_points.py
similarity index 100%
rename from mathgenerator/funcs/stationary_points.py
rename to mathgenerator/funcs/calculus/stationary_points.py
diff --git a/mathgenerator/funcs/computer_science/__init__.py b/mathgenerator/funcs/computer_science/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/mathgenerator/funcs/bcd_to_decimal.py b/mathgenerator/funcs/computer_science/bcd_to_decimal.py
similarity index 100%
rename from mathgenerator/funcs/bcd_to_decimal.py
rename to mathgenerator/funcs/computer_science/bcd_to_decimal.py
diff --git a/mathgenerator/funcs/binary_2s_complement.py b/mathgenerator/funcs/computer_science/binary_2s_complement.py
similarity index 100%
rename from mathgenerator/funcs/binary_2s_complement.py
rename to mathgenerator/funcs/computer_science/binary_2s_complement.py
diff --git a/mathgenerator/funcs/binary_complement_1s.py b/mathgenerator/funcs/computer_science/binary_complement_1s.py
similarity index 100%
rename from mathgenerator/funcs/binary_complement_1s.py
rename to mathgenerator/funcs/computer_science/binary_complement_1s.py
diff --git a/mathgenerator/funcs/binary_to_decimal.py b/mathgenerator/funcs/computer_science/binary_to_decimal.py
similarity index 100%
rename from mathgenerator/funcs/binary_to_decimal.py
rename to mathgenerator/funcs/computer_science/binary_to_decimal.py
diff --git a/mathgenerator/funcs/binary_to_hex.py b/mathgenerator/funcs/computer_science/binary_to_hex.py
similarity index 100%
rename from mathgenerator/funcs/binary_to_hex.py
rename to mathgenerator/funcs/computer_science/binary_to_hex.py
diff --git a/mathgenerator/funcs/decimal_to_bcd.py b/mathgenerator/funcs/computer_science/decimal_to_bcd.py
similarity index 100%
rename from mathgenerator/funcs/decimal_to_bcd.py
rename to mathgenerator/funcs/computer_science/decimal_to_bcd.py
diff --git a/mathgenerator/funcs/decimal_to_binary.py b/mathgenerator/funcs/computer_science/decimal_to_binary.py
similarity index 100%
rename from mathgenerator/funcs/decimal_to_binary.py
rename to mathgenerator/funcs/computer_science/decimal_to_binary.py
diff --git a/mathgenerator/funcs/decimal_to_hexadeci.py b/mathgenerator/funcs/computer_science/decimal_to_hexadeci.py
similarity index 100%
rename from mathgenerator/funcs/decimal_to_hexadeci.py
rename to mathgenerator/funcs/computer_science/decimal_to_hexadeci.py
diff --git a/mathgenerator/funcs/decimal_to_octal.py b/mathgenerator/funcs/computer_science/decimal_to_octal.py
similarity index 100%
rename from mathgenerator/funcs/decimal_to_octal.py
rename to mathgenerator/funcs/computer_science/decimal_to_octal.py
diff --git a/mathgenerator/funcs/fibonacci_series.py b/mathgenerator/funcs/computer_science/fibonacci_series.py
similarity index 100%
rename from mathgenerator/funcs/fibonacci_series.py
rename to mathgenerator/funcs/computer_science/fibonacci_series.py
diff --git a/mathgenerator/funcs/modulo_division.py b/mathgenerator/funcs/computer_science/modulo_division.py
similarity index 100%
rename from mathgenerator/funcs/modulo_division.py
rename to mathgenerator/funcs/computer_science/modulo_division.py
diff --git a/mathgenerator/funcs/nth_fibonacci_number.py b/mathgenerator/funcs/computer_science/nth_fibonacci_number.py
similarity index 100%
rename from mathgenerator/funcs/nth_fibonacci_number.py
rename to mathgenerator/funcs/computer_science/nth_fibonacci_number.py
diff --git a/mathgenerator/funcs/geometry/__init__.py b/mathgenerator/funcs/geometry/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/mathgenerator/funcs/angle_btw_vectors.py b/mathgenerator/funcs/geometry/angle_btw_vectors.py
similarity index 100%
rename from mathgenerator/funcs/angle_btw_vectors.py
rename to mathgenerator/funcs/geometry/angle_btw_vectors.py
diff --git a/mathgenerator/funcs/angle_regular_polygon.py b/mathgenerator/funcs/geometry/angle_regular_polygon.py
similarity index 100%
rename from mathgenerator/funcs/angle_regular_polygon.py
rename to mathgenerator/funcs/geometry/angle_regular_polygon.py
diff --git a/mathgenerator/funcs/arc_length.py b/mathgenerator/funcs/geometry/arc_length.py
similarity index 100%
rename from mathgenerator/funcs/arc_length.py
rename to mathgenerator/funcs/geometry/arc_length.py
diff --git a/mathgenerator/funcs/area_of_circle.py b/mathgenerator/funcs/geometry/area_of_circle.py
similarity index 100%
rename from mathgenerator/funcs/area_of_circle.py
rename to mathgenerator/funcs/geometry/area_of_circle.py
diff --git a/mathgenerator/funcs/area_of_triangle.py b/mathgenerator/funcs/geometry/area_of_triangle.py
similarity index 100%
rename from mathgenerator/funcs/area_of_triangle.py
rename to mathgenerator/funcs/geometry/area_of_triangle.py
diff --git a/mathgenerator/funcs/basic_trigonometry.py b/mathgenerator/funcs/geometry/basic_trigonometry.py
similarity index 100%
rename from mathgenerator/funcs/basic_trigonometry.py
rename to mathgenerator/funcs/geometry/basic_trigonometry.py
diff --git a/mathgenerator/funcs/circumference.py b/mathgenerator/funcs/geometry/circumference.py
similarity index 100%
rename from mathgenerator/funcs/circumference.py
rename to mathgenerator/funcs/geometry/circumference.py
diff --git a/mathgenerator/funcs/curved_surface_area_cylinder.py b/mathgenerator/funcs/geometry/curved_surface_area_cylinder.py
similarity index 100%
rename from mathgenerator/funcs/curved_surface_area_cylinder.py
rename to mathgenerator/funcs/geometry/curved_surface_area_cylinder.py
diff --git a/mathgenerator/funcs/degree_to_rad.py b/mathgenerator/funcs/geometry/degree_to_rad.py
similarity index 100%
rename from mathgenerator/funcs/degree_to_rad.py
rename to mathgenerator/funcs/geometry/degree_to_rad.py
diff --git a/mathgenerator/funcs/fourth_angle_of_quadrilateral.py b/mathgenerator/funcs/geometry/fourth_angle_of_quadrilateral.py
similarity index 100%
rename from mathgenerator/funcs/fourth_angle_of_quadrilateral.py
rename to mathgenerator/funcs/geometry/fourth_angle_of_quadrilateral.py
diff --git a/mathgenerator/funcs/perimeter_of_polygons.py b/mathgenerator/funcs/geometry/perimeter_of_polygons.py
similarity index 100%
rename from mathgenerator/funcs/perimeter_of_polygons.py
rename to mathgenerator/funcs/geometry/perimeter_of_polygons.py
diff --git a/mathgenerator/funcs/pythagorean_theorem.py b/mathgenerator/funcs/geometry/pythagorean_theorem.py
similarity index 100%
rename from mathgenerator/funcs/pythagorean_theorem.py
rename to mathgenerator/funcs/geometry/pythagorean_theorem.py
diff --git a/mathgenerator/funcs/radian_to_deg.py b/mathgenerator/funcs/geometry/radian_to_deg.py
similarity index 100%
rename from mathgenerator/funcs/radian_to_deg.py
rename to mathgenerator/funcs/geometry/radian_to_deg.py
diff --git a/mathgenerator/funcs/sector_area.py b/mathgenerator/funcs/geometry/sector_area.py
similarity index 100%
rename from mathgenerator/funcs/sector_area.py
rename to mathgenerator/funcs/geometry/sector_area.py
diff --git a/mathgenerator/funcs/sum_of_polygon_angles.py b/mathgenerator/funcs/geometry/sum_of_polygon_angles.py
similarity index 100%
rename from mathgenerator/funcs/sum_of_polygon_angles.py
rename to mathgenerator/funcs/geometry/sum_of_polygon_angles.py
diff --git a/mathgenerator/funcs/surface_area_cone.py b/mathgenerator/funcs/geometry/surface_area_cone.py
similarity index 100%
rename from mathgenerator/funcs/surface_area_cone.py
rename to mathgenerator/funcs/geometry/surface_area_cone.py
diff --git a/mathgenerator/funcs/surface_area_cube.py b/mathgenerator/funcs/geometry/surface_area_cube.py
similarity index 100%
rename from mathgenerator/funcs/surface_area_cube.py
rename to mathgenerator/funcs/geometry/surface_area_cube.py
diff --git a/mathgenerator/funcs/surface_area_cuboid.py b/mathgenerator/funcs/geometry/surface_area_cuboid.py
similarity index 100%
rename from mathgenerator/funcs/surface_area_cuboid.py
rename to mathgenerator/funcs/geometry/surface_area_cuboid.py
diff --git a/mathgenerator/funcs/surface_area_cylinder.py b/mathgenerator/funcs/geometry/surface_area_cylinder.py
similarity index 100%
rename from mathgenerator/funcs/surface_area_cylinder.py
rename to mathgenerator/funcs/geometry/surface_area_cylinder.py
diff --git a/mathgenerator/funcs/surface_area_sphere.py b/mathgenerator/funcs/geometry/surface_area_sphere.py
similarity index 100%
rename from mathgenerator/funcs/surface_area_sphere.py
rename to mathgenerator/funcs/geometry/surface_area_sphere.py
diff --git a/mathgenerator/funcs/third_angle_of_triangle.py b/mathgenerator/funcs/geometry/third_angle_of_triangle.py
similarity index 100%
rename from mathgenerator/funcs/third_angle_of_triangle.py
rename to mathgenerator/funcs/geometry/third_angle_of_triangle.py
diff --git a/mathgenerator/funcs/valid_triangle.py b/mathgenerator/funcs/geometry/valid_triangle.py
similarity index 100%
rename from mathgenerator/funcs/valid_triangle.py
rename to mathgenerator/funcs/geometry/valid_triangle.py
diff --git a/mathgenerator/funcs/volume_cone.py b/mathgenerator/funcs/geometry/volume_cone.py
similarity index 100%
rename from mathgenerator/funcs/volume_cone.py
rename to mathgenerator/funcs/geometry/volume_cone.py
diff --git a/mathgenerator/funcs/volume_cube.py b/mathgenerator/funcs/geometry/volume_cube.py
similarity index 100%
rename from mathgenerator/funcs/volume_cube.py
rename to mathgenerator/funcs/geometry/volume_cube.py
diff --git a/mathgenerator/funcs/volume_cuboid.py b/mathgenerator/funcs/geometry/volume_cuboid.py
similarity index 100%
rename from mathgenerator/funcs/volume_cuboid.py
rename to mathgenerator/funcs/geometry/volume_cuboid.py
diff --git a/mathgenerator/funcs/volume_cylinder.py b/mathgenerator/funcs/geometry/volume_cylinder.py
similarity index 100%
rename from mathgenerator/funcs/volume_cylinder.py
rename to mathgenerator/funcs/geometry/volume_cylinder.py
diff --git a/mathgenerator/funcs/volume_sphere.py b/mathgenerator/funcs/geometry/volume_sphere.py
similarity index 100%
rename from mathgenerator/funcs/volume_sphere.py
rename to mathgenerator/funcs/geometry/volume_sphere.py
diff --git a/mathgenerator/funcs/misc/__init__.py b/mathgenerator/funcs/misc/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/mathgenerator/funcs/arithmetic_progression_sum.py b/mathgenerator/funcs/misc/arithmetic_progression_sum.py
similarity index 100%
rename from mathgenerator/funcs/arithmetic_progression_sum.py
rename to mathgenerator/funcs/misc/arithmetic_progression_sum.py
diff --git a/mathgenerator/funcs/arithmetic_progression_term.py b/mathgenerator/funcs/misc/arithmetic_progression_term.py
similarity index 100%
rename from mathgenerator/funcs/arithmetic_progression_term.py
rename to mathgenerator/funcs/misc/arithmetic_progression_term.py
diff --git a/mathgenerator/funcs/base_conversion.py b/mathgenerator/funcs/misc/base_conversion.py
similarity index 100%
rename from mathgenerator/funcs/base_conversion.py
rename to mathgenerator/funcs/misc/base_conversion.py
diff --git a/mathgenerator/funcs/binomial_distribution.py b/mathgenerator/funcs/misc/binomial_distribution.py
similarity index 100%
rename from mathgenerator/funcs/binomial_distribution.py
rename to mathgenerator/funcs/misc/binomial_distribution.py
diff --git a/mathgenerator/funcs/celsius_to_fahrenheit.py b/mathgenerator/funcs/misc/celsius_to_fahrenheit.py
similarity index 100%
rename from mathgenerator/funcs/celsius_to_fahrenheit.py
rename to mathgenerator/funcs/misc/celsius_to_fahrenheit.py
diff --git a/mathgenerator/funcs/common_factors.py b/mathgenerator/funcs/misc/common_factors.py
similarity index 100%
rename from mathgenerator/funcs/common_factors.py
rename to mathgenerator/funcs/misc/common_factors.py
diff --git a/mathgenerator/funcs/complex_to_polar.py b/mathgenerator/funcs/misc/complex_to_polar.py
similarity index 100%
rename from mathgenerator/funcs/complex_to_polar.py
rename to mathgenerator/funcs/misc/complex_to_polar.py
diff --git a/mathgenerator/funcs/decimal_to_roman_numerals.py b/mathgenerator/funcs/misc/decimal_to_roman_numerals.py
similarity index 100%
rename from mathgenerator/funcs/decimal_to_roman_numerals.py
rename to mathgenerator/funcs/misc/decimal_to_roman_numerals.py
diff --git a/mathgenerator/funcs/euclidian_norm.py b/mathgenerator/funcs/misc/euclidian_norm.py
similarity index 100%
rename from mathgenerator/funcs/euclidian_norm.py
rename to mathgenerator/funcs/misc/euclidian_norm.py
diff --git a/mathgenerator/funcs/gcd.py b/mathgenerator/funcs/misc/gcd.py
similarity index 100%
rename from mathgenerator/funcs/gcd.py
rename to mathgenerator/funcs/misc/gcd.py
diff --git a/mathgenerator/funcs/geometric_mean.py b/mathgenerator/funcs/misc/geometric_mean.py
similarity index 100%
rename from mathgenerator/funcs/geometric_mean.py
rename to mathgenerator/funcs/misc/geometric_mean.py
diff --git a/mathgenerator/funcs/geometric_progression.py b/mathgenerator/funcs/misc/geometric_progression.py
similarity index 100%
rename from mathgenerator/funcs/geometric_progression.py
rename to mathgenerator/funcs/misc/geometric_progression.py
diff --git a/mathgenerator/funcs/harmonic_mean.py b/mathgenerator/funcs/misc/harmonic_mean.py
similarity index 100%
rename from mathgenerator/funcs/harmonic_mean.py
rename to mathgenerator/funcs/misc/harmonic_mean.py
diff --git a/mathgenerator/funcs/hcf.py b/mathgenerator/funcs/misc/hcf.py
similarity index 100%
rename from mathgenerator/funcs/hcf.py
rename to mathgenerator/funcs/misc/hcf.py
diff --git a/mathgenerator/funcs/is_leap_year.py b/mathgenerator/funcs/misc/is_leap_year.py
similarity index 100%
rename from mathgenerator/funcs/is_leap_year.py
rename to mathgenerator/funcs/misc/is_leap_year.py
diff --git a/mathgenerator/funcs/lcm.py b/mathgenerator/funcs/misc/lcm.py
similarity index 100%
rename from mathgenerator/funcs/lcm.py
rename to mathgenerator/funcs/misc/lcm.py
diff --git a/mathgenerator/funcs/minutes_to_hours.py b/mathgenerator/funcs/misc/minutes_to_hours.py
similarity index 100%
rename from mathgenerator/funcs/minutes_to_hours.py
rename to mathgenerator/funcs/misc/minutes_to_hours.py
diff --git a/mathgenerator/funcs/prime_factors.py b/mathgenerator/funcs/misc/prime_factors.py
similarity index 100%
rename from mathgenerator/funcs/prime_factors.py
rename to mathgenerator/funcs/misc/prime_factors.py
diff --git a/mathgenerator/funcs/profit_loss_percent.py b/mathgenerator/funcs/misc/profit_loss_percent.py
similarity index 100%
rename from mathgenerator/funcs/profit_loss_percent.py
rename to mathgenerator/funcs/misc/profit_loss_percent.py
diff --git a/mathgenerator/funcs/quotient_of_power_same_base.py b/mathgenerator/funcs/misc/quotient_of_power_same_base.py
similarity index 100%
rename from mathgenerator/funcs/quotient_of_power_same_base.py
rename to mathgenerator/funcs/misc/quotient_of_power_same_base.py
diff --git a/mathgenerator/funcs/quotient_of_power_same_power.py b/mathgenerator/funcs/misc/quotient_of_power_same_power.py
similarity index 100%
rename from mathgenerator/funcs/quotient_of_power_same_power.py
rename to mathgenerator/funcs/misc/quotient_of_power_same_power.py
diff --git a/mathgenerator/funcs/set_operation.py b/mathgenerator/funcs/misc/set_operation.py
similarity index 100%
rename from mathgenerator/funcs/set_operation.py
rename to mathgenerator/funcs/misc/set_operation.py
diff --git a/mathgenerator/funcs/signum_function.py b/mathgenerator/funcs/misc/signum_function.py
similarity index 100%
rename from mathgenerator/funcs/signum_function.py
rename to mathgenerator/funcs/misc/signum_function.py
diff --git a/mathgenerator/funcs/surds_comparison.py b/mathgenerator/funcs/misc/surds_comparison.py
similarity index 100%
rename from mathgenerator/funcs/surds_comparison.py
rename to mathgenerator/funcs/misc/surds_comparison.py
diff --git a/mathgenerator/funcs/statistics/__init__.py b/mathgenerator/funcs/statistics/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/mathgenerator/funcs/combinations.py b/mathgenerator/funcs/statistics/combinations.py
similarity index 100%
rename from mathgenerator/funcs/combinations.py
rename to mathgenerator/funcs/statistics/combinations.py
diff --git a/mathgenerator/funcs/conditional_probability.py b/mathgenerator/funcs/statistics/conditional_probability.py
similarity index 100%
rename from mathgenerator/funcs/conditional_probability.py
rename to mathgenerator/funcs/statistics/conditional_probability.py
diff --git a/mathgenerator/funcs/confidence_interval.py b/mathgenerator/funcs/statistics/confidence_interval.py
similarity index 100%
rename from mathgenerator/funcs/confidence_interval.py
rename to mathgenerator/funcs/statistics/confidence_interval.py
diff --git a/mathgenerator/funcs/data_summary.py b/mathgenerator/funcs/statistics/data_summary.py
similarity index 100%
rename from mathgenerator/funcs/data_summary.py
rename to mathgenerator/funcs/statistics/data_summary.py
diff --git a/mathgenerator/funcs/dice_sum_probability.py b/mathgenerator/funcs/statistics/dice_sum_probability.py
similarity index 100%
rename from mathgenerator/funcs/dice_sum_probability.py
rename to mathgenerator/funcs/statistics/dice_sum_probability.py
diff --git a/mathgenerator/funcs/mean_median.py b/mathgenerator/funcs/statistics/mean_median.py
similarity index 100%
rename from mathgenerator/funcs/mean_median.py
rename to mathgenerator/funcs/statistics/mean_median.py
diff --git a/mathgenerator/funcs/permutation.py b/mathgenerator/funcs/statistics/permutation.py
similarity index 100%
rename from mathgenerator/funcs/permutation.py
rename to mathgenerator/funcs/statistics/permutation.py