diff --git a/scrub_layer.py b/scrub_layer.py
index 087fe73..409fc74 100644
--- a/scrub_layer.py
+++ b/scrub_layer.py
@@ -4,6 +4,8 @@ PyQGIS functionalities that are needed in the cleaning and updating
 Montreal Buildings dataset project, gathered in one class.
 Project Developer: Alireza Adli alireza.adli@concordia.ca
 """
+import os
+import processing
 
 from qgis.core import QgsApplication, QgsField, QgsProject, \
   QgsProcessingFeedback, QgsVectorLayer, QgsVectorDataProvider, \
@@ -11,8 +13,7 @@ from qgis.core import QgsApplication, QgsField, QgsProject, \
   QgsExpression, QgsVectorFileWriter, QgsCoordinateReferenceSystem
 from qgis.PyQt.QtCore import QVariant
 from qgis.analysis import QgsNativeAlgorithms
-from basic_functions import *
-import processing
+from helpers import create_folders,  find_shp_files
 
 
 class ScrubLayer:
diff --git a/scrub_mtl.py b/scrub_mtl.py
index 9dae53c..235f57d 100644
--- a/scrub_mtl.py
+++ b/scrub_mtl.py
@@ -5,9 +5,10 @@ The development of this class has been stopped but the whole workflow
 can be found in a module namely handle_mtl_ds_workflow, in the same project.
 Project Developer: Alireza Adli alireza.adli@concordia.ca
 """
+import os
 
-from scrub_layer_class import *
-from basic_functions import *
+from scrub_layer import *
+from helpers import find_shp_files
 
 
 class ScrubMTL: