diff --git a/.run/Demo1.run.xml b/.run/Demo1.run.xml
index 4ee98a8..867e2f7 100644
--- a/.run/Demo1.run.xml
+++ b/.run/Demo1.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Demo1" type="Application" factoryName="Application" folderName="Demo" activateToolWindowBeforeRun="false">
     <option name="ALTERNATIVE_JRE_PATH" value="graalvm-ce-23" />
-    <option name="MAIN_CLASS_NAME" value="org.jcnc.snow.compiler.cli.SnowCLI" />
+    <option name="MAIN_CLASS_NAME" value="org.jcnc.snow.cli.SnowCLI" />
     <module name="Snow" />
     <option name="PROGRAM_PARAMETERS" value="compile run -d playground/Demo1" />
     <extension name="coverage">
diff --git a/.run/Demo2.run.xml b/.run/Demo2.run.xml
index 9bad397..2661fde 100644
--- a/.run/Demo2.run.xml
+++ b/.run/Demo2.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Demo2" type="Application" factoryName="Application" folderName="Demo" activateToolWindowBeforeRun="false">
     <option name="ALTERNATIVE_JRE_PATH" value="graalvm-ce-23" />
-    <option name="MAIN_CLASS_NAME" value="org.jcnc.snow.compiler.cli.SnowCLI" />
+    <option name="MAIN_CLASS_NAME" value="org.jcnc.snow.cli.SnowCLI" />
     <module name="Snow" />
     <option name="PROGRAM_PARAMETERS" value="compile run -d playground/Demo2" />
     <extension name="coverage">
diff --git a/.run/Demo3.run.xml b/.run/Demo3.run.xml
index 8bcdcc9..57994d1 100644
--- a/.run/Demo3.run.xml
+++ b/.run/Demo3.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Demo3" type="Application" factoryName="Application" folderName="Demo" activateToolWindowBeforeRun="false">
     <option name="ALTERNATIVE_JRE_PATH" value="graalvm-ce-23" />
-    <option name="MAIN_CLASS_NAME" value="org.jcnc.snow.compiler.cli.SnowCLI" />
+    <option name="MAIN_CLASS_NAME" value="org.jcnc.snow.cli.SnowCLI" />
     <module name="Snow" />
     <option name="PROGRAM_PARAMETERS" value="compile run -d playground/Demo3" />
     <extension name="coverage">
diff --git a/.run/Demo4.run.xml b/.run/Demo4.run.xml
index 28e9e8a..083127e 100644
--- a/.run/Demo4.run.xml
+++ b/.run/Demo4.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Demo4" type="Application" factoryName="Application" folderName="Demo" activateToolWindowBeforeRun="false">
     <option name="ALTERNATIVE_JRE_PATH" value="graalvm-ce-23" />
-    <option name="MAIN_CLASS_NAME" value="org.jcnc.snow.compiler.cli.SnowCLI" />
+    <option name="MAIN_CLASS_NAME" value="org.jcnc.snow.cli.SnowCLI" />
     <module name="Snow" />
     <option name="PROGRAM_PARAMETERS" value="compile run -d playground/Demo4" />
     <extension name="coverage">
diff --git a/.run/Demo5.run.xml b/.run/Demo5.run.xml
index 6b85680..2c2bbf8 100644
--- a/.run/Demo5.run.xml
+++ b/.run/Demo5.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Demo5" type="Application" factoryName="Application" folderName="Demo" activateToolWindowBeforeRun="false">
     <option name="ALTERNATIVE_JRE_PATH" value="graalvm-ce-23" />
-    <option name="MAIN_CLASS_NAME" value="org.jcnc.snow.compiler.cli.SnowCLI" />
+    <option name="MAIN_CLASS_NAME" value="org.jcnc.snow.cli.SnowCLI" />
     <module name="Snow" />
     <option name="PROGRAM_PARAMETERS" value="compile run -d playground/Demo5" />
     <extension name="coverage">
diff --git a/.run/Demo6.run.xml b/.run/Demo6.run.xml
index 65b4660..9c76927 100644
--- a/.run/Demo6.run.xml
+++ b/.run/Demo6.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Demo6" type="Application" factoryName="Application" folderName="Demo" activateToolWindowBeforeRun="false">
     <option name="ALTERNATIVE_JRE_PATH" value="graalvm-ce-23" />
-    <option name="MAIN_CLASS_NAME" value="org.jcnc.snow.compiler.cli.SnowCLI" />
+    <option name="MAIN_CLASS_NAME" value="org.jcnc.snow.cli.SnowCLI" />
     <module name="Snow" />
     <option name="PROGRAM_PARAMETERS" value="compile run -d playground/Demo6" />
     <extension name="coverage">
diff --git a/.run/Demo7.run.xml b/.run/Demo7.run.xml
index 10708c7..d78ab8c 100644
--- a/.run/Demo7.run.xml
+++ b/.run/Demo7.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Demo7" type="Application" factoryName="Application" folderName="Demo" activateToolWindowBeforeRun="false">
     <option name="ALTERNATIVE_JRE_PATH" value="graalvm-ce-23" />
-    <option name="MAIN_CLASS_NAME" value="org.jcnc.snow.compiler.cli.SnowCLI" />
+    <option name="MAIN_CLASS_NAME" value="org.jcnc.snow.cli.SnowCLI" />
     <module name="Snow" />
     <option name="PROGRAM_PARAMETERS" value="compile run -d playground/Demo7" />
     <extension name="coverage">
diff --git a/.run/Demo8.run.xml b/.run/Demo8.run.xml
index d3fed9f..0857919 100644
--- a/.run/Demo8.run.xml
+++ b/.run/Demo8.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Demo8" type="Application" factoryName="Application" folderName="Demo" activateToolWindowBeforeRun="false">
     <option name="ALTERNATIVE_JRE_PATH" value="graalvm-ce-23" />
-    <option name="MAIN_CLASS_NAME" value="org.jcnc.snow.compiler.cli.SnowCLI" />
+    <option name="MAIN_CLASS_NAME" value="org.jcnc.snow.cli.SnowCLI" />
     <module name="Snow" />
     <option name="PROGRAM_PARAMETERS" value="compile run -d playground/Demo8" />
     <extension name="coverage">
diff --git a/.run/Help.run.xml b/.run/Help.run.xml
index 9043cea..849a3b4 100644
--- a/.run/Help.run.xml
+++ b/.run/Help.run.xml
@@ -1,11 +1,11 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Help" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="org.jcnc.snow.compiler.cli.SnowCLI" />
+    <option name="MAIN_CLASS_NAME" value="org.jcnc.snow.cli.SnowCLI" />
     <module name="Snow" />
     <option name="PROGRAM_PARAMETERS" value="--help" />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="org.jcnc.snow.compiler.cli.SnowCLI" />
+        <option name="PATTERN" value="org.jcnc.snow.cli.SnowCLI" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>
diff --git a/.run/Version.run.xml b/.run/Version.run.xml
index f648630..5816f30 100644
--- a/.run/Version.run.xml
+++ b/.run/Version.run.xml
@@ -1,11 +1,11 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Version" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="org.jcnc.snow.compiler.cli.SnowCLI" />
+    <option name="MAIN_CLASS_NAME" value="org.jcnc.snow.cli.SnowCLI" />
     <module name="Snow" />
     <option name="PROGRAM_PARAMETERS" value="--version" />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="org.jcnc.snow.compiler.cli.SnowCLI" />
