diff --git a/lexicons/org/tangled/repo/review/patch.json b/lexicons/org/tangled/review/patch.json
similarity index 94%
rename from lexicons/org/tangled/repo/review/patch.json
rename to lexicons/org/tangled/review/patch.json
index c8b9f1b4a..38dfc431b 100644
--- a/lexicons/org/tangled/repo/review/patch.json
+++ b/lexicons/org/tangled/review/patch.json
@@ -1,6 +1,6 @@
 {
   "lexicon": 1,
-  "id": "org.tangled.repo.review.patch",
+  "id": "org.tangled.review.patch",
   "defs": {
     "main": {
       "type": "record",
diff --git a/lexicons/org/tangled/repo/review/unspecced/defs.json b/lexicons/org/tangled/review/unspecced/defs.json
similarity index 80%
rename from lexicons/org/tangled/repo/review/unspecced/defs.json
rename to lexicons/org/tangled/review/unspecced/defs.json
index 1e8bad889..e54c7cca4 100644
--- a/lexicons/org/tangled/repo/review/unspecced/defs.json
+++ b/lexicons/org/tangled/review/unspecced/defs.json
@@ -1,6 +1,6 @@
 {
   "lexicon": 1,
-  "id": "org.tangled.repo.review.unspecced.defs",
+  "id": "org.tangled.review.unspecced.defs",
   "defs": {
     "reviewState": {
       "type": "string",
diff --git a/lexicons/org/tangled/repo/review/unspecced/round.json b/lexicons/org/tangled/review/unspecced/round.json
similarity index 100%
rename from lexicons/org/tangled/repo/review/unspecced/round.json
rename to lexicons/org/tangled/review/unspecced/round.json
diff --git a/lexicons/org/tangled/repo/track/defs.json b/lexicons/org/tangled/track/defs.json
similarity index 80%
rename from lexicons/org/tangled/repo/track/defs.json
rename to lexicons/org/tangled/track/defs.json
index 6a8c8936e..d79e9f124 100644
--- a/lexicons/org/tangled/repo/track/defs.json
+++ b/lexicons/org/tangled/track/defs.json
@@ -1,6 +1,6 @@
 {
   "lexicon": 1,
-  "id": "org.tangled.repo.track.defs",
+  "id": "org.tangled.track.defs",
   "defs": {
     "ticketState": {
       "type": "string",
diff --git a/lexicons/org/tangled/repo/track/ticket.json b/lexicons/org/tangled/track/ticket.json
similarity index 91%
rename from lexicons/org/tangled/repo/track/ticket.json
rename to lexicons/org/tangled/track/ticket.json
index 949e4187e..563c4094b 100644
--- a/lexicons/org/tangled/repo/track/ticket.json
+++ b/lexicons/org/tangled/track/ticket.json
@@ -1,6 +1,6 @@
 {
   "lexicon": 1,
-  "id": "org.tangled.repo.track.ticket",
+  "id": "org.tangled.track.ticket",
   "defs": {
     "main": {
       "type": "record",
@@ -21,13 +21,13 @@
           },
           "body": {
             "type": "union",
-            "ref": [
+            "refs": [
               "org.tangled.markup.markdown"
             ]
           },
           "state": {
             "type": "ref",
-            "ref": "org.tangled.repo.track.defs#ticketState"
+            "ref": "org.tangled.track.defs#ticketState"
           },
           "labels": {
             "type": "ref",
diff --git a/lexicons/org/tangled/repo/track/unspecced/milestone.json b/lexicons/org/tangled/track/unspecced/milestone.json
similarity index 79%
rename from lexicons/org/tangled/repo/track/unspecced/milestone.json
rename to lexicons/org/tangled/track/unspecced/milestone.json
index 6de814e73..b7dcdd3db 100644
--- a/lexicons/org/tangled/repo/track/unspecced/milestone.json
+++ b/lexicons/org/tangled/track/unspecced/milestone.json
@@ -1,6 +1,6 @@
 {
   "lexicon": 1,
-  "id": "org.tangled.repo.track.unspecced.milestone",
+  "id": "org.tangled.track.unspecced.milestone",
   "defs": {
     "main": {
       "type": "record",