diff --git a/setup.py b/setup.py
index 7fff74ec..49dda60e 100644
--- a/setup.py
+++ b/setup.py
@@ -120,7 +120,7 @@ def params():
 		"": "src"
 	}
 	package_data = {
-		"octoprint": octoprint_setuptools.package_data_dirs('src/octoprint', ['static', 'templates', 'plugins', 'translations'])
+		"octoprint": octoprint_setuptools.package_data_dirs('src/octoprint', ['static', 'templates', 'plugins', 'translations', 'grbl'])
 	}
 
 	include_package_data = True
diff --git a/grbl.hex b/src/octoprint/grbl/grbl.hex
similarity index 100%
rename from grbl.hex
rename to src/octoprint/grbl/grbl.hex
diff --git a/src/octoprint/util/grblVersionRequirement.yml b/src/octoprint/grbl/grblVersionRequirement.yml
similarity index 100%
rename from src/octoprint/util/grblVersionRequirement.yml
rename to src/octoprint/grbl/grblVersionRequirement.yml