diff --git a/alib2cli/src/command/Command.h b/alib2cli/src/ast/Command.h
similarity index 87%
rename from alib2cli/src/command/Command.h
rename to alib2cli/src/ast/Command.h
index 23cddb86b639a83182b38a82005a102a439d0194..5e72db49fa3ea7595d69073516501d4d69ec1020 100644
--- a/alib2cli/src/command/Command.h
+++ b/alib2cli/src/ast/Command.h
@@ -1,7 +1,7 @@
 #ifndef _CLI_COMMAND_H_
 #define _CLI_COMMAND_H_
 
-#include <command/CommandResult.h>
+#include <ast/command/CommandResult.h>
 
 namespace cli {
 
diff --git a/alib2cli/src/command/AlgorithmsIntrospectionCommand.h b/alib2cli/src/ast/command/AlgorithmsIntrospectionCommand.h
similarity index 98%
rename from alib2cli/src/command/AlgorithmsIntrospectionCommand.h
rename to alib2cli/src/ast/command/AlgorithmsIntrospectionCommand.h
index 103c54256e2a1a43a01645e5a2770458c4580772..5babfa5478fa46a691db9cc055952694267489b5 100644
--- a/alib2cli/src/command/AlgorithmsIntrospectionCommand.h
+++ b/alib2cli/src/ast/command/AlgorithmsIntrospectionCommand.h
@@ -1,7 +1,7 @@
 #ifndef _CLI_ALGORITHMS_INTROSPECTION_COMMAND_H_
 #define _CLI_ALGORITHMS_INTROSPECTION_COMMAND_H_
 
-#include <command/Command.h>
+#include <ast/Command.h>
 #include <environment/Environment.h>
 
 namespace cli {
diff --git a/alib2cli/src/command/BindingsIntrospectionCommand.h b/alib2cli/src/ast/command/BindingsIntrospectionCommand.h
similarity index 96%
rename from alib2cli/src/command/BindingsIntrospectionCommand.h
rename to alib2cli/src/ast/command/BindingsIntrospectionCommand.h
index dec939334868be6ea66594322d1df96e6a31b0ff..d09e020ce797152d87be97c157ef3e577c15b3f7 100644
--- a/alib2cli/src/command/BindingsIntrospectionCommand.h
+++ b/alib2cli/src/ast/command/BindingsIntrospectionCommand.h
@@ -1,7 +1,7 @@
 #ifndef _CLI_BINDINGS_INTROSPECTION_COMMAND_H_
 #define _CLI_BINDINGS_INTROSPECTION_COMMAND_H_
 
-#include <command/Command.h>
+#include <ast/Command.h>
 #include <environment/Environment.h>
 
 namespace cli {
diff --git a/alib2cli/src/command/CastsIntrospectionCommand.h b/alib2cli/src/ast/command/CastsIntrospectionCommand.h
similarity index 98%
rename from alib2cli/src/command/CastsIntrospectionCommand.h
rename to alib2cli/src/ast/command/CastsIntrospectionCommand.h
index d824c5c357b716467331c0c90d30915e45954fb4..8f7c68878aefcb0489df510edd802350c93616b1 100644
--- a/alib2cli/src/command/CastsIntrospectionCommand.h
+++ b/alib2cli/src/ast/command/CastsIntrospectionCommand.h
@@ -1,7 +1,7 @@
 #ifndef _CLI_CAST_INTROSPECTION_COMMAND_H_
 #define _CLI_CAST_INTROSPECTION_COMMAND_H_
 
-#include <command/Command.h>
+#include <ast/Command.h>
 #include <environment/Environment.h>
 #include <alib/list>
 
diff --git a/alib2cli/src/command/CommandList.h b/alib2cli/src/ast/command/CommandList.h
similarity index 96%
rename from alib2cli/src/command/CommandList.h
rename to alib2cli/src/ast/command/CommandList.h
index 3babfa77ca5e993f576842239e6c8f5e2ccdb8e6..3b6719608e7f4ae38f6e192b5922cb73af948b32 100644
--- a/alib2cli/src/command/CommandList.h
+++ b/alib2cli/src/ast/command/CommandList.h
@@ -1,7 +1,7 @@
 #ifndef _CLI_COMMAND_LIST_H_
 #define _CLI_COMMAND_LIST_H_
 
-#include <command/Command.h>
+#include <ast/Command.h>
 
 namespace cli {
 
diff --git a/alib2cli/src/command/CommandResult.h b/alib2cli/src/ast/command/CommandResult.h
similarity index 100%
rename from alib2cli/src/command/CommandResult.h
rename to alib2cli/src/ast/command/CommandResult.h
diff --git a/alib2cli/src/command/DataTypesIntrospectionCommand.h b/alib2cli/src/ast/command/DataTypesIntrospectionCommand.h
similarity index 97%
rename from alib2cli/src/command/DataTypesIntrospectionCommand.h
rename to alib2cli/src/ast/command/DataTypesIntrospectionCommand.h
index fecd4ab9e13f09c97072d1546046bb63de948dab..203a0113ea97bc7a74eaa9d11582b732746cca4e 100644
--- a/alib2cli/src/command/DataTypesIntrospectionCommand.h
+++ b/alib2cli/src/ast/command/DataTypesIntrospectionCommand.h
@@ -1,7 +1,7 @@
 #ifndef _CLI_DATA_TYPE_INTROSPECTION_COMMAND_H_
 #define _CLI_DATA_TYPE_INTROSPECTION_COMMAND_H_
 
-#include <command/Command.h>
+#include <ast/Command.h>
 #include <environment/Environment.h>
 
 #include <registry/XmlRegistry.h>
diff --git a/alib2cli/src/command/EOTCommand.h b/alib2cli/src/ast/command/EOTCommand.h
similarity index 91%
rename from alib2cli/src/command/EOTCommand.h
rename to alib2cli/src/ast/command/EOTCommand.h
index 0c206fd80cd48641f462e075e160fb941c4d6c88..933b9bc220c257bc7317766f7697213678e02907 100644
--- a/alib2cli/src/command/EOTCommand.h
+++ b/alib2cli/src/ast/command/EOTCommand.h
@@ -1,7 +1,7 @@
 #ifndef _CLI_EOT_COMMAND_H_
 #define _CLI_EOT_COMMAND_H_
 
-#include <command/Command.h>
+#include <ast/Command.h>
 #include <environment/Environment.h>
 
 namespace cli {
diff --git a/alib2cli/src/command/ExecuteCommand.h b/alib2cli/src/ast/command/ExecuteCommand.h
similarity index 95%
rename from alib2cli/src/command/ExecuteCommand.h
rename to alib2cli/src/ast/command/ExecuteCommand.h
index 41f84f46ba96b7b0ec8ce30a4f40a5a2ffdcec43..1145eac138b404e46e0fabbd85eabad52de39da6 100644
--- a/alib2cli/src/command/ExecuteCommand.h
+++ b/alib2cli/src/ast/command/ExecuteCommand.h
@@ -1,7 +1,7 @@
 #ifndef _CLI_EXECUTE_COMMAND_H_
 #define _CLI_EXECUTE_COMMAND_H_
 
-#include <command/Command.h>
+#include <ast/Command.h>
 #include <environment/Environment.h>
 #include <ast/Statement.h>
 
diff --git a/alib2cli/src/command/HelpCommand.h b/alib2cli/src/ast/command/HelpCommand.h
similarity index 99%
rename from alib2cli/src/command/HelpCommand.h
rename to alib2cli/src/ast/command/HelpCommand.h
index 08ecc0493d7d08924b1d394f476b282b4fa9a58d..25a05a6c3a8465292ae33190addfeb3bf2e6629e 100644
--- a/alib2cli/src/command/HelpCommand.h
+++ b/alib2cli/src/ast/command/HelpCommand.h
@@ -1,7 +1,7 @@
 #ifndef _CLI_HELP_COMMAND_H_
 #define _CLI_HELP_COMMAND_H_
 
-#include <command/Command.h>
+#include <ast/Command.h>
 #include <environment/Environment.h>
 
 namespace cli {
diff --git a/alib2cli/src/command/LoadCommand.h b/alib2cli/src/ast/command/LoadCommand.h
similarity index 94%
rename from alib2cli/src/command/LoadCommand.h
rename to alib2cli/src/ast/command/LoadCommand.h
index 7ec174ad94f2fabcb0476de48795698f14c14af6..cbae849868ccf40e20d82b6c86488484b10bd8e8 100644
--- a/alib2cli/src/command/LoadCommand.h
+++ b/alib2cli/src/ast/command/LoadCommand.h
@@ -1,7 +1,7 @@
 #ifndef _CLI_LOAD_COMMAND_H_
 #define _CLI_LOAD_COMMAND_H_
 
-#include <command/Command.h>
+#include <ast/Command.h>
 #include <environment/Environment.h>
 
 #include <common/LibraryLoader.h>
diff --git a/alib2cli/src/command/OverloadsIntrospectionCommand.h b/alib2cli/src/ast/command/OverloadsIntrospectionCommand.h
similarity index 98%
rename from alib2cli/src/command/OverloadsIntrospectionCommand.h
rename to alib2cli/src/ast/command/OverloadsIntrospectionCommand.h
index ba004085bb2d1820c5c66199c2963ee99cdf0adb..ffcd83478e4e3852d33586d6926a9e65f7032f91 100644
--- a/alib2cli/src/command/OverloadsIntrospectionCommand.h
+++ b/alib2cli/src/ast/command/OverloadsIntrospectionCommand.h
@@ -1,7 +1,7 @@
 #ifndef _CLI_OVERLOADS_INTROSPECTION_COMMAND_H_
 #define _CLI_OVERLOADS_INTROSPECTION_COMMAND_H_
 
-#include <command/Command.h>
+#include <ast/Command.h>
 #include <environment/Environment.h>
 
 namespace cli {
diff --git a/alib2cli/src/command/QuitCommand.h b/alib2cli/src/ast/command/QuitCommand.h
similarity index 95%
rename from alib2cli/src/command/QuitCommand.h
rename to alib2cli/src/ast/command/QuitCommand.h
index f18374f108c431999dbbac70c453149246a8aa86..e8aa5655b8ff039cc3ccedf63e369d520acc47ce 100644
--- a/alib2cli/src/command/QuitCommand.h
+++ b/alib2cli/src/ast/command/QuitCommand.h
@@ -1,7 +1,7 @@
 #ifndef _CLI_QUIT_COMMAND_H_
 #define _CLI_QUIT_COMMAND_H_
 
-#include <command/Command.h>
+#include <ast/Command.h>
 #include <environment/Environment.h>
 #include <ast/Statement.h>
 
diff --git a/alib2cli/src/command/SetCommand.h b/alib2cli/src/ast/command/SetCommand.h
similarity index 97%
rename from alib2cli/src/command/SetCommand.h
rename to alib2cli/src/ast/command/SetCommand.h
index bcdf4f6e19bc3e0cd7536f84af3cbf7f4e9cc3c8..91e7ca233496fbd8f7dde8b33492595e76540e7c 100644
--- a/alib2cli/src/command/SetCommand.h
+++ b/alib2cli/src/ast/command/SetCommand.h
@@ -1,7 +1,7 @@
 #ifndef _CLI_SET_COMMAND_H_
 #define _CLI_SET_COMMAND_H_
 
-#include <command/Command.h>
+#include <ast/Command.h>
 #include <environment/Environment.h>
 #include <global/GlobalData.h>
 #include <alib/random>
diff --git a/alib2cli/src/command/UnloadCommand.h b/alib2cli/src/ast/command/UnloadCommand.h
similarity index 94%
rename from alib2cli/src/command/UnloadCommand.h
rename to alib2cli/src/ast/command/UnloadCommand.h
index 470cb629ec7b240313f64dca1d075b5e76b749a9..bda3f450e08a5ced9dc9d253abee921e8c90b3cb 100644
--- a/alib2cli/src/command/UnloadCommand.h
+++ b/alib2cli/src/ast/command/UnloadCommand.h
@@ -1,7 +1,7 @@
 #ifndef _CLI_UNLOAD_COMMAND_H_
 #define _CLI_UNLOAD_COMMAND_H_
 
-#include <command/Command.h>
+#include <ast/Command.h>
 #include <environment/Environment.h>
 
 #include <common/LibraryLoader.h>
diff --git a/alib2cli/src/command/VariablesIntrospectionCommand.h b/alib2cli/src/ast/command/VariablesIntrospectionCommand.h
similarity index 96%
rename from alib2cli/src/command/VariablesIntrospectionCommand.h
rename to alib2cli/src/ast/command/VariablesIntrospectionCommand.h
index 2059838b9b5f095305e9b2404df62534cffaceae..b5167df2a0d2e47822ac80c73d25219bd2d98169 100644
--- a/alib2cli/src/command/VariablesIntrospectionCommand.h
+++ b/alib2cli/src/ast/command/VariablesIntrospectionCommand.h
@@ -1,7 +1,7 @@
 #ifndef _CLI_VARIABLES_INTROSPECTION_COMMAND_H_
 #define _CLI_VARIABLES_INTROSPECTION_COMMAND_H_
 
-#include <command/Command.h>
+#include <ast/Command.h>
 #include <environment/Environment.h>
 
 namespace cli {
diff --git a/alib2cli/src/environment/Environment.h b/alib2cli/src/environment/Environment.h
index 34822e85a79d516a3da7bc3b33b38c8cc59a017d..2f1aa555433aaf40805078647cd5cdba1431f0be 100644
--- a/alib2cli/src/environment/Environment.h
+++ b/alib2cli/src/environment/Environment.h
@@ -11,7 +11,7 @@
 #include <exception/CommonException.h>
 
 #include <abstraction/ValueHolder.hpp>
-#include <command/CommandResult.h>
+#include <ast/command/CommandResult.h>
 #include <lexer/CharSequence.h>
 
 namespace cli {
diff --git a/alib2cli/src/parser/Parser.cpp b/alib2cli/src/parser/Parser.cpp
index aba9526eba6a96fbcf64e77a795afa8da727297c..9adf10bf62a66f474825afab8ae09619adaee8fb 100644
--- a/alib2cli/src/parser/Parser.cpp
+++ b/alib2cli/src/parser/Parser.cpp
@@ -15,19 +15,19 @@
 #include <ast/args/BindedArg.h>
 #include <ast/args/ImmediateArg.h>
 
-#include <command/ExecuteCommand.h>
-#include <command/QuitCommand.h>
-#include <command/EOTCommand.h>
-#include <command/HelpCommand.h>
-#include <command/AlgorithmsIntrospectionCommand.h>
-#include <command/OverloadsIntrospectionCommand.h>
-#include <command/DataTypesIntrospectionCommand.h>
-#include <command/CastsIntrospectionCommand.h>
-#include <command/BindingsIntrospectionCommand.h>
-#include <command/VariablesIntrospectionCommand.h>
-#include <command/SetCommand.h>
-#include <command/LoadCommand.h>
-#include <command/UnloadCommand.h>
+#include <ast/command/ExecuteCommand.h>
+#include <ast/command/QuitCommand.h>
+#include <ast/command/EOTCommand.h>
+#include <ast/command/HelpCommand.h>
+#include <ast/command/AlgorithmsIntrospectionCommand.h>
+#include <ast/command/OverloadsIntrospectionCommand.h>
+#include <ast/command/DataTypesIntrospectionCommand.h>
+#include <ast/command/CastsIntrospectionCommand.h>
+#include <ast/command/BindingsIntrospectionCommand.h>
+#include <ast/command/VariablesIntrospectionCommand.h>
+#include <ast/command/SetCommand.h>
+#include <ast/command/LoadCommand.h>
+#include <ast/command/UnloadCommand.h>
 
 namespace cli {
 
diff --git a/alib2cli/src/parser/Parser.h b/alib2cli/src/parser/Parser.h
index eb66cd4d70bb5ec23a1a5c10b78d09b2c8e14c74..87a079185a670545a37c2e2e1a8cb0eb23dea0bf 100644
--- a/alib2cli/src/parser/Parser.h
+++ b/alib2cli/src/parser/Parser.h
@@ -8,7 +8,7 @@
 #include <ast/options/TypeOption.h>
 #include <ast/options/CategoryOption.h>
 
-#include <command/CommandList.h>
+#include <ast/command/CommandList.h>
 
 #include <ast/statements/StatementList.h>