diff --git a/scripts/generate.sh b/scripts/generate.sh
index a43dcba..536db8f 100755
--- a/scripts/generate.sh
+++ b/scripts/generate.sh
@@ -6,7 +6,7 @@ if [[ ${GITHUB_REF_NAME} != "" ]]; then
     VERSION="$GITHUB_REF_NAME"
 fi
 
-sed "s/<GRAMMAR_VERSION>/$VERSION/g" rascript.tmLanguage.json > gen/rascript.tmLanguage.json
+sed "s/_GRAMMAR_VERSION_/$VERSION/g" syntaxes/rascript.tmLanguage.json > gen/rascript.tmLanguage.json
 plistutil -f xml -i gen/rascript.tmLanguage.json -o gen/rascript.tmLanguage
-sed "s/<GRAMMAR_VERSION>/$VERSION/g" RAScript.xml > gen/RAScript.xml
-sed "s/<GRAMMAR_VERSION>/$VERSION/g" rascript.js > gen/rascript.js
\ No newline at end of file
+sed "s/_GRAMMAR_VERSION_/$VERSION/g" syntaxes/RAScript.xml > gen/RAScript.xml
+sed "s/_GRAMMAR_VERSION_/$VERSION/g" syntaxes/rascript.js > gen/rascript.js
\ No newline at end of file
diff --git a/RAScript.xml b/syntaxes/RAScript.xml
similarity index 99%
rename from RAScript.xml
rename to syntaxes/RAScript.xml
index ff55acd..c82903e 100644
--- a/RAScript.xml
+++ b/syntaxes/RAScript.xml
@@ -62,7 +62,7 @@
             <WordsStyle name="DARK-HEADER-MINIMUMVERSION-VALUE" styleID="41" fgColor="B5CEA8" />
         </LexerType>
     </LexerStyles>
-    <RAScript version="<GRAMMAR_VERSION>">
+    <RAScript version="_GRAMMAR_VERSION_">
         <Token name="Variables" type="NORMAL" regex="([a-zA-Z_][\w]*)[\t ]*" lightStyle="1" darkStyle="2" />
         <Token name="Controls" type="NORMAL" regex="\b(if|else|for|in|return)\b" lightStyle="3" darkStyle="4" />
         <Token name="This" type="NORMAL" regex="\b(this)\b" lightStyle="5" darkStyle="6" />
diff --git a/rascript.js b/syntaxes/rascript.js
similarity index 99%
rename from rascript.js
rename to syntaxes/rascript.js
index 4e8b1f9..4624d8c 100644
--- a/rascript.js
+++ b/syntaxes/rascript.js
@@ -3,7 +3,7 @@ Language: RAScript
 Author: Joshua Raphael
 Description: Syntax grammar for RAScript, a RetroAchievements.org DSL
 Category: syntax
-Version: <GRAMMAR_VERSION>
+Version: _GRAMMAR_VERSION_
 */
 
 function ImportantWordRegex() {
diff --git a/rascript.tmLanguage.json b/syntaxes/rascript.tmLanguage.json
similarity index 99%
rename from rascript.tmLanguage.json
rename to syntaxes/rascript.tmLanguage.json
index ce9aec5..9763e35 100644
--- a/rascript.tmLanguage.json
+++ b/syntaxes/rascript.tmLanguage.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
-    "$version": "<GRAMMAR_VERSION>",
+    "version": "_GRAMMAR_VERSION_",
     "name": "RAScript",
     "patterns": [
         {