3 files changed, 23 insertions, 11 deletions
diff --git a/etc/imports/rules.TARGETS b/etc/imports/rules.TARGETS
index 5b41441..d898f5d 100644
--- a/etc/imports/rules.TARGETS
+++ b/etc/imports/rules.TARGETS
@@ -1,6 +1,6 @@
 { "tree":
   { "type": "install"
-  , "dirs": [[["TREE", null, "rules"], "rules"]]
+  , "dirs": [[["@", "rules-rust", "", "tree"], "rules"]]
   , "tainted": ["test"]
   }
 }
diff --git a/etc/repos.json b/etc/repos.json
index 936a90b..90e92d4 100644
--- a/etc/repos.json
+++ b/etc/repos.json
@@ -1,14 +1,20 @@
-{ "main": "rust-rules"
+{ "main": "rules-rust"
 , "repositories":
-  { "rust-rules":
-    { "repository": {"type": "file", "path": "."}
-    , "bindings": {"test-rules": "rules-test", "rules-cc": "rules-cc"}
+  { "rules-rust": {"repository": {"type": "file", "path": "rules"}}
+  , "testing":
+    { "repository": {"type": "file", "path": "test"}
+    , "bindings":
+      { "rules-rust": "rules-rust"
+      , "test-rules": "rules-test"
+      , "rules-cc": "rules-cc"
+      }
     }
   , "imports": {"repository": {"type": "file", "path": "etc/imports"}}
   , "test-rules":
-    { "repository": "rust-rules"
+    { "repository": "testing"
     , "target_root": "imports"
     , "target_file_name": "rules.TARGETS"
+    , "bindings": {"rules-rust": "rules-rust"}
     }
   , "rules-cc":
     { "repository":
diff --git a/etc/repos.template.json b/etc/repos.template.json
index 2bf98e9..d6a5e7f 100644
--- a/etc/repos.template.json
+++ b/etc/repos.template.json
@@ -1,14 +1,20 @@
-{ "main": "rust-rules"
+{ "main": "rules-rust"
 , "repositories":
-  { "rust-rules":
-    { "repository": {"type": "file", "path": "."}
-    , "bindings": {"test-rules": "rules-test", "rules-cc": "rules-cc"}
+  { "rules-rust": {"repository": {"type": "file", "path": "rules"}}
+  , "testing":
+    { "repository": {"type": "file", "path": "test"}
+    , "bindings":
+      { "rules-rust": "rules-rust"
+      , "test-rules": "rules-test"
+      , "rules-cc": "rules-cc"
+      }
     }
   , "imports": {"repository": {"type": "file", "path": "etc/imports"}}
   , "test-rules":
-    { "repository": "rust-rules"
+    { "repository": "testing"
     , "target_root": "imports"
     , "target_file_name": "rules.TARGETS"
+    , "bindings": {"rules-rust": "rules-rust"}
     }
   }
 }