diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ab079b0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+bower_components
\ No newline at end of file
diff --git a/bower.json b/bower.json
new file mode 100644
index 0000000..b9ea847
--- /dev/null
+++ b/bower.json
@@ -0,0 +1,23 @@
+{
+  "name": "liquid-codemirror",
+  "homepage": "https://github.com/carsonreinke/codemirror_liquid_mode",
+  "authors": [
+    "Henning Kiel"
+  ],
+  "description": "A CodeMirror mode for the liquid template language",
+  "main": [
+    "mode/liquid/liquid.js",
+    "mode/liquid/liquid.css"
+  ],
+  "moduleType": [],
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "CodeMirror": ">=3.0"
+  }
+}
diff --git a/liquid.css b/mode/liquid/liquid.css
similarity index 100%
rename from liquid.css
rename to mode/liquid/liquid.css
diff --git a/liquid.js b/mode/liquid/liquid.js
similarity index 98%
rename from liquid.js
rename to mode/liquid/liquid.js
index c76c47c..eb1911b 100644
--- a/liquid.js
+++ b/mode/liquid/liquid.js
@@ -328,7 +328,7 @@ CodeMirror.defineMode("liquid", function(config, parserConfig) {
 CodeMirror.defineMIME("application/x-liquid-template", "liquid");
 
 CodeMirror.defineMode("htmlmixedliquid", function(config, parserConfig) {
-  return CodeMirror.overlayParser(CodeMirror.getMode(config, parserConfig.backdrop || "text/html"), CodeMirror.getMode(config, parserConfig.overlay || "application/x-liquid-template"));
+  return CodeMirror.overlayMode(CodeMirror.getMode(config, parserConfig.backdrop || "text/html"), CodeMirror.getMode(config, parserConfig.overlay || "application/x-liquid-template"), false);
 });
 
 // Compatibility with CodeMirror's formatting addon