refactor

README.md

@@ -292,7 +292,7 @@ pip install geneticalgorithm2[full]
 - `AlgorithmParams` class for base GA algorithm parameters (instead of dictionary)
 - `Generation` class for saving/loading/returning generation (instead of dictionary)
 
-All that classes are collected [in file](geneticalgorithm2/classes.py). To maintain backward compatibility, `AlgorithmParams` and `Generation` classes have dictionary-like interface for getting fields: u can use `object.field` or `object['field']` notations.
+All that classes are collected [in file](geneticalgorithm2/data_types/classes.py). To maintain backward compatibility, `AlgorithmParams` and `Generation` classes have dictionary-like interface for getting fields: u can use `object.field` or `object['field']` notations.
 
 
 # Working process

geneticalgorithm2/__init__.py

@@ -1,7 +1,3 @@
-
-from typing_extensions import TypeAlias
-
-from .classes import Generation, AlgorithmParams
 """
 Genetic Algorithm (Elitist version) for Python3.8+
 
@@ -12,6 +8,12 @@
 code docs path:  https://pasaopasen.github.io/geneticalgorithm2/
 """
 
+
+from typing_extensions import TypeAlias
+
+from .data_types.algorithm_params import AlgorithmParams
+from .data_types.generation import Generation
+
 from .geneticalgorithm2 import GeneticAlgorithm2
 
 # to keep backward compatibility like it was since geneticalgorithm package

geneticalgorithm2/callbacks.py

@@ -12,13 +12,14 @@
 from .utils.files import mkdir
 from .utils.funcs import union_to_matrix, fast_max
 
-from .classes import MiddleCallbackData, Generation
-
+from .data_types.generation import Generation
+from .data_types.callback import MiddleCallbackData
 
 from .crossovers import CrossoverFunc
 from .selections import SelectionFunc
 from .mutations import MutationFunc
 
+# TODO refactor
 
 CallbackFunc: TypeAlias = Callable[[int, List[float], array2D, array1D], None]
 MiddleCallbackActionFunc: TypeAlias = Callable[[MiddleCallbackData], MiddleCallbackData]