+        <option name="PATTERN" value="org.jcnc.snow.cli.SnowCLI" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>
diff --git a/pom.xml b/pom.xml
index 9812d97..bf44bc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <mainClass>org.jcnc.snow.compiler.cli.SnowCLI</mainClass>
+                            <mainClass>org.jcnc.snow.cli.SnowCLI</mainClass>
                             <addClasspath>true</addClasspath>
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 3f1c505..aa5369c 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 module org.jcnc.snow.compiler {
-    uses org.jcnc.snow.compiler.cli.CLICommand;
+    uses org.jcnc.snow.cli.CLICommand;
     requires java.desktop;
     requires java.logging;
     exports org.jcnc.snow.compiler.ir.core;
diff --git a/src/main/java/org/jcnc/snow/compiler/cli/CLICommand.java b/src/main/java/org/jcnc/snow/cli/CLICommand.java
similarity index 97%
rename from src/main/java/org/jcnc/snow/compiler/cli/CLICommand.java
rename to src/main/java/org/jcnc/snow/cli/CLICommand.java
index 80b5169..ffd1e03 100644
--- a/src/main/java/org/jcnc/snow/compiler/cli/CLICommand.java
+++ b/src/main/java/org/jcnc/snow/cli/CLICommand.java
@@ -1,4 +1,4 @@
-package org.jcnc.snow.compiler.cli;
+package org.jcnc.snow.cli;
 
 /**
  * <p>
diff --git a/src/main/java/org/jcnc/snow/compiler/cli/SnowCLI.java b/src/main/java/org/jcnc/snow/cli/SnowCLI.java
similarity index 90%
rename from src/main/java/org/jcnc/snow/compiler/cli/SnowCLI.java
rename to src/main/java/org/jcnc/snow/cli/SnowCLI.java
index 5846980..1b135f7 100644
--- a/src/main/java/org/jcnc/snow/compiler/cli/SnowCLI.java
+++ b/src/main/java/org/jcnc/snow/cli/SnowCLI.java
@@ -1,10 +1,10 @@
-package org.jcnc.snow.compiler.cli;
+package org.jcnc.snow.cli;
 
-import org.jcnc.snow.compiler.cli.commands.CompileCommand;
-import org.jcnc.snow.compiler.cli.commands.RunCommand;
-import org.jcnc.snow.compiler.cli.commands.VersionCommand;
-import org.jcnc.snow.compiler.cli.utils.CLIUtils;
-import org.jcnc.snow.compiler.cli.utils.VersionUtils;
+import org.jcnc.snow.cli.commands.CompileCommand;
+import org.jcnc.snow.cli.commands.RunCommand;
+import org.jcnc.snow.cli.commands.VersionCommand;
+import org.jcnc.snow.cli.utils.CLIUtils;
+import org.jcnc.snow.cli.utils.VersionUtils;
 
 import java.util.Arrays;
 import java.util.Map;
diff --git a/src/main/java/org/jcnc/snow/compiler/cli/commands/CompileCommand.java b/src/main/java/org/jcnc/snow/cli/commands/CompileCommand.java
similarity index 99%
rename from src/main/java/org/jcnc/snow/compiler/cli/commands/CompileCommand.java
rename to src/main/java/org/jcnc/snow/cli/commands/CompileCommand.java
index 36bc2b2..3fd0439 100644
--- a/src/main/java/org/jcnc/snow/compiler/cli/commands/CompileCommand.java
+++ b/src/main/java/org/jcnc/snow/cli/commands/CompileCommand.java
@@ -1,11 +1,11 @@
-package org.jcnc.snow.compiler.cli.commands;
+package org.jcnc.snow.cli.commands;
 
 import org.jcnc.snow.compiler.backend.alloc.RegisterAllocator;
 import org.jcnc.snow.compiler.backend.builder.VMCodeGenerator;
 import org.jcnc.snow.compiler.backend.builder.VMProgramBuilder;
 import org.jcnc.snow.compiler.backend.core.InstructionGenerator;
 import org.jcnc.snow.compiler.backend.generator.InstructionGeneratorProvider;
-import org.jcnc.snow.compiler.cli.CLICommand;
+import org.jcnc.snow.cli.CLICommand;
 import org.jcnc.snow.compiler.ir.builder.IRProgramBuilder;
 import org.jcnc.snow.compiler.ir.core.IRFunction;
 import org.jcnc.snow.compiler.ir.core.IRInstruction;
diff --git a/src/main/java/org/jcnc/snow/compiler/cli/commands/RunCommand.java b/src/main/java/org/jcnc/snow/cli/commands/RunCommand.java
similarity index 94%
rename from src/main/java/org/jcnc/snow/compiler/cli/commands/RunCommand.java
rename to src/main/java/org/jcnc/snow/cli/commands/RunCommand.java
index 92373a5..63b4d34 100644
--- a/src/main/java/org/jcnc/snow/compiler/cli/commands/RunCommand.java
+++ b/src/main/java/org/jcnc/snow/cli/commands/RunCommand.java
@@ -1,6 +1,6 @@
-package org.jcnc.snow.compiler.cli.commands;
+package org.jcnc.snow.cli.commands;
 
-import org.jcnc.snow.compiler.cli.CLICommand;
+import org.jcnc.snow.cli.CLICommand;
 import org.jcnc.snow.vm.VMLauncher;
 
 /**
diff --git a/src/main/java/org/jcnc/snow/compiler/cli/commands/VersionCommand.java b/src/main/java/org/jcnc/snow/cli/commands/VersionCommand.java
similarity index 88%
rename from src/main/java/org/jcnc/snow/compiler/cli/commands/VersionCommand.java
rename to src/main/java/org/jcnc/snow/cli/commands/VersionCommand.java
index 4e545d9..f45b007 100644
--- a/src/main/java/org/jcnc/snow/compiler/cli/commands/VersionCommand.java
+++ b/src/main/java/org/jcnc/snow/cli/commands/VersionCommand.java
@@ -1,7 +1,7 @@
-package org.jcnc.snow.compiler.cli.commands;
+package org.jcnc.snow.cli.commands;
 
-import org.jcnc.snow.compiler.cli.CLICommand;
-import org.jcnc.snow.compiler.cli.SnowCLI;
+import org.jcnc.snow.cli.CLICommand;
+import org.jcnc.snow.cli.SnowCLI;
 
 /**
  * <p>
diff --git a/src/main/java/org/jcnc/snow/compiler/cli/utils/CLIUtils.java b/src/main/java/org/jcnc/snow/cli/utils/CLIUtils.java
similarity index 96%
rename from src/main/java/org/jcnc/snow/compiler/cli/utils/CLIUtils.java
rename to src/main/java/org/jcnc/snow/cli/utils/CLIUtils.java
index 5c09caf..462ead8 100644
--- a/src/main/java/org/jcnc/snow/compiler/cli/utils/CLIUtils.java
+++ b/src/main/java/org/jcnc/snow/cli/utils/CLIUtils.java
@@ -1,6 +1,6 @@
-package org.jcnc.snow.compiler.cli.utils;
+package org.jcnc.snow.cli.utils;
 
-import org.jcnc.snow.compiler.cli.CLICommand;
+import org.jcnc.snow.cli.CLICommand;
 
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/org/jcnc/snow/compiler/cli/utils/VersionUtils.java b/src/main/java/org/jcnc/snow/cli/utils/VersionUtils.java
similarity index 97%
rename from src/main/java/org/jcnc/snow/compiler/cli/utils/VersionUtils.java
rename to src/main/java/org/jcnc/snow/cli/utils/VersionUtils.java
index 63cf67d..5503565 100644
--- a/src/main/java/org/jcnc/snow/compiler/cli/utils/VersionUtils.java
+++ b/src/main/java/org/jcnc/snow/cli/utils/VersionUtils.java
@@ -1,4 +1,4 @@
-package org.jcnc.snow.compiler.cli.utils;
+package org.jcnc.snow.cli.utils;
 
 import java.io.IOException;
 import java.io.InputStream;