diff --git a/tods/tods_skinterface/script_generation/detection_algorithm_skinterface_generation.py b/tods/tods_skinterface/script/detection_algorithm_skinterface_generation.py
similarity index 100%
rename from tods/tods_skinterface/script_generation/detection_algorithm_skinterface_generation.py
rename to tods/tods_skinterface/script/detection_algorithm_skinterface_generation.py
diff --git a/tods/tods_skinterface/script_generation/detection_algorithm_skitest_generation.py b/tods/tods_skinterface/script/detection_algorithm_skitest_generation.py
similarity index 100%
rename from tods/tods_skinterface/script_generation/detection_algorithm_skitest_generation.py
rename to tods/tods_skinterface/script/detection_algorithm_skitest_generation.py
diff --git a/tods/tods_skinterface/script_generation/feature_analysis_skinterface_generation.py b/tods/tods_skinterface/script/feature_analysis_skinterface_generation.py
similarity index 100%
rename from tods/tods_skinterface/script_generation/feature_analysis_skinterface_generation.py
rename to tods/tods_skinterface/script/feature_analysis_skinterface_generation.py
diff --git a/tods/tods_skinterface/script_generation/feature_analysis_skitest_generation.py b/tods/tods_skinterface/script/feature_analysis_skitest_generation.py
similarity index 100%
rename from tods/tods_skinterface/script_generation/feature_analysis_skitest_generation.py
rename to tods/tods_skinterface/script/feature_analysis_skitest_generation.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/ABOD_skitest.py b/tods/tods_skinterface/test/detection_algorithm/ABOD_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/ABOD_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/ABOD_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/AutoEncoder_skitest.py b/tods/tods_skinterface/test/detection_algorithm/AutoEncoder_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/AutoEncoder_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/AutoEncoder_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/AutoRegODetector_skitest.py b/tods/tods_skinterface/test/detection_algorithm/AutoRegODetector_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/AutoRegODetector_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/AutoRegODetector_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/CBLOF_skitest.py b/tods/tods_skinterface/test/detection_algorithm/CBLOF_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/CBLOF_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/CBLOF_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/COF_skitest.py b/tods/tods_skinterface/test/detection_algorithm/COF_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/COF_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/COF_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/DeepLog_skitest.py b/tods/tods_skinterface/test/detection_algorithm/DeepLog_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/DeepLog_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/DeepLog_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/Ensemble_skitest.py b/tods/tods_skinterface/test/detection_algorithm/Ensemble_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/Ensemble_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/Ensemble_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/HBOS_skitest.py b/tods/tods_skinterface/test/detection_algorithm/HBOS_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/HBOS_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/HBOS_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/IsolationForest_skitest.py b/tods/tods_skinterface/test/detection_algorithm/IsolationForest_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/IsolationForest_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/IsolationForest_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/KDiscordODetector_skitest.py b/tods/tods_skinterface/test/detection_algorithm/KDiscordODetector_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/KDiscordODetector_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/KDiscordODetector_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/KNN_skitest.py b/tods/tods_skinterface/test/detection_algorithm/KNN_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/KNN_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/KNN_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/LODA_skitest.py b/tods/tods_skinterface/test/detection_algorithm/LODA_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/LODA_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/LODA_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/LOF_skitest.py b/tods/tods_skinterface/test/detection_algorithm/LOF_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/LOF_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/LOF_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/LSTMODetector_skitest.py b/tods/tods_skinterface/test/detection_algorithm/LSTMODetector_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/LSTMODetector_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/LSTMODetector_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/MatrixProfile_skitest.py b/tods/tods_skinterface/test/detection_algorithm/MatrixProfile_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/MatrixProfile_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/MatrixProfile_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/Mo_Gaal_skitest.py b/tods/tods_skinterface/test/detection_algorithm/Mo_Gaal_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/Mo_Gaal_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/Mo_Gaal_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/OCSVM_skitest.py b/tods/tods_skinterface/test/detection_algorithm/OCSVM_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/OCSVM_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/OCSVM_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/PCAODetector_skitest.py b/tods/tods_skinterface/test/detection_algorithm/PCAODetector_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/PCAODetector_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/PCAODetector_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/SOD_skitest.py b/tods/tods_skinterface/test/detection_algorithm/SOD_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/SOD_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/SOD_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/So_Gaal_skitest.py b/tods/tods_skinterface/test/detection_algorithm/So_Gaal_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/So_Gaal_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/So_Gaal_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/SystemWiseDetection_skitest.py b/tods/tods_skinterface/test/detection_algorithm/SystemWiseDetection_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/SystemWiseDetection_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/SystemWiseDetection_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/Telemanom_skitest.py b/tods/tods_skinterface/test/detection_algorithm/Telemanom_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/Telemanom_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/Telemanom_skitest.py
diff --git a/tods/tods_skinterface/detection_algorithm_skitest/VariationalAutoEncoder_skitest.py b/tods/tods_skinterface/test/detection_algorithm/VariationalAutoEncoder_skitest.py
similarity index 100%
rename from tods/tods_skinterface/detection_algorithm_skitest/VariationalAutoEncoder_skitest.py
rename to tods/tods_skinterface/test/detection_algorithm/VariationalAutoEncoder_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/AutoCorrelation_skitest.py b/tods/tods_skinterface/test/feature_analysis/AutoCorrelation_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/AutoCorrelation_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/AutoCorrelation_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/BKFilter_skitest.py b/tods/tods_skinterface/test/feature_analysis/BKFilter_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/BKFilter_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/BKFilter_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/DiscreteCosineTransform_skitest.py b/tods/tods_skinterface/test/feature_analysis/DiscreteCosineTransform_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/DiscreteCosineTransform_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/DiscreteCosineTransform_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/FastFourierTransform_skitest.py b/tods/tods_skinterface/test/feature_analysis/FastFourierTransform_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/FastFourierTransform_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/FastFourierTransform_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/HPFilter_skitest.py b/tods/tods_skinterface/test/feature_analysis/HPFilter_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/HPFilter_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/HPFilter_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/NonNegativeMatrixFactorization_skitest.py b/tods/tods_skinterface/test/feature_analysis/NonNegativeMatrixFactorization_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/NonNegativeMatrixFactorization_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/NonNegativeMatrixFactorization_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/SKTruncatedSVD_skitest.py b/tods/tods_skinterface/test/feature_analysis/SKTruncatedSVD_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/SKTruncatedSVD_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/SKTruncatedSVD_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/SpectralResidualTransform_skitest.py b/tods/tods_skinterface/test/feature_analysis/SpectralResidualTransform_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/SpectralResidualTransform_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/SpectralResidualTransform_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/StatisticalAbsEnergy_skitest.py b/tods/tods_skinterface/test/feature_analysis/StatisticalAbsEnergy_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/StatisticalAbsEnergy_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/StatisticalAbsEnergy_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/StatisticalAbsSum_skitest.py b/tods/tods_skinterface/test/feature_analysis/StatisticalAbsSum_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/StatisticalAbsSum_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/StatisticalAbsSum_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/StatisticalGmean_skitest.py b/tods/tods_skinterface/test/feature_analysis/StatisticalGmean_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/StatisticalGmean_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/StatisticalGmean_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/StatisticalHmean_skitest.py b/tods/tods_skinterface/test/feature_analysis/StatisticalHmean_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/StatisticalHmean_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/StatisticalHmean_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/StatisticalKurtosis_skitest.py b/tods/tods_skinterface/test/feature_analysis/StatisticalKurtosis_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/StatisticalKurtosis_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/StatisticalKurtosis_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/StatisticalMaximum_skitest.py b/tods/tods_skinterface/test/feature_analysis/StatisticalMaximum_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/StatisticalMaximum_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/StatisticalMaximum_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/StatisticalMeanAbsTemporalDerivative_skitest.py b/tods/tods_skinterface/test/feature_analysis/StatisticalMeanAbsTemporalDerivative_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/StatisticalMeanAbsTemporalDerivative_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/StatisticalMeanAbsTemporalDerivative_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/StatisticalMeanAbs_skitest.py b/tods/tods_skinterface/test/feature_analysis/StatisticalMeanAbs_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/StatisticalMeanAbs_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/StatisticalMeanAbs_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/StatisticalMeanTemporalDerivative_skitest.py b/tods/tods_skinterface/test/feature_analysis/StatisticalMeanTemporalDerivative_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/StatisticalMeanTemporalDerivative_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/StatisticalMeanTemporalDerivative_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/StatisticalMean_skitest.py b/tods/tods_skinterface/test/feature_analysis/StatisticalMean_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/StatisticalMean_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/StatisticalMean_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/StatisticalMedianAbsoluteDeviation_skitest.py b/tods/tods_skinterface/test/feature_analysis/StatisticalMedianAbsoluteDeviation_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/StatisticalMedianAbsoluteDeviation_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/StatisticalMedianAbsoluteDeviation_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/StatisticalMedian_skitest.py b/tods/tods_skinterface/test/feature_analysis/StatisticalMedian_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/StatisticalMedian_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/StatisticalMedian_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/StatisticalMinimum_skitest.py b/tods/tods_skinterface/test/feature_analysis/StatisticalMinimum_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/StatisticalMinimum_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/StatisticalMinimum_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/StatisticalSkew_skitest.py b/tods/tods_skinterface/test/feature_analysis/StatisticalSkew_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/StatisticalSkew_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/StatisticalSkew_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/StatisticalStd_skitest.py b/tods/tods_skinterface/test/feature_analysis/StatisticalStd_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/StatisticalStd_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/StatisticalStd_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/StatisticalVar_skitest.py b/tods/tods_skinterface/test/feature_analysis/StatisticalVar_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/StatisticalVar_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/StatisticalVar_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/StatisticalVariation_skitest.py b/tods/tods_skinterface/test/feature_analysis/StatisticalVariation_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/StatisticalVariation_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/StatisticalVariation_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/StatisticalVecSum_skitest.py b/tods/tods_skinterface/test/feature_analysis/StatisticalVecSum_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/StatisticalVecSum_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/StatisticalVecSum_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/StatisticalWillisonAmplitude_skitest.py b/tods/tods_skinterface/test/feature_analysis/StatisticalWillisonAmplitude_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/StatisticalWillisonAmplitude_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/StatisticalWillisonAmplitude_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/StatisticalZeroCrossing_skitest.py b/tods/tods_skinterface/test/feature_analysis/StatisticalZeroCrossing_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/StatisticalZeroCrossing_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/StatisticalZeroCrossing_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/TRMF_skitest.py b/tods/tods_skinterface/test/feature_analysis/TRMF_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/TRMF_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/TRMF_skitest.py
diff --git a/tods/tods_skinterface/feature_analysis_skitest/WaveletTransform_skitest.py b/tods/tods_skinterface/test/feature_analysis/WaveletTransform_skitest.py
similarity index 100%
rename from tods/tods_skinterface/feature_analysis_skitest/WaveletTransform_skitest.py
rename to tods/tods_skinterface/test/feature_analysis/WaveletTransform_skitest.py