diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..204610714
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "packages/kadira:flow-router"]
+	path = packages/kadira:flow-router
+	url = https://github.com/Serubin/flow-router.git
diff --git a/.meteor/packages b/.meteor/packages
index 32d7389c4..7ede40082 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -50,7 +50,6 @@ arillo:flow-router-helpers
 audit-argument-checks
 kadira:blaze-layout
 kadira:dochead
-kadira:flow-router
 meteorhacks:fast-render
 meteorhacks:picker
 meteorhacks:subs-manager
@@ -76,3 +75,4 @@ templates:tabs
 verron:autosize
 simple:json-routes
 rajit:bootstrap3-datepicker
+kadira:flow-router
diff --git a/app.env b/app.env
new file mode 100755
index 000000000..b047d258c
--- /dev/null
+++ b/app.env
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+export PACKAGE_DIRS="$(pwd)/packages"
diff --git a/package.json b/package.json
index 78b84ea87..fa8fb9d3c 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "The open-source Trello-like kanban",
   "private": true,
   "scripts": {
-    "lint": "eslint .",
+    "lint": "eslint --ignore-pattern 'packages/*' .",
     "test": "npm run --silent lint"
   },
   "repository": {
diff --git a/packages/kadira:flow-router b/packages/kadira:flow-router
new file mode 160000
index 000000000..da8154738
--- /dev/null
+++ b/packages/kadira:flow-router
@@ -0,0 +1 @@
+Subproject commit da8154738eddfe43a639bd6b5f400518a4142db3