diff --git a/smnp/environment/factory.py b/smnp/environment/factory.py
index c803fbe..15609fb 100644
--- a/smnp/environment/factory.py
+++ b/smnp/environment/factory.py
@@ -1,38 +1,37 @@
 from smnp.environment.environment import Environment
-from smnp.library.function import display, sleep, semitones, interval, combine, flat, wait, rand, tuplet, synth, pause, \
-    transpose, type, exit, duration, octave, debug, get, sound, play, map, concat, range
+from smnp.module import functions, methods
 from smnp.type.model import Type
 
 
 def createEnvironment():
-    functions = [
-        display.function,
-        type.function,
-        exit.function,
-        sleep.function,
-        semitones.function,
-        interval.function,
-        combine.function,
-        flat.function,
-        wait.function,
-        rand.function,
-        tuplet.function,
-        synth.function,
-        pause.function,
-        transpose.function,
-        sound.function,
-        map.function,
-        concat.function,
-        range.function,
-        debug.function
-    ]
-
-    methods = [
-        duration.function,
-        octave.function,
-        play.function,
-        get.function
-    ]
+    # functions = [
+    #     display.function,
+    #     type.function,
+    #     exit.function,
+    #     sleep.function,
+    #     semitones.function,
+    #     interval.function,
+    #     combine.function,
+    #     flat.function,
+    #     #wait.function,
+    #     rand.function,
+    #     tuplet.function,
+    #     synth.function,
+    #     pause.function,
+    #     transpose.function,
+    #     sound.function,
+    #     map.function,
+    #     concat.function,
+    #     range.function,
+    #     debug.function
+    # ]
+    #
+    # methods = [
+    #     duration.function,
+    #     octave.function,
+    #     play.function,
+    #     get.function
+    # ]
 
     variables = {
         "bpm": Type.integer(120)
diff --git a/smnp/main.py b/smnp/main.py
index 1ec7502..733f73c 100644
--- a/smnp/main.py
+++ b/smnp/main.py
@@ -6,7 +6,7 @@ from smnp.program.interpreter import Interpreter
 
 def main():
     try:
-
+        
         Interpreter.interpretFile(sys.argv[1], printAst=True)
 
     except SmnpException as e:
diff --git a/smnp/module/__init__.py b/smnp/module/__init__.py
new file mode 100644
index 0000000..54c5001
--- /dev/null
+++ b/smnp/module/__init__.py
@@ -0,0 +1,4 @@
+import smnp.module.mic
+
+functions = [ *mic.functions ]
+methods = [ *mic.methods ]
\ No newline at end of file
diff --git a/smnp/module/mic/__init__.py b/smnp/module/mic/__init__.py
new file mode 100644
index 0000000..b28b7d7
--- /dev/null
+++ b/smnp/module/mic/__init__.py
@@ -0,0 +1,4 @@
+from smnp.module.mic.function import wait
+
+functions = [ wait.function ]
+methods = []
\ No newline at end of file
diff --git a/smnp/mic/__init__.py b/smnp/module/mic/function/__init__.py
similarity index 100%
rename from smnp/mic/__init__.py
rename to smnp/module/mic/function/__init__.py
diff --git a/smnp/library/function/wait.py b/smnp/module/mic/function/wait.py
similarity index 90%
rename from smnp/library/function/wait.py
rename to smnp/module/mic/function/wait.py
index 0d5ec46..caf7941 100644
--- a/smnp/library/function/wait.py
+++ b/smnp/module/mic/function/wait.py
@@ -1,6 +1,6 @@
 from smnp.library.model import CombinedFunction, Function
 from smnp.library.signature import signature, ofTypes
-from smnp.mic.detector.noise import NoiseDetector
+from smnp.module.mic.lib.detector.noise import NoiseDetector
 from smnp.type.model import Type
 
 
diff --git a/smnp/mic/detector/__init__.py b/smnp/module/mic/lib/__init__.py
similarity index 100%
rename from smnp/mic/detector/__init__.py
rename to smnp/module/mic/lib/__init__.py
diff --git a/smnp/module/mic/lib/detector/__init__.py b/smnp/module/mic/lib/detector/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/smnp/mic/detector/noise.py b/smnp/module/mic/lib/detector/noise.py
similarity index 100%
rename from smnp/mic/detector/noise.py
rename to smnp/module/mic/lib/detector/noise.py