diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..8cc77396d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "packages/useraccounts:core"]
+	path = packages/useraccounts:core
+	url = https://github.com/meteor-useraccounts/core.git
diff --git a/packages/kadira:flow-router b/packages/kadira:flow-router
deleted file mode 160000
index da8154738..000000000
--- a/packages/kadira:flow-router
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit da8154738eddfe43a639bd6b5f400518a4142db3