diff --git a/tods/utils/ABOD_main.py b/tods/utils/ABOD_main.py
index 8050958..ccba04a 100644
--- a/tods/utils/ABOD_main.py
+++ b/tods/utils/ABOD_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.ABOD_skinterface import ABODSKI
+from skinterface.primitiveSKI.detection_algorithm.ABOD_skinterface import ABODSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/AutoEncoder_main.py b/tods/utils/AutoEncoder_main.py
index a4faef2..92e9652 100644
--- a/tods/utils/AutoEncoder_main.py
+++ b/tods/utils/AutoEncoder_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.AutoEncoder_skinterface import AutoEncoderSKI
+from skinterface.primitiveSKI.detection_algorithm.AutoEncoder_skinterface import AutoEncoderSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/AutoRegODetectAPI.py b/tods/utils/AutoRegODetectAPI.py
deleted file mode 100644
index adc0e62..0000000
--- a/tods/utils/AutoRegODetectAPI.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import numpy as np
-from test_interface import SKInterface
-from tods.detection_algorithm.AutoRegODetect import AutoRegODetectorPrimitive
-
-class AutoRegODetect(SKInterface):
-    def __init__(self, **hyperparams):
-        super().__init__(primitive=AutoRegODetectorPrimitive, **hyperparams)
-
-    
-
-
-if __name__ == '__main__':
-    X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
-    X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
-
-    transformer = AutoRegODetect(contamination=0.2, window_size=2)#use_column=(1,)
-    transformer.fit(X_train)
-    prediction_labels = transformer.produce(X_test)
-    prediction_score = transformer.produce_score(X_test)
-
-    print("Prediction Labels\n", prediction_labels)
-    print("Prediction Score\n", prediction_score)
-
diff --git a/tods/utils/AutoRegODetector_main.py b/tods/utils/AutoRegODetector_main.py
index f845387..cab9fb5 100644
--- a/tods/utils/AutoRegODetector_main.py
+++ b/tods/utils/AutoRegODetector_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.AutoRegODetector_skinterface import AutoRegODetectorSKI
+from skinterface.primitiveSKI.detection_algorithm.AutoRegODetector_skinterface import AutoRegODetectorSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/CBLOF_main.py b/tods/utils/CBLOF_main.py
index bfcba07..f36eaf2 100644
--- a/tods/utils/CBLOF_main.py
+++ b/tods/utils/CBLOF_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.CBLOF_skinterface import CBLOFSKI
+from skinterface.primitiveSKI.detection_algorithm.CBLOF_skinterface import CBLOFSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/COF_main.py b/tods/utils/COF_main.py
index 3b47094..9bd34f7 100644
--- a/tods/utils/COF_main.py
+++ b/tods/utils/COF_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.COF_skinterface import COFSKI
+from skinterface.primitiveSKI.detection_algorithm.COF_skinterface import COFSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/DeepLog_main.py b/tods/utils/DeepLog_main.py
index d95a950..6260e40 100644
--- a/tods/utils/DeepLog_main.py
+++ b/tods/utils/DeepLog_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.DeepLog_skinterface import DeepLogSKI
+from skinterface.primitiveSKI.detection_algorithm.DeepLog_skinterface import DeepLogSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/Ensemble_main.py b/tods/utils/Ensemble_main.py
index ee8f93c..7d3bf75 100644
--- a/tods/utils/Ensemble_main.py
+++ b/tods/utils/Ensemble_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.Ensemble_skinterface import EnsembleSKI
+from skinterface.primitiveSKI.detection_algorithm.Ensemble_skinterface import EnsembleSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/HBOS_main.py b/tods/utils/HBOS_main.py
index 509d866..afb575c 100644
--- a/tods/utils/HBOS_main.py
+++ b/tods/utils/HBOS_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.HBOS_skinterface import HBOSSKI
+from skinterface.primitiveSKI.detection_algorithm.HBOS_skinterface import HBOSSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/IsolationForest_main.py b/tods/utils/IsolationForest_main.py
index 4c6844a..40dc23b 100644
--- a/tods/utils/IsolationForest_main.py
+++ b/tods/utils/IsolationForest_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.IsolationForest_skinterface import IsolationForestSKI
+from skinterface.primitiveSKI.detection_algorithm.IsolationForest_skinterface import IsolationForestSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/KDiscordODetector_main.py b/tods/utils/KDiscordODetector_main.py
index b474f7c..098d960 100644
--- a/tods/utils/KDiscordODetector_main.py
+++ b/tods/utils/KDiscordODetector_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.KDiscordODetector_skinterface import KDiscordODetectorSKI
+from skinterface.primitiveSKI.detection_algorithm.KDiscordODetector_skinterface import KDiscordODetectorSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/KNN_main.py b/tods/utils/KNN_main.py
index f17d31e..ab09833 100644
--- a/tods/utils/KNN_main.py
+++ b/tods/utils/KNN_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.KNN_skinterface import KNNSKI
+from skinterface.primitiveSKI.detection_algorithm.KNN_skinterface import KNNSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/LODA_main.py b/tods/utils/LODA_main.py
index 01f66b9..31f0651 100644
--- a/tods/utils/LODA_main.py
+++ b/tods/utils/LODA_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.LODA_skinterface import LODASKI
+from skinterface.primitiveSKI.detection_algorithm.LODA_skinterface import LODASKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/LOF_main.py b/tods/utils/LOF_main.py
index dd77d8e..d6a9bcb 100644
--- a/tods/utils/LOF_main.py
+++ b/tods/utils/LOF_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.LOF_skinterface import LOFSKI
+from skinterface.primitiveSKI.detection_algorithm.LOF_skinterface import LOFSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/LSTMODetector_main.py b/tods/utils/LSTMODetector_main.py
index 7f0d08b..87dd4c8 100644
--- a/tods/utils/LSTMODetector_main.py
+++ b/tods/utils/LSTMODetector_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.LSTMODetector_skinterface import LSTMODetectorSKI
+from skinterface.primitiveSKI.detection_algorithm.LSTMODetector_skinterface import LSTMODetectorSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/MatrixProfile_main.py b/tods/utils/MatrixProfile_main.py
index a6cab14..93816f6 100644
--- a/tods/utils/MatrixProfile_main.py
+++ b/tods/utils/MatrixProfile_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.MatrixProfile_skinterface import MatrixProfileSKI
+from skinterface.primitiveSKI.detection_algorithm.MatrixProfile_skinterface import MatrixProfileSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/Mo_Gaal_main.py b/tods/utils/Mo_Gaal_main.py
index 6b8c7b8..b8238ca 100644
--- a/tods/utils/Mo_Gaal_main.py
+++ b/tods/utils/Mo_Gaal_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.Mo_Gaal_skinterface import Mo_GaalSKI
+from skinterface.primitiveSKI.detection_algorithm.Mo_Gaal_skinterface import Mo_GaalSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/OCSVM_main.py b/tods/utils/OCSVM_main.py
index 67db169..711efc6 100644
--- a/tods/utils/OCSVM_main.py
+++ b/tods/utils/OCSVM_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.OCSVM_skinterface import OCSVMSKI
+from skinterface.primitiveSKI.detection_algorithm.OCSVM_skinterface import OCSVMSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/PCAODetector_main.py b/tods/utils/PCAODetector_main.py
index aec212e..4cb4ba2 100644
--- a/tods/utils/PCAODetector_main.py
+++ b/tods/utils/PCAODetector_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.PCAODetector_skinterface import PCAODetectorSKI
+from skinterface.primitiveSKI.detection_algorithm.PCAODetector_skinterface import PCAODetectorSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/SOD_main.py b/tods/utils/SOD_main.py
index 3d68f87..f0402af 100644
--- a/tods/utils/SOD_main.py
+++ b/tods/utils/SOD_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.SOD_skinterface import SODSKI
+from skinterface.primitiveSKI.detection_algorithm.SOD_skinterface import SODSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/So_Gaal_main.py b/tods/utils/So_Gaal_main.py
index edc48da..daa1cbf 100644
--- a/tods/utils/So_Gaal_main.py
+++ b/tods/utils/So_Gaal_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.So_Gaal_skinterface import So_GaalSKI
+from skinterface.primitiveSKI.detection_algorithm.So_Gaal_skinterface import So_GaalSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/SystemWiseDetection_main.py b/tods/utils/SystemWiseDetection_main.py
index e33518a..87e54b0 100644
--- a/tods/utils/SystemWiseDetection_main.py
+++ b/tods/utils/SystemWiseDetection_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.SystemWiseDetection_skinterface import SystemWiseDetectionSKI
+from skinterface.primitiveSKI.detection_algorithm.SystemWiseDetection_skinterface import SystemWiseDetectionSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/Telemanom_main.py b/tods/utils/Telemanom_main.py
index 42c90d3..d5e0c2f 100644
--- a/tods/utils/Telemanom_main.py
+++ b/tods/utils/Telemanom_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.Telemanom_skinterface import TelemanomSKI
+from skinterface.primitiveSKI.detection_algorithm.Telemanom_skinterface import TelemanomSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/VariationalAutoEncoder_main.py b/tods/utils/VariationalAutoEncoder_main.py
index 6efa26d..8928290 100644
--- a/tods/utils/VariationalAutoEncoder_main.py
+++ b/tods/utils/VariationalAutoEncoder_main.py
@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.VariationalAutoEncoder_skinterface import VariationalAutoEncoderSKI
+from skinterface.primitiveSKI.detection_algorithm.VariationalAutoEncoder_skinterface import VariationalAutoEncoderSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
diff --git a/tods/utils/skinterface/main_generation.py b/tods/utils/skinterface/main_generation.py
index 9130916..a146f09 100644
--- a/tods/utils/skinterface/main_generation.py
+++ b/tods/utils/skinterface/main_generation.py
@@ -30,7 +30,7 @@ for primitive_index, primitive_start_loc in enumerate(primitive_start_loc_buf):
 # sys.path.insert(0, 'tods/utils')"""
     import_line1 = 'import numpy as np' 
 
