diff --git a/src/mlpro/bf/math/normalizers/basics.py b/src/mlpro/bf/math/normalizers/basics.py
index e1be9bb5a..88dde747a 100644
--- a/src/mlpro/bf/math/normalizers/basics.py
+++ b/src/mlpro/bf/math/normalizers/basics.py
@@ -129,7 +129,7 @@ def denormalize(self, p_data: Union[Element, np.ndarray]):
 
         elif isinstance(p_data, np.ndarray):
             p_data = np.multiply(p_data, 1 / self._param[0]) + \
-                     (self._param[1] / self._param[0])
+                    (self._param[1] / self._param[0])
             p_data = np.nan_to_num(p_data)
         else:
             raise ParamError('Wrong datatype provided for denormalization')
diff --git a/src/mlpro/oa/streams/tasks/anomalydetectors/__init__.py b/src/mlpro/oa/streams/tasks/anomalydetectors/__init__.py
index c5978a189..d0b9e33b1 100644
--- a/src/mlpro/oa/streams/tasks/anomalydetectors/__init__.py
+++ b/src/mlpro/oa/streams/tasks/anomalydetectors/__init__.py
@@ -1,4 +1,4 @@
 from mlpro.oa.streams.tasks.anomalydetectors.basics import AnomalyDetector
 from mlpro.oa.streams.tasks.anomalydetectors.anomalies import *
-from mlpro.oa.streams.tasks.anomalydetectors.paga_detectors import AnomalyDetectorPAGA
-from mlpro.oa.streams.tasks.anomalydetectors.cb_detectors import *
+from mlpro.oa.streams.tasks.anomalydetectors.instancebased import *
+from mlpro.oa.streams.tasks.anomalydetectors.clusterbased import *
diff --git a/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/__init__.py b/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/__init__.py
index 8cf279a22..d6cf86def 100644
--- a/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/__init__.py
+++ b/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/__init__.py
@@ -1,5 +1,3 @@
 from mlpro.oa.streams.tasks.anomalydetectors.anomalies.basics import Anomaly
-from mlpro.oa.streams.tasks.anomalydetectors.anomalies.point import PointAnomaly
-from mlpro.oa.streams.tasks.anomalydetectors.anomalies.group import GroupAnomaly
-from mlpro.oa.streams.tasks.anomalydetectors.anomalies.contextual import ContextualAnomaly
+from mlpro.oa.streams.tasks.anomalydetectors.anomalies.instancebased import *
 from mlpro.oa.streams.tasks.anomalydetectors.anomalies.clusterbased import *
\ No newline at end of file
diff --git a/src/mlpro/oa/streams/tasks/anomalydetectors/clusterbased/__init__.py b/src/mlpro/oa/streams/tasks/anomalydetectors/clusterbased/__init__.py
index bc88be69d..95ef92665 100644
--- a/src/mlpro/oa/streams/tasks/anomalydetectors/clusterbased/__init__.py
+++ b/src/mlpro/oa/streams/tasks/anomalydetectors/clusterbased/__init__.py
@@ -1,6 +1 @@
-from mlpro.oa.streams.tasks.anomalydetectors.cb_detectors.basics import AnomalyDetectorCB
-from mlpro.oa.streams.tasks.anomalydetectors.cb_detectors.disappearance_detector import ClusterDisappearanceDetector
-from mlpro.oa.streams.tasks.anomalydetectors.cb_detectors.density_change_detector import ClusterDensityChangeDetector
-from mlpro.oa.streams.tasks.anomalydetectors.cb_detectors.geo_size_change_detector import ClusterGeometricSizeChangeDetector
-from mlpro.oa.streams.tasks.anomalydetectors.cb_detectors.new_cluster_detector import NewClusterDetector
-from mlpro.oa.streams.tasks.anomalydetectors.cb_detectors.size_change_detector import ClusterSizeChangeDetector
\ No newline at end of file
+from mlpro.oa.streams.tasks.anomalydetectors.clusterbased.basics import AnomalyDetectorCB
diff --git a/src/mlpro/oa/streams/tasks/anomalydetectors/instancebased/__init__.py b/src/mlpro/oa/streams/tasks/anomalydetectors/instancebased/__init__.py
index e69de29bb..44730f5e1 100644
--- a/src/mlpro/oa/streams/tasks/anomalydetectors/instancebased/__init__.py
+++ b/src/mlpro/oa/streams/tasks/anomalydetectors/instancebased/__init__.py
@@ -0,0 +1 @@
+from mlpro.oa.streams.tasks.anomalydetectors.instancebased.paga_detectors import AnomalyDetectorPAGA
\ No newline at end of file
diff --git a/src/mlpro/oa/streams/tasks/anomalydetectors/paga_detectors.py b/src/mlpro/oa/streams/tasks/anomalydetectors/instancebased/paga_detectors.py
similarity index 100%
rename from src/mlpro/oa/streams/tasks/anomalydetectors/paga_detectors.py
rename to src/mlpro/oa/streams/tasks/anomalydetectors/instancebased/paga_detectors.py