diff --git a/api/client-server/v2_alpha/account-data.yaml b/api/client-server/account-data.yaml
similarity index 100%
rename from api/client-server/v2_alpha/account-data.yaml
rename to api/client-server/account-data.yaml
diff --git a/api/client-server/v1/application_service.yaml b/api/client-server/application_service.yaml
similarity index 100%
rename from api/client-server/v1/application_service.yaml
rename to api/client-server/application_service.yaml
diff --git a/api/client-server/v1/banning.yaml b/api/client-server/banning.yaml
similarity index 100%
rename from api/client-server/v1/banning.yaml
rename to api/client-server/banning.yaml
diff --git a/api/client-server/v1/content-repo.yaml b/api/client-server/content-repo.yaml
similarity index 100%
rename from api/client-server/v1/content-repo.yaml
rename to api/client-server/content-repo.yaml
diff --git a/api/client-server/v1/create_room.yaml b/api/client-server/create_room.yaml
similarity index 100%
rename from api/client-server/v1/create_room.yaml
rename to api/client-server/create_room.yaml
diff --git a/api/client-server/v1/definitions/error.yaml b/api/client-server/definitions/error.yaml
similarity index 100%
rename from api/client-server/v1/definitions/error.yaml
rename to api/client-server/definitions/error.yaml
diff --git a/api/client-server/v2_alpha/definitions/event.json b/api/client-server/definitions/event.json
similarity index 100%
rename from api/client-server/v2_alpha/definitions/event.json
rename to api/client-server/definitions/event.json
diff --git a/api/client-server/v2_alpha/definitions/event_batch.json b/api/client-server/definitions/event_batch.json
similarity index 100%
rename from api/client-server/v2_alpha/definitions/event_batch.json
rename to api/client-server/definitions/event_batch.json
diff --git a/api/client-server/v2_alpha/definitions/event_filter.json b/api/client-server/definitions/event_filter.json
similarity index 100%
rename from api/client-server/v2_alpha/definitions/event_filter.json
rename to api/client-server/definitions/event_filter.json
diff --git a/api/client-server/v1/definitions/push_condition.json b/api/client-server/definitions/push_condition.json
similarity index 100%
rename from api/client-server/v1/definitions/push_condition.json
rename to api/client-server/definitions/push_condition.json
diff --git a/api/client-server/v1/definitions/push_rule.json b/api/client-server/definitions/push_rule.json
similarity index 100%
rename from api/client-server/v1/definitions/push_rule.json
rename to api/client-server/definitions/push_rule.json
diff --git a/api/client-server/v1/definitions/push_ruleset.json b/api/client-server/definitions/push_ruleset.json
similarity index 100%
rename from api/client-server/v1/definitions/push_ruleset.json
rename to api/client-server/definitions/push_ruleset.json
diff --git a/api/client-server/v2_alpha/definitions/room_event_filter.json b/api/client-server/definitions/room_event_filter.json
similarity index 92%
rename from api/client-server/v2_alpha/definitions/room_event_filter.json
rename to api/client-server/definitions/room_event_filter.json
index 86375781..02e5d0e0 100644
--- a/api/client-server/v2_alpha/definitions/room_event_filter.json
+++ b/api/client-server/definitions/room_event_filter.json
@@ -1,6 +1,6 @@
 {
   "type": "object",
-  "allOf": [{"$ref": "definitions/event_filter.json"}],
+  "allOf": [{"$ref": "event_filter.json"}],
   "properties": {
     "rooms": {
       "type": "array",
diff --git a/api/client-server/v2_alpha/definitions/sync_filter.json b/api/client-server/definitions/sync_filter.json
similarity index 84%
rename from api/client-server/v2_alpha/definitions/sync_filter.json
rename to api/client-server/definitions/sync_filter.json
index 0cd6a798..defc318a 100644
--- a/api/client-server/v2_alpha/definitions/sync_filter.json
+++ b/api/client-server/definitions/sync_filter.json
@@ -7,24 +7,24 @@
         "state": {
           "description":
             "The state events to include for rooms.",
-          "allOf": [{"$ref": "definitions/room_event_filter.json"}]
+          "allOf": [{"$ref": "room_event_filter.json"}]
         },
         "timeline": {
           "description":
             "The message and state update events to include for rooms.",
-          "allOf": [{"$ref": "definitions/room_event_filter.json"}]
+          "allOf": [{"$ref": "room_event_filter.json"}]
         },
         "ephemeral": {
           "description":
             "The events that aren't recorded in the room history, e.g. typing and receipts, to include for rooms.",
-          "allOf": [{"$ref": "definitions/room_event_filter.json"}]
+          "allOf": [{"$ref": "room_event_filter.json"}]
         }
       }
     },
     "presence": {
       "description":
         "The presence updates to include.",
-      "allOf": [{"$ref": "definitions/event_filter.json"}]
+      "allOf": [{"$ref": "event_filter.json"}]
     },
     "event_format": {
       "description":
diff --git a/api/client-server/v2_alpha/definitions/timeline_batch.json b/api/client-server/definitions/timeline_batch.json
similarity index 87%
rename from api/client-server/v2_alpha/definitions/timeline_batch.json
rename to api/client-server/definitions/timeline_batch.json
index f27a5746..6f7e714a 100644
--- a/api/client-server/v2_alpha/definitions/timeline_batch.json
+++ b/api/client-server/definitions/timeline_batch.json
@@ -1,6 +1,6 @@
 {
   "type": "object",
-  "allOf": [{"$ref":"definitions/event_batch.json"}],
+  "allOf": [{"$ref":"event_batch.json"}],
   "properties": {
     "limited": {
       "type": "boolean",
diff --git a/api/client-server/v1/directory.yaml b/api/client-server/directory.yaml
similarity index 100%
rename from api/client-server/v1/directory.yaml
rename to api/client-server/directory.yaml
diff --git a/api/client-server/v2_alpha/filter.yaml b/api/client-server/filter.yaml
similarity index 100%
rename from api/client-server/v2_alpha/filter.yaml
rename to api/client-server/filter.yaml
diff --git a/api/client-server/v1/guest_events.yaml b/api/client-server/guest_events.yaml
similarity index 97%
rename from api/client-server/v1/guest_events.yaml
rename to api/client-server/guest_events.yaml
index bbb5799a..671b355a 100644
--- a/api/client-server/v1/guest_events.yaml
+++ b/api/client-server/guest_events.yaml
@@ -98,6 +98,6 @@ paths:
                   type: object
                   title: Event
                   allOf:
-                   - "$ref": "core-event-schema/room_event.json"
+                    - "$ref": "../../event-schemas/schema/core-event-schema/room_event.json"
         400:
           description: "Bad pagination ``from`` parameter."
diff --git a/api/client-server/v1/inviting.yaml b/api/client-server/inviting.yaml
similarity index 100%
rename from api/client-server/v1/inviting.yaml
rename to api/client-server/inviting.yaml
diff --git a/api/client-server/v1/joining.yaml b/api/client-server/joining.yaml
similarity index 100%
rename from api/client-server/v1/joining.yaml
rename to api/client-server/joining.yaml
diff --git a/api/client-server/v1/leaving.yaml b/api/client-server/leaving.yaml
similarity index 100%
rename from api/client-server/v1/leaving.yaml
rename to api/client-server/leaving.yaml
diff --git a/api/client-server/v1/list_public_rooms.yaml b/api/client-server/list_public_rooms.yaml
similarity index 100%
rename from api/client-server/v1/list_public_rooms.yaml
rename to api/client-server/list_public_rooms.yaml
diff --git a/api/client-server/v1/login.yaml b/api/client-server/login.yaml
similarity index 100%
rename from api/client-server/v1/login.yaml
rename to api/client-server/login.yaml
diff --git a/api/client-server/v1/message_pagination.yaml b/api/client-server/message_pagination.yaml
similarity index 100%
rename from api/client-server/v1/message_pagination.yaml
rename to api/client-server/message_pagination.yaml
diff --git a/api/client-server/v1/sync.yaml b/api/client-server/old_sync.yaml
similarity index 96%
rename from api/client-server/v1/sync.yaml
rename to api/client-server/old_sync.yaml
index 58cd5544..6dbe7e5e 100644
--- a/api/client-server/v1/sync.yaml
+++ b/api/client-server/old_sync.yaml
@@ -84,7 +84,7 @@ paths:
                   type: object
                   title: Event
                   allOf:
-                   - "$ref": "core-event-schema/room_event.json"
+                    - "$ref": "../../event-schemas/schema/core-event-schema/room_event.json"
         400:
           description: "Bad pagination ``from`` parameter."
   "/initialSync":
@@ -285,7 +285,7 @@ paths:
                   type: object
                   title: Event
                   allOf:
-                   - "$ref": "core-event-schema/event.json"
+                    - "$ref": "../../event-schemas/schema/core-event-schema/event.json"
               rooms:
                 type: array
                 items:
@@ -304,7 +304,7 @@ paths:
                         title: "InviteEvent"
                         description: "The invite event if ``membership`` is ``invite``"
                         allOf:
-                          - "$ref": "v1-event-schema/m.room.member"
+                          - "$ref": "../../event-schemas/schema/m.room.member"
                     messages:
                       type: object
                       title: PaginationChunk
@@ -332,7 +332,7 @@ paths:
                             type: object
                             title: RoomEvent
                             allOf:
-                              - "$ref": "core-event-schema/room_event.json"
+                              - "$ref": "../../event-schemas/schema/core-event-schema/room_event.json"
                       required: ["start", "end", "chunk"]
                     state:
                       type: array
@@ -345,7 +345,7 @@ paths:
                         title: StateEvent
                         type: object
                         allOf:
-                          - "$ref": "core-event-schema/state_event.json"
+                          - "$ref": "../../event-schemas/schema/core-event-schema/state_event.json"
                     visibility:
                       type: string
                       enum: ["private", "public"]
@@ -361,7 +361,7 @@ paths:
                         title: Event
                         type: object
                         allOf:
-                          - "$ref": "core-event-schema/event.json"
+                          - "$ref": "../../event-schemas/schema/core-event-schema/event.json"
                   required: ["room_id", "membership"]
             required: ["end", "rooms", "presence"]
         404:
@@ -398,6 +398,6 @@ paths:
               }
           schema:
             allOf:
-              - "$ref": "core-event-schema/event.json"
+              - "$ref": "../../event-schemas/schema/core-event-schema/event.json"
         404:
           description: The event was not found or you do not have permission to read this event.
diff --git a/api/client-server/v1/presence.yaml b/api/client-server/presence.yaml
similarity index 98%
rename from api/client-server/v1/presence.yaml
rename to api/client-server/presence.yaml
index 5684398b..33df17d2 100644
--- a/api/client-server/v1/presence.yaml
+++ b/api/client-server/presence.yaml
@@ -205,4 +205,4 @@ paths:
               type: object
               title: PresenceEvent
               allOf:
-                - "$ref": "core-event-schema/event.json"
+                - "$ref": "../../event-schemas/schema/core-event-schema/event.json"
diff --git a/api/client-server/v1/profile.yaml b/api/client-server/profile.yaml
similarity index 100%
rename from api/client-server/v1/profile.yaml
rename to api/client-server/profile.yaml
diff --git a/api/client-server/v1/push_notifier.yaml b/api/client-server/push_notifier.yaml
similarity index 100%
rename from api/client-server/v1/push_notifier.yaml
rename to api/client-server/push_notifier.yaml
diff --git a/api/client-server/v1/pusher.yaml b/api/client-server/pusher.yaml
similarity index 100%
rename from api/client-server/v1/pusher.yaml
rename to api/client-server/pusher.yaml
diff --git a/api/client-server/v1/pushrules.yaml b/api/client-server/pushrules.yaml
similarity index 100%
rename from api/client-server/v1/pushrules.yaml
rename to api/client-server/pushrules.yaml
diff --git a/api/client-server/v2_alpha/receipts.yaml b/api/client-server/receipts.yaml
similarity index 100%
rename from api/client-server/v2_alpha/receipts.yaml
rename to api/client-server/receipts.yaml
diff --git a/api/client-server/v2_alpha/registration.yaml b/api/client-server/registration.yaml
similarity index 100%
rename from api/client-server/v2_alpha/registration.yaml
rename to api/client-server/registration.yaml
diff --git a/api/client-server/v1/room_send.yaml b/api/client-server/room_send.yaml
similarity index 100%
rename from api/client-server/v1/room_send.yaml
rename to api/client-server/room_send.yaml
diff --git a/api/client-server/v1/room_state.yaml b/api/client-server/room_state.yaml
similarity index 100%
rename from api/client-server/v1/room_state.yaml
rename to api/client-server/room_state.yaml
diff --git a/api/client-server/v1/rooms.yaml b/api/client-server/rooms.yaml
similarity index 97%
rename from api/client-server/v1/rooms.yaml
rename to api/client-server/rooms.yaml
index ff5587a9..f7654f14 100644
--- a/api/client-server/v1/rooms.yaml
+++ b/api/client-server/rooms.yaml
@@ -173,7 +173,7 @@ paths:
               title: StateEvent
               type: object
               allOf:
-                - "$ref": "core-event-schema/state_event.json"
+                - "$ref": "../../event-schemas/schema/core-event-schema/state_event.json"
         403:
           description: >
             You aren't a member of the room and weren't previously a
@@ -355,7 +355,7 @@ paths:
                       type: object
                       title: RoomEvent
                       allOf:
-                        - "$ref": "core-event-schema/room_event.json"
+                        - "$ref": "../../event-schemas/schema/core-event-schema/room_event.json"
                 required: ["start", "end", "chunk"]
               state:
                 type: array
@@ -368,7 +368,7 @@ paths:
                   title: StateEvent
                   type: object
                   allOf:
-                    - "$ref": "core-event-schema/state_event.json"
+                    - "$ref": "../../event-schemas/schema/core-event-schema/state_event.json"
               visibility:
                 type: string
                 enum: ["private", "public"]
@@ -383,7 +383,7 @@ paths:
                   title: Event
                   type: object
                   allOf:
-                    - "$ref": "core-event-schema/event.json"
+                    - "$ref": "../../event-schemas/schema/core-event-schema/event.json"
             required: ["room_id"]
         403:
           description: >
@@ -453,7 +453,7 @@ paths:
                   title: MemberEvent
                   type: object
                   allOf:
-                    - "$ref": "v1-event-schema/m.room.member"
+                    - "$ref": "../../event-schemas/schema/m.room.member"
         403:
           description: >
             You aren't a member of the room and weren't previously a
diff --git a/api/client-server/v1/search.yaml b/api/client-server/search.yaml
similarity index 97%
rename from api/client-server/v1/search.yaml
rename to api/client-server/search.yaml
index cc299056..3da9486f 100644
--- a/api/client-server/v1/search.yaml
+++ b/api/client-server/search.yaml
@@ -111,7 +111,7 @@ paths:
                                 title: Event
                                 description: The event that matched.
                                 allOf:
-                                  - "$ref": "core-event-schema/room_event.json"
+                                  - "$ref": "../../event-schemas/schema/core-event-schema/room_event.json"
           examples:
             application/json: |-
                {
diff --git a/api/client-server/v2_alpha/sync.yaml b/api/client-server/sync.yaml
similarity index 100%
rename from api/client-server/v2_alpha/sync.yaml
rename to api/client-server/sync.yaml
diff --git a/api/client-server/v2_alpha/tags.yaml b/api/client-server/tags.yaml
similarity index 100%
rename from api/client-server/v2_alpha/tags.yaml
rename to api/client-server/tags.yaml
diff --git a/api/client-server/v1/third_party_membership.yaml b/api/client-server/third_party_membership.yaml
similarity index 100%
rename from api/client-server/v1/third_party_membership.yaml
rename to api/client-server/third_party_membership.yaml
diff --git a/api/client-server/v1/typing.yaml b/api/client-server/typing.yaml
similarity index 100%
rename from api/client-server/v1/typing.yaml
rename to api/client-server/typing.yaml
diff --git a/api/client-server/v1/core-event-schema b/api/client-server/v1/core-event-schema
deleted file mode 120000
index 045aecb0..00000000
--- a/api/client-server/v1/core-event-schema
+++ /dev/null
@@ -1 +0,0 @@
-v1-event-schema/core-event-schema
\ No newline at end of file
diff --git a/api/client-server/v1/v1-event-schema b/api/client-server/v1/v1-event-schema
deleted file mode 120000
index 7a0d0326..00000000
--- a/api/client-server/v1/v1-event-schema
+++ /dev/null
@@ -1 +0,0 @@
-../../../event-schemas/schema/v1
\ No newline at end of file
diff --git a/api/client-server/v2_alpha/definitions/definitions b/api/client-server/v2_alpha/definitions/definitions
deleted file mode 120000
index 945c9b46..00000000
--- a/api/client-server/v2_alpha/definitions/definitions
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/api/client-server/v2_alpha/definitions/error.yaml b/api/client-server/v2_alpha/definitions/error.yaml
deleted file mode 100644
index 20312ae4..00000000
--- a/api/client-server/v2_alpha/definitions/error.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-type: object
-description: A Matrix-level Error
-properties:
-  errcode:
-    type: string
-    description: An error code.
-  error:
-    type: string
-    description: A human-readable error message.
-required: ["errcode"]
\ No newline at end of file
diff --git a/api/client-server/v1/voip.yaml b/api/client-server/voip.yaml
similarity index 100%
rename from api/client-server/v1/voip.yaml
rename to api/client-server/voip.yaml
diff --git a/event-schemas/README.md b/event-schemas/README.md
index 1030a04c..950c3018 100644
--- a/event-schemas/README.md
+++ b/event-schemas/README.md
@@ -7,7 +7,7 @@ resolved correctly. For basic CLI testing, we recommend and have verified they
 work with the Node.js package [z-schema](https://github.com/zaggino/z-schema):
 ```
  $ npm install -g z-schema
- $ z-schema schema/v1/m.room.message examples/v1/m.room.message_m.text
+ $ z-schema schema/m.room.message examples/m.room.message_m.text
  schema validation passed
  json #1 validation passed
 ```
diff --git a/event-schemas/check.sh b/event-schemas/check.sh
index a6d03b5a..3d411768 100755
--- a/event-schemas/check.sh
+++ b/event-schemas/check.sh
@@ -6,17 +6,17 @@ if ! which z-schema; then
   exit 1
 fi
 
-find schema/v1/m.* | while read line
+find schema/m.* | while read line
 do
     split_path=(${line///// })
     event_type=(${split_path[2]})
     echo "Checking $event_type"
     echo "--------------------"
     # match exact name or exact name with a #<something>
-    find examples/v1 -name $event_type -o -name "$event_type#*" | while read exline
+    find examples -name $event_type -o -name "$event_type#*" | while read exline
     do
         echo "    against $exline"
         # run z-schema: because of bash -e if this fails we bail with exit code 1
-        z-schema schema/v1/$event_type $exline
+        z-schema schema/$event_type $exline
     done
 done
diff --git a/event-schemas/examples/v1/m.call.answer b/event-schemas/examples/m.call.answer
similarity index 100%
rename from event-schemas/examples/v1/m.call.answer
rename to event-schemas/examples/m.call.answer
diff --git a/event-schemas/examples/v1/m.call.candidates b/event-schemas/examples/m.call.candidates
similarity index 100%
rename from event-schemas/examples/v1/m.call.candidates
rename to event-schemas/examples/m.call.candidates
diff --git a/event-schemas/examples/v1/m.call.hangup b/event-schemas/examples/m.call.hangup
similarity index 100%
rename from event-schemas/examples/v1/m.call.hangup
rename to event-schemas/examples/m.call.hangup
diff --git a/event-schemas/examples/v1/m.call.invite b/event-schemas/examples/m.call.invite
similarity index 100%
rename from event-schemas/examples/v1/m.call.invite
rename to event-schemas/examples/m.call.invite
diff --git a/event-schemas/examples/v1/m.presence b/event-schemas/examples/m.presence
similarity index 100%
rename from event-schemas/examples/v1/m.presence
rename to event-schemas/examples/m.presence
diff --git a/event-schemas/examples/v1/m.receipt b/event-schemas/examples/m.receipt
similarity index 100%
rename from event-schemas/examples/v1/m.receipt
rename to event-schemas/examples/m.receipt
diff --git a/event-schemas/examples/v1/m.room.aliases b/event-schemas/examples/m.room.aliases
similarity index 100%
rename from event-schemas/examples/v1/m.room.aliases
rename to event-schemas/examples/m.room.aliases
diff --git a/event-schemas/examples/v1/m.room.avatar b/event-schemas/examples/m.room.avatar
similarity index 100%
rename from event-schemas/examples/v1/m.room.avatar
rename to event-schemas/examples/m.room.avatar
diff --git a/event-schemas/examples/v1/m.room.canonical_alias b/event-schemas/examples/m.room.canonical_alias
similarity index 100%
rename from event-schemas/examples/v1/m.room.canonical_alias
rename to event-schemas/examples/m.room.canonical_alias
diff --git a/event-schemas/examples/v1/m.room.create b/event-schemas/examples/m.room.create
similarity index 100%
rename from event-schemas/examples/v1/m.room.create
rename to event-schemas/examples/m.room.create
diff --git a/event-schemas/examples/v1/m.room.guest_access b/event-schemas/examples/m.room.guest_access
similarity index 100%
rename from event-schemas/examples/v1/m.room.guest_access
rename to event-schemas/examples/m.room.guest_access
diff --git a/event-schemas/examples/v1/m.room.history_visibility b/event-schemas/examples/m.room.history_visibility
similarity index 100%
rename from event-schemas/examples/v1/m.room.history_visibility
rename to event-schemas/examples/m.room.history_visibility
diff --git a/event-schemas/examples/v1/m.room.join_rules b/event-schemas/examples/m.room.join_rules
similarity index 100%
rename from event-schemas/examples/v1/m.room.join_rules
rename to event-schemas/examples/m.room.join_rules
diff --git a/event-schemas/examples/v1/m.room.member b/event-schemas/examples/m.room.member
similarity index 100%
rename from event-schemas/examples/v1/m.room.member
rename to event-schemas/examples/m.room.member
diff --git a/event-schemas/examples/v1/m.room.member#invite_room_state b/event-schemas/examples/m.room.member#invite_room_state
similarity index 100%
rename from event-schemas/examples/v1/m.room.member#invite_room_state
rename to event-schemas/examples/m.room.member#invite_room_state
diff --git a/event-schemas/examples/v1/m.room.member#third_party_invite b/event-schemas/examples/m.room.member#third_party_invite
similarity index 100%
rename from event-schemas/examples/v1/m.room.member#third_party_invite
rename to event-schemas/examples/m.room.member#third_party_invite
diff --git a/event-schemas/examples/v1/m.room.message#m.audio b/event-schemas/examples/m.room.message#m.audio
similarity index 100%
rename from event-schemas/examples/v1/m.room.message#m.audio
rename to event-schemas/examples/m.room.message#m.audio
diff --git a/event-schemas/examples/v1/m.room.message#m.emote b/event-schemas/examples/m.room.message#m.emote
similarity index 100%
rename from event-schemas/examples/v1/m.room.message#m.emote
rename to event-schemas/examples/m.room.message#m.emote
diff --git a/event-schemas/examples/v1/m.room.message#m.file b/event-schemas/examples/m.room.message#m.file
similarity index 100%
rename from event-schemas/examples/v1/m.room.message#m.file
rename to event-schemas/examples/m.room.message#m.file
diff --git a/event-schemas/examples/v1/m.room.message#m.image b/event-schemas/examples/m.room.message#m.image
similarity index 100%
rename from event-schemas/examples/v1/m.room.message#m.image
rename to event-schemas/examples/m.room.message#m.image
diff --git a/event-schemas/examples/v1/m.room.message#m.location b/event-schemas/examples/m.room.message#m.location
similarity index 100%
rename from event-schemas/examples/v1/m.room.message#m.location
rename to event-schemas/examples/m.room.message#m.location
diff --git a/event-schemas/examples/v1/m.room.message#m.notice b/event-schemas/examples/m.room.message#m.notice
similarity index 100%
rename from event-schemas/examples/v1/m.room.message#m.notice
rename to event-schemas/examples/m.room.message#m.notice
diff --git a/event-schemas/examples/v1/m.room.message#m.text b/event-schemas/examples/m.room.message#m.text
similarity index 100%
rename from event-schemas/examples/v1/m.room.message#m.text
rename to event-schemas/examples/m.room.message#m.text
diff --git a/event-schemas/examples/v1/m.room.message#m.video b/event-schemas/examples/m.room.message#m.video
similarity index 100%
rename from event-schemas/examples/v1/m.room.message#m.video
rename to event-schemas/examples/m.room.message#m.video
diff --git a/event-schemas/examples/v1/m.room.message.feedback b/event-schemas/examples/m.room.message.feedback
similarity index 100%
rename from event-schemas/examples/v1/m.room.message.feedback
rename to event-schemas/examples/m.room.message.feedback
diff --git a/event-schemas/examples/v1/m.room.name b/event-schemas/examples/m.room.name
similarity index 100%
rename from event-schemas/examples/v1/m.room.name
rename to event-schemas/examples/m.room.name
diff --git a/event-schemas/examples/v1/m.room.power_levels b/event-schemas/examples/m.room.power_levels
similarity index 100%
rename from event-schemas/examples/v1/m.room.power_levels
rename to event-schemas/examples/m.room.power_levels
diff --git a/event-schemas/examples/v1/m.room.redaction b/event-schemas/examples/m.room.redaction
similarity index 100%
rename from event-schemas/examples/v1/m.room.redaction
rename to event-schemas/examples/m.room.redaction
diff --git a/event-schemas/examples/v1/m.room.third_party_invite b/event-schemas/examples/m.room.third_party_invite
similarity index 100%
rename from event-schemas/examples/v1/m.room.third_party_invite
rename to event-schemas/examples/m.room.third_party_invite
diff --git a/event-schemas/examples/v1/m.room.topic b/event-schemas/examples/m.room.topic
similarity index 100%
rename from event-schemas/examples/v1/m.room.topic
rename to event-schemas/examples/m.room.topic
diff --git a/event-schemas/examples/v1/m.tag b/event-schemas/examples/m.tag
similarity index 100%
rename from event-schemas/examples/v1/m.tag
rename to event-schemas/examples/m.tag
diff --git a/event-schemas/examples/v1/m.typing b/event-schemas/examples/m.typing
similarity index 100%
rename from event-schemas/examples/v1/m.typing
rename to event-schemas/examples/m.typing
diff --git a/event-schemas/schema/v1/core-event-schema/event.json b/event-schemas/schema/core-event-schema/event.json
similarity index 100%
rename from event-schemas/schema/v1/core-event-schema/event.json
rename to event-schemas/schema/core-event-schema/event.json
diff --git a/event-schemas/schema/v1/core-event-schema/msgtype_infos/image_info.json b/event-schemas/schema/core-event-schema/msgtype_infos/image_info.json
similarity index 100%
rename from event-schemas/schema/v1/core-event-schema/msgtype_infos/image_info.json
rename to event-schemas/schema/core-event-schema/msgtype_infos/image_info.json
diff --git a/event-schemas/schema/v1/core-event-schema/room_event.json b/event-schemas/schema/core-event-schema/room_event.json
similarity index 93%
rename from event-schemas/schema/v1/core-event-schema/room_event.json
rename to event-schemas/schema/core-event-schema/room_event.json
index d5413f8a..80f7d265 100644
--- a/event-schemas/schema/v1/core-event-schema/room_event.json
+++ b/event-schemas/schema/core-event-schema/room_event.json
@@ -3,7 +3,7 @@
   "title": "Room Event",
   "description": "In addition to the Event fields, Room Events MUST have the following additional field.",
   "allOf":[{
-    "$ref": "core-event-schema/event.json"
+    "$ref": "event.json"
   }],
   "properties": {
     "room_id": {
diff --git a/event-schemas/schema/v1/core-event-schema/state_event.json b/event-schemas/schema/core-event-schema/state_event.json
similarity index 93%
rename from event-schemas/schema/v1/core-event-schema/state_event.json
rename to event-schemas/schema/core-event-schema/state_event.json
index 5809cf7f..cfcb212c 100644
--- a/event-schemas/schema/v1/core-event-schema/state_event.json
+++ b/event-schemas/schema/core-event-schema/state_event.json
@@ -3,7 +3,7 @@
   "title": "State Event",
   "description": "In addition to the Room Event fields, State Events have the following additional fields.",
   "allOf":[{
-    "$ref": "core-event-schema/room_event.json"
+    "$ref": "room_event.json"
   }],
   "properties": {
     "state_key": {
diff --git a/event-schemas/schema/v1/m.call.answer b/event-schemas/schema/m.call.answer
similarity index 100%
rename from event-schemas/schema/v1/m.call.answer
rename to event-schemas/schema/m.call.answer
diff --git a/event-schemas/schema/v1/m.call.candidates b/event-schemas/schema/m.call.candidates
similarity index 100%
rename from event-schemas/schema/v1/m.call.candidates
rename to event-schemas/schema/m.call.candidates
diff --git a/event-schemas/schema/v1/m.call.hangup b/event-schemas/schema/m.call.hangup
similarity index 100%
rename from event-schemas/schema/v1/m.call.hangup
rename to event-schemas/schema/m.call.hangup
diff --git a/event-schemas/schema/v1/m.call.invite b/event-schemas/schema/m.call.invite
similarity index 100%
rename from event-schemas/schema/v1/m.call.invite
rename to event-schemas/schema/m.call.invite
diff --git a/event-schemas/schema/v1/m.presence b/event-schemas/schema/m.presence
similarity index 100%
rename from event-schemas/schema/v1/m.presence
rename to event-schemas/schema/m.presence
diff --git a/event-schemas/schema/v1/m.receipt b/event-schemas/schema/m.receipt
similarity index 100%
rename from event-schemas/schema/v1/m.receipt
rename to event-schemas/schema/m.receipt
diff --git a/event-schemas/schema/v1/m.room.aliases b/event-schemas/schema/m.room.aliases
similarity index 100%
rename from event-schemas/schema/v1/m.room.aliases
rename to event-schemas/schema/m.room.aliases
diff --git a/event-schemas/schema/v1/m.room.avatar b/event-schemas/schema/m.room.avatar
similarity index 100%
rename from event-schemas/schema/v1/m.room.avatar
rename to event-schemas/schema/m.room.avatar
diff --git a/event-schemas/schema/v1/m.room.canonical_alias b/event-schemas/schema/m.room.canonical_alias
similarity index 100%
rename from event-schemas/schema/v1/m.room.canonical_alias
rename to event-schemas/schema/m.room.canonical_alias
diff --git a/event-schemas/schema/v1/m.room.create b/event-schemas/schema/m.room.create
similarity index 100%
rename from event-schemas/schema/v1/m.room.create
rename to event-schemas/schema/m.room.create
diff --git a/event-schemas/schema/v1/m.room.guest_access b/event-schemas/schema/m.room.guest_access
similarity index 100%
rename from event-schemas/schema/v1/m.room.guest_access
rename to event-schemas/schema/m.room.guest_access
diff --git a/event-schemas/schema/v1/m.room.history_visibility b/event-schemas/schema/m.room.history_visibility
similarity index 100%
rename from event-schemas/schema/v1/m.room.history_visibility
rename to event-schemas/schema/m.room.history_visibility
diff --git a/event-schemas/schema/v1/m.room.join_rules b/event-schemas/schema/m.room.join_rules
similarity index 100%
rename from event-schemas/schema/v1/m.room.join_rules
rename to event-schemas/schema/m.room.join_rules
diff --git a/event-schemas/schema/v1/m.room.member b/event-schemas/schema/m.room.member
similarity index 100%
rename from event-schemas/schema/v1/m.room.member
rename to event-schemas/schema/m.room.member
diff --git a/event-schemas/schema/v1/m.room.message b/event-schemas/schema/m.room.message
similarity index 100%
rename from event-schemas/schema/v1/m.room.message
rename to event-schemas/schema/m.room.message
diff --git a/event-schemas/schema/v1/m.room.message#m.audio b/event-schemas/schema/m.room.message#m.audio
similarity index 100%
rename from event-schemas/schema/v1/m.room.message#m.audio
rename to event-schemas/schema/m.room.message#m.audio
diff --git a/event-schemas/schema/v1/m.room.message#m.emote b/event-schemas/schema/m.room.message#m.emote
similarity index 100%
rename from event-schemas/schema/v1/m.room.message#m.emote
rename to event-schemas/schema/m.room.message#m.emote
diff --git a/event-schemas/schema/v1/m.room.message#m.file b/event-schemas/schema/m.room.message#m.file
similarity index 100%
rename from event-schemas/schema/v1/m.room.message#m.file
rename to event-schemas/schema/m.room.message#m.file
diff --git a/event-schemas/schema/v1/m.room.message#m.image b/event-schemas/schema/m.room.message#m.image
similarity index 100%
rename from event-schemas/schema/v1/m.room.message#m.image
rename to event-schemas/schema/m.room.message#m.image
diff --git a/event-schemas/schema/v1/m.room.message#m.location b/event-schemas/schema/m.room.message#m.location
similarity index 100%
rename from event-schemas/schema/v1/m.room.message#m.location
rename to event-schemas/schema/m.room.message#m.location
diff --git a/event-schemas/schema/v1/m.room.message#m.notice b/event-schemas/schema/m.room.message#m.notice
similarity index 100%
rename from event-schemas/schema/v1/m.room.message#m.notice
rename to event-schemas/schema/m.room.message#m.notice
diff --git a/event-schemas/schema/v1/m.room.message#m.text b/event-schemas/schema/m.room.message#m.text
similarity index 100%
rename from event-schemas/schema/v1/m.room.message#m.text
rename to event-schemas/schema/m.room.message#m.text
diff --git a/event-schemas/schema/v1/m.room.message#m.video b/event-schemas/schema/m.room.message#m.video
similarity index 100%
rename from event-schemas/schema/v1/m.room.message#m.video
rename to event-schemas/schema/m.room.message#m.video
diff --git a/event-schemas/schema/v1/m.room.message.feedback b/event-schemas/schema/m.room.message.feedback
similarity index 100%
rename from event-schemas/schema/v1/m.room.message.feedback
rename to event-schemas/schema/m.room.message.feedback
diff --git a/event-schemas/schema/v1/m.room.name b/event-schemas/schema/m.room.name
similarity index 100%
rename from event-schemas/schema/v1/m.room.name
rename to event-schemas/schema/m.room.name
diff --git a/event-schemas/schema/v1/m.room.power_levels b/event-schemas/schema/m.room.power_levels
similarity index 100%
rename from event-schemas/schema/v1/m.room.power_levels
rename to event-schemas/schema/m.room.power_levels
diff --git a/event-schemas/schema/v1/m.room.redaction b/event-schemas/schema/m.room.redaction
similarity index 100%
rename from event-schemas/schema/v1/m.room.redaction
rename to event-schemas/schema/m.room.redaction
diff --git a/event-schemas/schema/v1/m.room.third_party_invite b/event-schemas/schema/m.room.third_party_invite
similarity index 100%
rename from event-schemas/schema/v1/m.room.third_party_invite
rename to event-schemas/schema/m.room.third_party_invite
diff --git a/event-schemas/schema/v1/m.room.topic b/event-schemas/schema/m.room.topic
similarity index 100%
rename from event-schemas/schema/v1/m.room.topic
rename to event-schemas/schema/m.room.topic
diff --git a/event-schemas/schema/v1/m.tag b/event-schemas/schema/m.tag
similarity index 100%
rename from event-schemas/schema/v1/m.tag
rename to event-schemas/schema/m.tag
diff --git a/event-schemas/schema/v1/m.typing b/event-schemas/schema/m.typing
similarity index 100%
rename from event-schemas/schema/v1/m.typing
rename to event-schemas/schema/m.typing
diff --git a/event-schemas/schema/v1/core-event-schema/core-event-schema b/event-schemas/schema/v1/core-event-schema/core-event-schema
deleted file mode 120000
index 945c9b46..00000000
--- a/event-schemas/schema/v1/core-event-schema/core-event-schema
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/event-schemas/schema/v1/v1-event-schema b/event-schemas/schema/v1/v1-event-schema
deleted file mode 120000
index 945c9b46..00000000
--- a/event-schemas/schema/v1/v1-event-schema
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/jenkins.sh b/jenkins.sh
index f5ed3b15..abafefa8 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -5,7 +5,7 @@ set -ex
 (cd event-schemas/ && ./check_examples.py)
 (cd api && ./check_examples.py)
 (cd scripts && ./gendoc.py -v)
-(cd api && npm install && node validator.js -s "client-server/v1" && node validator.js -s "client-server/v2_alpha")
+(cd api && npm install && node validator.js -s "client-server")
 (cd event-schemas/ && ./check.sh)
 
 : ${GOPATH:=${WORKSPACE}/.gopath}
diff --git a/scripts/generate-http-docs.sh b/scripts/generate-http-docs.sh
index 0a2bc5f6..b3894a2c 100755
--- a/scripts/generate-http-docs.sh
+++ b/scripts/generate-http-docs.sh
@@ -18,7 +18,7 @@ This contains the client-server API for the reference implementation of the home
 
 EOF
 
-for f in ../api/client-server/*/*.yaml; do
+for f in ../api/client-server/*.yaml; do
   f="$(basename "${f/.yaml/_http_api}")"
   echo "{{${f/-/_}}}" >> tmp/http_apis
 done
diff --git a/specification/client_server_api.rst b/specification/client_server_api.rst
index 134c12c3..f43daa7b 100644
--- a/specification/client_server_api.rst
+++ b/specification/client_server_api.rst
@@ -468,7 +468,7 @@ This section refers to API Version 2. These API calls currently use the prefix
 
 .. _User-Interactive Authentication: `sect:auth-api`_
 
-{{v2_registration_http_api}}
+{{registration_http_api}}
 
 Old V1 API docs: |register|_
 
@@ -769,9 +769,9 @@ When the client first logs in, they will need to initially synchronise with
 their home server. This is achieved via the initial sync API described below.
 This API also returns an ``end`` token which can be used with the event stream.
 
-{{sync_http_api}}
+{{old_sync_http_api}}
 
-{{v2_sync_http_api}}
+{{sync_http_api}}
 
 
 Getting events for a room
diff --git a/specification/modules/account_data.rst b/specification/modules/account_data.rst
index 784bc874..f3fc72b6 100644
--- a/specification/modules/account_data.rst
+++ b/specification/modules/account_data.rst
@@ -24,4 +24,4 @@ the tags are for.
 Client Behaviour
 ----------------
 
-{{v2_account_data_http_api}}
+{{account_data_http_api}}
diff --git a/specification/modules/receipts.rst b/specification/modules/receipts.rst
index a8ad3cd3..702a7275 100644
--- a/specification/modules/receipts.rst
+++ b/specification/modules/receipts.rst
@@ -52,7 +52,7 @@ dismissing a notification in order for the event to count as "read".
 A client can update the markers for its user by interacting with the following
 HTTP APIs.
 
-{{v2_receipts_http_api}}
+{{receipts_http_api}}
 
 Server behaviour
 ----------------
diff --git a/specification/modules/tags.rst b/specification/modules/tags.rst
index bb467bc0..f8c28c55 100644
--- a/specification/modules/tags.rst
+++ b/specification/modules/tags.rst
@@ -45,4 +45,4 @@ Two special names are listed in the specification:
 Client Behaviour
 ----------------
 
-{{v2_tags_http_api}}
+{{tags_http_api}}
diff --git a/templating/matrix_templates/units.py b/templating/matrix_templates/units.py
index 75a12a5b..06994082 100644
--- a/templating/matrix_templates/units.py
+++ b/templating/matrix_templates/units.py
@@ -17,11 +17,10 @@ import subprocess
 import urllib
 import yaml
 
-V1_CLIENT_API = "../api/client-server/v1"
-V1_EVENT_EXAMPLES = "../event-schemas/examples/v1"
-V1_EVENT_SCHEMA = "../event-schemas/schema/v1"
-V2_CLIENT_API = "../api/client-server/v2_alpha"
-CORE_EVENT_SCHEMA = "../event-schemas/schema/v1/core-event-schema"
+HTTP_APIS = "../api/client-server"
+V1_EVENT_EXAMPLES = "../event-schemas/examples"
+V1_EVENT_SCHEMA = "../event-schemas/schema"
+CORE_EVENT_SCHEMA = "../event-schemas/schema/core-event-schema"
 CHANGELOG = "../CHANGELOG.rst"
 TARGETS = "../specification/targets.yaml"
 
@@ -549,30 +548,21 @@ class MatrixUnits(Units):
         }
 
     def load_swagger_apis(self):
-        paths = [
-            V1_CLIENT_API, V2_CLIENT_API
-        ]
         apis = {}
-        for path in paths:
-            is_v2 = (path == V2_CLIENT_API)
-            if not os.path.exists(V2_CLIENT_API):
-                self.log("Skipping v2 apis: %s does not exist." % V2_CLIENT_API)
+        path = HTTP_APIS
+        for filename in os.listdir(path):
+            if not filename.endswith(".yaml"):
                 continue
-            for filename in os.listdir(path):
-                if not filename.endswith(".yaml"):
-                    continue
-                self.log("Reading swagger API: %s" % filename)
-                filepath = os.path.join(path, filename)
-                with open(filepath, "r") as f:
-                    # strip .yaml
-                    group_name = filename[:-5].replace("-", "_")
-                    if is_v2:
-                        group_name = "v2_" + group_name
-                    api = yaml.load(f.read())
-                    api["__meta"] = self._load_swagger_meta(
-                        filepath, api, group_name
-                    )
-                    apis[group_name] = api
+            self.log("Reading swagger API: %s" % filename)
+            filepath = os.path.join(path, filename)
+            with open(filepath, "r") as f:
+                # strip .yaml
+                group_name = filename[:-5].replace("-", "_")
+                api = yaml.load(f.read())
+                api["__meta"] = self._load_swagger_meta(
+                    filepath, api, group_name
+                )
+                apis[group_name] = api
         return apis
 
     def load_common_event_fields(self):