diff --git a/ArmCtlListener.py b/ArmCtlListener.py
index 85060ae..83afe30 100644
--- a/ArmCtlListener.py
+++ b/ArmCtlListener.py
@@ -16,8 +16,8 @@ __status__ = "Prototype"
 
 
 import logging
-from ArmControlParser import ArmControlParser
-from ArmControlListener import ArmControlListener
+from language.ArmControlParser import ArmControlParser
+from language.ArmControlListener import ArmControlListener
 from robot import Robot
 from time import sleep
 
diff --git a/armCtl.py b/armCtl.py
index 1aa64b5..a5f50c6 100755
--- a/armCtl.py
+++ b/armCtl.py
@@ -22,8 +22,8 @@ from antlr4 import CommonTokenStream
 from antlr4 import InputStream
 from antlr4 import ParseTreeWalker
 from antlr4.error.ErrorListener import ErrorListener
-from ArmControlLexer import ArmControlLexer
-from ArmControlParser import ArmControlParser
+from language.ArmControlLexer import ArmControlLexer
+from language.ArmControlParser import ArmControlParser
 from ArmCtlListener import ArmCtlListener
 from robot import Robot
 
diff --git a/ArmControl.g4 b/language/ArmControl.g4
similarity index 100%
rename from ArmControl.g4
rename to language/ArmControl.g4
diff --git a/ArmControlLexer.py b/language/ArmControlLexer.py
similarity index 100%
rename from ArmControlLexer.py
rename to language/ArmControlLexer.py
diff --git a/ArmControlListener.py b/language/ArmControlListener.py
similarity index 100%
rename from ArmControlListener.py
rename to language/ArmControlListener.py
diff --git a/ArmControlParser.py b/language/ArmControlParser.py
similarity index 100%
rename from ArmControlParser.py
rename to language/ArmControlParser.py