diff --git a/skluc/test/test_data/test_mldatasets.py b/skluc/test/test_data/test_mldatasets.py
index 5c7d538ed452503ec7b4c4bee50221d9cd3f5d45..3cb6abca99f79c6f601033b1efacc1013d040e32 100644
--- a/skluc/test/test_data/test_mldatasets.py
+++ b/skluc/test/test_data/test_mldatasets.py
@@ -1,7 +1,10 @@
 import os
 import unittest
 
-import skluc.main.data.mldatasets as dataset
+from skluc.main.data.mldatasets.Cifar10Dataset import Cifar10Dataset
+from skluc.main.data.mldatasets.MnistDataset import MnistDataset
+from skluc.main.data.mldatasets.MovieReviewDataset import MovieReviewV1Dataset
+from skluc.main.data.mldatasets.SVHNDataset import SVHNDataset
 from skluc.main.utils import silentremove
 
 
@@ -19,7 +22,7 @@ class TestMnistDataset(unittest.TestCase):
         self.full_mnist_names = [*map(lambda name: os.path.join(self.datadir_name, name), self.mnist_names)]
 
     def test_mnist(self):
-        mnist = dataset.MnistDataset(s_download_dir=self.download_dir)
+        mnist = MnistDataset(s_download_dir=self.download_dir)
         mnist_data = mnist.load()
         for name in self.full_mnist_names:
             self.assertTrue(os.path.exists(name))
@@ -50,7 +53,7 @@ class TestCifar10Dataset(unittest.TestCase):
         self.full_cifar10_names = [*map(lambda name: os.path.join(self.datadir_name, name), self.mnist_names)]
 
     def test_cifar10(self):
-        cifar10 = dataset.Cifar10Dataset(s_download_dir=self.download_dir)
+        cifar10 = Cifar10Dataset(s_download_dir=self.download_dir)
         cifar10_data = cifar10.load()
         for name in self.full_cifar10_names:
             self.assertTrue(os.path.exists(name))
@@ -58,15 +61,15 @@ class TestCifar10Dataset(unittest.TestCase):
 
     def tearDown(self):
         for name in self.full_cifar10_names:
-            dataset.silentremove(name)
+            silentremove(name)
 
 
 class TestDataset(unittest.TestCase):
     def setUp(self):
-        self.dataset_classes = [dataset.MnistDataset,
-                                dataset.Cifar10Dataset,
-                                dataset.SVHNDataset,
-                                dataset.MovieReviewV1Dataset]
+        self.dataset_classes = [MnistDataset,
+                                Cifar10Dataset,
+                                SVHNDataset,
+                                MovieReviewV1Dataset]
 
     def test_seed_train_val(self):
         for d_class in self.dataset_classes:
diff --git a/skluc/test/test_data/test_transformation/TestLeCunTransformer.py b/skluc/test/test_data/test_transformation/TestLeCunTransformer.py
index 4c4b049cbfccbac66bf367b3591dd4ff826ce4e8..215935bb74c242adb1523441e3e30941c8fa4ae8 100644
--- a/skluc/test/test_data/test_transformation/TestLeCunTransformer.py
+++ b/skluc/test/test_data/test_transformation/TestLeCunTransformer.py
@@ -1,7 +1,7 @@
 import unittest
 
-from skluc.main.data.mldatasets import MnistDataset
-from skluc.main.data import LecunTransformer
+from skluc.main.data.mldatasets.MnistDataset import MnistDataset
+from skluc.main.data.transformation.LeCunTransformer import LecunTransformer
 from skluc.main.utils import logger
 
 
diff --git a/skluc/test/test_data/test_transformation/TestRescaleTransformer.py b/skluc/test/test_data/test_transformation/TestRescaleTransformer.py
index fa34f8f0df14a6dd37e63f6df51b311d35c5ccfc..3e7d6f27cfdc36c5ad807220acb016e2caceb40d 100644
--- a/skluc/test/test_data/test_transformation/TestRescaleTransformer.py
+++ b/skluc/test/test_data/test_transformation/TestRescaleTransformer.py
@@ -1,7 +1,10 @@
 import unittest
 
