diff --git a/generator.php b/generator.php
index 8ef7d3e..d4f8212 100644
--- a/generator.php
+++ b/generator.php
@@ -6,18 +6,31 @@ $base = file_get_contents(__DIR__."/src/base.sh");
 $dirs = [
     __DIR__.'/src/commands/*.sh',
     __DIR__.'/src/commands/*/*.sh',
-    __DIR__.'/src/commands/*/*/*.sh'
+    __DIR__.'/src/commands/*/*/*.sh',
+    __DIR__.'/src/functions/*.sh',
+    __DIR__.'/src/elements.sh'
 ];
 
 $codes = [];
 
 foreach($dirs as $dir){
     foreach(glob($dir) as $file){
-        $codes[$file] = file_get_contents($file);
+        if(str_contains($dir, "elements")){
+            echo $dir;
+            $codes['elements'][$file] = file_get_contents($file);
+        }
+        if(str_contains($dir, "functions")){
+            $codes['functions'][$file] = file_get_contents($file);
+        }
+        if(str_contains($dir, "commands")){
+            $codes['commands'][$file] = file_get_contents($file);
+        }
     }
 }
 
-$code = str_replace("{{ COMMANDS }}", implode("\n", $codes), $base);
+$code = str_replace("{{ ELEMENTS }}", implode("\n", $codes['elements']), $base);
+$code = str_replace("{{ FUNCTIONS }}", implode("\n", $codes['functions']), $code);
+$code = str_replace("{{ COMMANDS }}", implode("\n", $codes['commands']), $code);
 
 try {
     $file = __DIR__.'/wx.tmp';