-    import_line2 = '\nfrom skinterface.primitiveSKI.'+ primitve_api_name + ' import ' + class_name + '\n\n'
+    import_line2 = '\nfrom skinterface.primitiveSKI.detection_algorithm.'+ primitve_api_name + ' import ' + class_name + '\n\n'
     #print(import_line)
 
     main_line1 = """X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
diff --git a/tods/utils/skinterface/primitiveSKI/AutoCorrelation_skinterface.py b/tods/utils/skinterface/primitiveSKI/AutoCorrelation_skinterface.py
deleted file mode 100644
index 451f1c2..0000000
--- a/tods/utils/skinterface/primitiveSKI/AutoCorrelation_skinterface.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import numpy as np 
-from .Base_skinterface import BaseSKI
-from tods.feature_analysis.AutoCorrelation import AutoCorrelationPrimitive
-
-class AutoCorrelationSKI(BaseSKI):
-	def __init__(self, **hyperparams):
-		super().__init__(primitive=AutoCorrelationPrimitive, **hyperparams)
-
diff --git a/tods/utils/skinterface/primitiveSKI/__init__.py b/tods/utils/skinterface/primitiveSKI/__init__.py
deleted file mode 100644
index cbc6184..0000000
--- a/tods/utils/skinterface/primitiveSKI/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# from primitiveSKI.ABOD_skinterface import ABODSKI 
-# from primitiveSKI.AutoRegODetector_skinterface import AutoRegODetectorSKI
-#from ABOD_skinterface import ABODSKI 
-#from AutoRegODetector_skinterface import AutoRegODetectorSKI
-# import ABODSKI
-# import AutoRegODetectorSKI
\ No newline at end of file
diff --git a/tods/utils/skinterface/primitiveSKI/ABOD_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/ABOD_skinterface.py
similarity index 83%
rename from tods/utils/skinterface/primitiveSKI/ABOD_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/ABOD_skinterface.py
index 5d88b1e..5736796 100644
--- a/tods/utils/skinterface/primitiveSKI/ABOD_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/ABOD_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodABOD import ABODPrimitive
 
 class ABODSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/AutoEncoder_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/AutoEncoder_skinterface.py
similarity index 84%
rename from tods/utils/skinterface/primitiveSKI/AutoEncoder_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/AutoEncoder_skinterface.py
index a0bf75c..3d1b470 100644
--- a/tods/utils/skinterface/primitiveSKI/AutoEncoder_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/AutoEncoder_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodAE import AutoEncoderPrimitive
 
 class AutoEncoderSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/AutoRegODetector_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/AutoRegODetector_skinterface.py
similarity index 86%
rename from tods/utils/skinterface/primitiveSKI/AutoRegODetector_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/AutoRegODetector_skinterface.py
index 6783f03..0ebbdd7 100644
--- a/tods/utils/skinterface/primitiveSKI/AutoRegODetector_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/AutoRegODetector_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.AutoRegODetect import AutoRegODetectorPrimitive
 
 class AutoRegODetectorSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/CBLOF_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/CBLOF_skinterface.py
similarity index 84%
rename from tods/utils/skinterface/primitiveSKI/CBLOF_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/CBLOF_skinterface.py
index d48dccf..e12d1b6 100644
--- a/tods/utils/skinterface/primitiveSKI/CBLOF_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/CBLOF_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodCBLOF import CBLOFPrimitive
 
 class CBLOFSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/COF_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/COF_skinterface.py
similarity index 83%
rename from tods/utils/skinterface/primitiveSKI/COF_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/COF_skinterface.py
index cc07b54..785ca66 100644
--- a/tods/utils/skinterface/primitiveSKI/COF_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/COF_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodCOF import COFPrimitive
 
 class COFSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/DeepLog_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/DeepLog_skinterface.py
similarity index 84%
rename from tods/utils/skinterface/primitiveSKI/DeepLog_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/DeepLog_skinterface.py
index 4afc9ba..06b793b 100644
--- a/tods/utils/skinterface/primitiveSKI/DeepLog_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/DeepLog_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.DeepLog import DeepLogPrimitive
 
 class DeepLogSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/Ensemble_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/Ensemble_skinterface.py
similarity index 84%
rename from tods/utils/skinterface/primitiveSKI/Ensemble_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/Ensemble_skinterface.py
index 4027cda..7505cff 100644
--- a/tods/utils/skinterface/primitiveSKI/Ensemble_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/Ensemble_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.Ensemble import EnsemblePrimitive
 
 class EnsembleSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/HBOS_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/HBOS_skinterface.py
similarity index 83%
rename from tods/utils/skinterface/primitiveSKI/HBOS_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/HBOS_skinterface.py
index 2035cd9..28b0cb2 100644
--- a/tods/utils/skinterface/primitiveSKI/HBOS_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/HBOS_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodHBOS import HBOSPrimitive
 
 class HBOSSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/IsolationForest_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/IsolationForest_skinterface.py
similarity index 86%
rename from tods/utils/skinterface/primitiveSKI/IsolationForest_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/IsolationForest_skinterface.py
index 32750bb..5e89604 100644
--- a/tods/utils/skinterface/primitiveSKI/IsolationForest_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/IsolationForest_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodIsolationForest import IsolationForestPrimitive
 
 class IsolationForestSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/KDiscordODetector_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/KDiscordODetector_skinterface.py
similarity index 86%
rename from tods/utils/skinterface/primitiveSKI/KDiscordODetector_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/KDiscordODetector_skinterface.py
index 9e970e1..8d7cd0b 100644
--- a/tods/utils/skinterface/primitiveSKI/KDiscordODetector_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/KDiscordODetector_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.KDiscordODetect import KDiscordODetectorPrimitive
 
 class KDiscordODetectorSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/KNN_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/KNN_skinterface.py
similarity index 83%
rename from tods/utils/skinterface/primitiveSKI/KNN_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/KNN_skinterface.py
index eff500c..74c1c87 100644
--- a/tods/utils/skinterface/primitiveSKI/KNN_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/KNN_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodKNN import KNNPrimitive
 
 class KNNSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/LODA_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/LODA_skinterface.py
similarity index 83%
rename from tods/utils/skinterface/primitiveSKI/LODA_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/LODA_skinterface.py
index 390dfed..6565684 100644
--- a/tods/utils/skinterface/primitiveSKI/LODA_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/LODA_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodLODA import LODAPrimitive
 
 class LODASKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/LOF_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/LOF_skinterface.py
similarity index 83%
rename from tods/utils/skinterface/primitiveSKI/LOF_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/LOF_skinterface.py
index bde097d..b6407e9 100644
--- a/tods/utils/skinterface/primitiveSKI/LOF_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/LOF_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodLOF import LOFPrimitive
 
 class LOFSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/LSTMODetector_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/LSTMODetector_skinterface.py
similarity index 85%
rename from tods/utils/skinterface/primitiveSKI/LSTMODetector_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/LSTMODetector_skinterface.py
index e85d850..fa3d4b7 100644
--- a/tods/utils/skinterface/primitiveSKI/LSTMODetector_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/LSTMODetector_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.LSTMODetect import LSTMODetectorPrimitive
 
 class LSTMODetectorSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/MatrixProfile_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/MatrixProfile_skinterface.py
similarity index 85%
rename from tods/utils/skinterface/primitiveSKI/MatrixProfile_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/MatrixProfile_skinterface.py
index cda28af..306fd6d 100644
--- a/tods/utils/skinterface/primitiveSKI/MatrixProfile_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/MatrixProfile_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.MatrixProfile import MatrixProfilePrimitive
 
 class MatrixProfileSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/Mo_Gaal_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/Mo_Gaal_skinterface.py
similarity index 84%
rename from tods/utils/skinterface/primitiveSKI/Mo_Gaal_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/Mo_Gaal_skinterface.py
index bfc5ada..92cdeb0 100644
--- a/tods/utils/skinterface/primitiveSKI/Mo_Gaal_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/Mo_Gaal_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodMoGaal import Mo_GaalPrimitive
 
 class Mo_GaalSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/OCSVM_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/OCSVM_skinterface.py
similarity index 84%
rename from tods/utils/skinterface/primitiveSKI/OCSVM_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/OCSVM_skinterface.py
index 2a341bb..8bec9e1 100644
--- a/tods/utils/skinterface/primitiveSKI/OCSVM_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/OCSVM_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodOCSVM import OCSVMPrimitive
 
 class OCSVMSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/PCAODetector_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/PCAODetector_skinterface.py
similarity index 85%
rename from tods/utils/skinterface/primitiveSKI/PCAODetector_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/PCAODetector_skinterface.py
index 2f31d54..b99155f 100644
--- a/tods/utils/skinterface/primitiveSKI/PCAODetector_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/PCAODetector_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PCAODetect import PCAODetectorPrimitive
 
 class PCAODetectorSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/SOD_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/SOD_skinterface.py
similarity index 83%
rename from tods/utils/skinterface/primitiveSKI/SOD_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/SOD_skinterface.py
index 8a64d18..b16dc2c 100644
--- a/tods/utils/skinterface/primitiveSKI/SOD_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/SOD_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodSOD import SODPrimitive
 
 class SODSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/So_Gaal_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/So_Gaal_skinterface.py
similarity index 84%
rename from tods/utils/skinterface/primitiveSKI/So_Gaal_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/So_Gaal_skinterface.py
index 1a4cc9d..576d36a 100644
--- a/tods/utils/skinterface/primitiveSKI/So_Gaal_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/So_Gaal_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodSoGaal import So_GaalPrimitive
 
 class So_GaalSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/SystemWiseDetection_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/SystemWiseDetection_skinterface.py
similarity index 86%
rename from tods/utils/skinterface/primitiveSKI/SystemWiseDetection_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/SystemWiseDetection_skinterface.py
index 3109276..bbe042a 100644
--- a/tods/utils/skinterface/primitiveSKI/SystemWiseDetection_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/SystemWiseDetection_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.SystemWiseDetection import SystemWiseDetectionPrimitive
 
 class SystemWiseDetectionSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/Telemanom_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/Telemanom_skinterface.py
similarity index 84%
rename from tods/utils/skinterface/primitiveSKI/Telemanom_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/Telemanom_skinterface.py
index 6d6b581..062b3f2 100644
--- a/tods/utils/skinterface/primitiveSKI/Telemanom_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/Telemanom_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.Telemanom import TelemanomPrimitive
 
 class TelemanomSKI(BaseSKI):
diff --git a/tods/utils/skinterface/primitiveSKI/VariationalAutoEncoder_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/VariationalAutoEncoder_skinterface.py
similarity index 86%
rename from tods/utils/skinterface/primitiveSKI/VariationalAutoEncoder_skinterface.py
rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/VariationalAutoEncoder_skinterface.py
index 305a94b..0be9451 100644
--- a/tods/utils/skinterface/primitiveSKI/VariationalAutoEncoder_skinterface.py
+++ b/tods/utils/skinterface/primitiveSKI/detection_algorithm/VariationalAutoEncoder_skinterface.py
@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodVAE import VariationalAutoEncoderPrimitive
 
 class VariationalAutoEncoderSKI(BaseSKI):
diff --git a/tods/utils/skinterface/skinterface_generation.py b/tods/utils/skinterface/skinterface_generation.py
index 00d0791..9e1a3d1 100644
--- a/tods/utils/skinterface/skinterface_generation.py
+++ b/tods/utils/skinterface/skinterface_generation.py
@@ -5,7 +5,7 @@ import os
 with open('tods/utils/skinterface/entry_points.txt','r',encoding='utf-8') as f:
     entry_file = f.read()
 
-output_dir = 'tods/utils/skinterface/primitiveSKI'
+output_dir = 'tods/utils/skinterface/primitiveSKI/detection_algorithm'
 
 
 primitive_folder_start_loc_buf = [i.start()+2 for i in re.finditer('=', entry_file)]
@@ -22,7 +22,7 @@ for primitive_index, primitive_start_loc in enumerate(primitive_start_loc_buf):
     # print(entry_file[primitive_folder_start_loc:primitive_start_loc-1])
     # print(entry_file[primitive_start_loc:primitive_end_loc])
 
-    import_line1 = 'import numpy as np \nfrom .Base_skinterface import BaseSKI\n'
+    import_line1 = 'import numpy as np \nfrom ..Base_skinterface import BaseSKI\n'
     import_line2 = 'from ' + primitive_folder + ' import ' + primitive_name + '\n\n'
     # print(import_line)
 
@@ -34,7 +34,7 @@ for primitive_index, primitive_start_loc in enumerate(primitive_start_loc_buf):
     python_name = primitive_name.replace('Primitive', '_skinterface.py')
     with open(os.path.join(output_dir, python_name), 'w', encoding='utf-8') as f:
         f.write(python_content)
-    #print(os.path.join(output_dir, python_name))
+    print(os.path.join(output_dir, python_name))
     print(python_content)