-from skluc.main.data.mldatasets import MnistDataset, Cifar10Dataset, Cifar100FineDataset, SVHNDataset
-from skluc.main.data import RescaleTransformer
+from skluc.main.data.mldatasets.Cifar100FineDataset import Cifar100FineDataset
+from skluc.main.data.mldatasets.Cifar10Dataset import Cifar10Dataset
+from skluc.main.data.mldatasets.MnistDataset import MnistDataset
+from skluc.main.data.mldatasets.SVHNDataset import SVHNDataset
+from skluc.main.data.transformation.RescaleTransformer import RescaleTransformer
 from skluc.main.utils import logger
 
 
diff --git a/skluc/test/test_data/test_transformation/TestResizeTransformer.py b/skluc/test/test_data/test_transformation/TestResizeTransformer.py
index 0f5736b76624e607275abbc9eece5030fcf26432..b3a6cf593adc74e76436b658386b93915e9f085c 100644
--- a/skluc/test/test_data/test_transformation/TestResizeTransformer.py
+++ b/skluc/test/test_data/test_transformation/TestResizeTransformer.py
@@ -1,6 +1,9 @@
 import unittest
 
-from skluc.main.data.mldatasets import MnistDataset, Cifar10Dataset, Cifar100FineDataset, SVHNDataset
+from skluc.main.data.mldatasets.Cifar100FineDataset import Cifar100FineDataset
+from skluc.main.data.mldatasets.Cifar10Dataset import Cifar10Dataset
+from skluc.main.data.mldatasets.MnistDataset import MnistDataset
+from skluc.main.data.mldatasets.SVHNDataset import SVHNDataset
 from skluc.main.data.transformation.ResizeTransformer import ResizeTransformer
 from skluc.main.utils import logger
 
diff --git a/skluc/test/test_data/test_transformation/TestVGG19Transformer.py b/skluc/test/test_data/test_transformation/TestVGG19Transformer.py
index 6964d004bd179ace93c6c3a27e0303f45b062a16..ce3c33a20744165125263665399e3bef43586819 100644
--- a/skluc/test/test_data/test_transformation/TestVGG19Transformer.py
+++ b/skluc/test/test_data/test_transformation/TestVGG19Transformer.py
@@ -1,7 +1,9 @@
 import unittest
 
-from skluc.main.data.mldatasets import Cifar10Dataset, SVHNDataset, Cifar100FineDataset
-from skluc.main.data import VGG19Transformer
+from skluc.main.data.mldatasets.Cifar100FineDataset import Cifar100FineDataset
+from skluc.main.data.mldatasets.Cifar10Dataset import Cifar10Dataset
+from skluc.main.data.mldatasets.SVHNDataset import SVHNDataset
+from skluc.main.data.transformation.VGG19Transformer import VGG19Transformer
 from skluc.main.utils import logger
 
 
diff --git a/skluc/test/test_kernel.py b/skluc/test/test_kernel.py
index 619a3d25b5a6d62fb464bf366312c1537a3c36a3..b30af26b550389ec0fbe7a710d21bdf0c357ca0f 100644
--- a/skluc/test/test_kernel.py
+++ b/skluc/test/test_kernel.py
@@ -3,8 +3,7 @@ import tensorflow as tf
 import numpy as np
 from sklearn.metrics.pairwise import rbf_kernel, chi2_kernel, additive_chi2_kernel, sigmoid_kernel, laplacian_kernel
 
-import skluc.main.data.mldatasets as dataset
-
+from skluc.main.data.mldatasets.MnistDataset import MnistDataset
 from skluc.main.tensorflow_.kernel import tf_rbf_kernel, tf_chi_square_CPD_exp, tf_chi_square_CPD, tf_sigmoid_kernel, \
     tf_laplacian_kernel, tf_sum_of_kernels, tf_stack_of_kernels
 
@@ -12,7 +11,7 @@ from skluc.main.tensorflow_.kernel import tf_rbf_kernel, tf_chi_square_CPD_exp,
 class TestKernel(unittest.TestCase):
     def setUp(self):
         self.val_size = 50
-        mnist = dataset.MnistDataset(validation_size=self.val_size)
+        mnist = MnistDataset(validation_size=self.val_size)
         mnist.load()
         mnist.normalize()
         mnist.data_astype(np.float32)