diff --git a/api/src/database/seeds/01-tables/07-files.yaml b/api/src/database/seeds/01-tables/07-files.yaml
index b68f211774..c084a846eb 100644
--- a/api/src/database/seeds/01-tables/07-files.yaml
+++ b/api/src/database/seeds/01-tables/07-files.yaml
@@ -35,6 +35,13 @@ columns:
     type: timestamp
     nullable: false
     default: '$now'
+  modified_by:
+    type: uuid
+    references:
+      table: directus_users
+      column: id
+  modified_on:
+    type: timestamp
   charset:
     type: string
     length: 50
diff --git a/api/src/database/seeds/03-fields/02-roles.yaml b/api/src/database/seeds/03-fields/02-roles.yaml
index 91ccdc4b79..3a59c5936e 100644
--- a/api/src/database/seeds/03-fields/02-roles.yaml
+++ b/api/src/database/seeds/03-fields/02-roles.yaml
@@ -77,7 +77,7 @@ fields:
     locked: true
     options:
       template: '{{ name }}'
-      createItemText: Add Module
+      addLabel: Add New Module...
       fields:
         - name: Icon
           field: icon
@@ -112,7 +112,7 @@ fields:
     locked: true
     options:
       template: '{{ group_name }}'
-      createItemText: Add Group
+      addLabel: Add New Group...
       fields:
         - name: Group Name
           field: group_name
@@ -123,7 +123,9 @@ fields:
             options:
               iconRight: title
               placeholder: Label this group...
-        - name: Accordion
+          schema:
+            is_nullable: false
+        - name: Type
           field: accordion
           type: string
           schema:
@@ -145,7 +147,7 @@ fields:
           meta:
             interface: repeater
             options:
-              createItemText: Add Collection
+              addLabel: Add New Collection...
               template: '{{ collection }}'
               fields:
                 - name: Collection
@@ -154,6 +156,8 @@ fields:
                   meta:
                     interface: collection
                     width: full
+                  schema:
+                    is_nullable: false
     special: json
     sort: 10
     width: full
diff --git a/api/src/database/seeds/03-fields/05-files.yaml b/api/src/database/seeds/03-fields/05-files.yaml
index f36cf0561e..27554000c0 100644
--- a/api/src/database/seeds/03-fields/05-files.yaml
+++ b/api/src/database/seeds/03-fields/05-files.yaml
@@ -33,6 +33,7 @@ fields:
     special: json
     sort: 3
     width: full
+    display: tags
   - collection: directus_files
     field: location
     interface: text-input
@@ -91,3 +92,23 @@ fields:
   - collection: directus_files
     field: filesize
     display: filesize
+  - collection: directus_files
+    field: modified_by
+    interface: user
+    locked: true
+    special: user-updated
+    width: half
+    display: user
+  - collection: directus_files
+    field: modified_on
+    interface: dateTime
+    locked: true
+    special: date-updated
+    width: half
+    display: datetime
+  - collection: directus_files
+    field: created_on
+    display: datetime
+  - collection: directus_files
+    field: created_by
+    display: user
\ No newline at end of file
diff --git a/api/src/utils/get-ast-from-query.ts b/api/src/utils/get-ast-from-query.ts
index 824d595292..40a1ab158c 100644
--- a/api/src/utils/get-ast-from-query.ts
+++ b/api/src/utils/get-ast-from-query.ts
@@ -133,11 +133,13 @@ export default async function getASTFromQuery(
 	}
 
 	async function convertWildcards(parentCollection: string, fields: string[]) {
+		const fieldsInCollection = await getFieldsInCollection(parentCollection);
+
 		const allowedFields = permissions
 			? permissions
 					.find((permission) => parentCollection === permission.collection)
 					?.fields?.split(',')
-			: ['*'];
+			: fieldsInCollection;
 
 		if (!allowedFields || allowedFields.length === 0) return [];
 
@@ -149,7 +151,6 @@ export default async function getASTFromQuery(
 			if (fieldKey === '*') {
 				// Set to all fields in collection
 				if (allowedFields.includes('*')) {
-					const fieldsInCollection = await getFieldsInCollection(parentCollection);
 					fields.splice(index, 1, ...fieldsInCollection);
 				} else {
 					// Set to all allowed fields
diff --git a/app/src/components/v-list/v-list-group.vue b/app/src/components/v-list/v-list-group.vue
index bf9f904e21..cc1cf7f8e2 100644
--- a/app/src/components/v-list/v-list-group.vue
+++ b/app/src/components/v-list/v-list-group.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="v-list-group">
-		<v-list-item :active="active" class="activator" :to="to" :exact="exact" @click="onClick" :disabled="disabled">
+		<v-list-item :active="active" class="activator" :to="to" :exact="exact" @click="onClick" :disabled="disabled" :dense="dense">
 			<slot name="activator" :active="groupActive" />
 
 			<v-list-item-icon class="activator-icon" :class="{ active: groupActive }" v-if="$slots.default">
@@ -15,8 +15,8 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, toRefs, watch } from '@vue/composition-api';
-import { useGroupableParent, useGroupable } from '@/composables/groupable';
+import { defineComponent, nextTick, toRefs, watch, PropType, ref } from '@vue/composition-api';
+import { useGroupable } from '@/composables/groupable';
 
 export default defineComponent({
 	props: {
@@ -40,10 +40,6 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
-		disableGroupableParent: {
-			type: Boolean,
-			default: false,
-		},
 		scope: {
 			type: String,
 			default: undefined,
@@ -52,22 +48,19 @@ export default defineComponent({
 			type: [String, Number],
 			default: undefined,
 		},
+		dense: {
+			type: Boolean,
+			default: false
+		}
 	},
 	setup(props, { listeners, emit }) {
+		const {multiple} = toRefs(props)
+
 		const { active: groupActive, toggle, activate, deactivate } = useGroupable({
 			group: props.scope,
 			value: props.value,
 		});
 
-		if (props.disableGroupableParent !== true) {
-			useGroupableParent(
-				{},
-				{
-					multiple: toRefs(props).multiple,
-				}
-			);
-		}
-
 		return { groupActive, toggle, onClick };
 
 		function onClick(event: MouseEvent) {
diff --git a/app/src/components/v-list/v-list-item.vue b/app/src/components/v-list/v-list-item.vue
index f088a31625..ad40eaa716 100644
--- a/app/src/components/v-list/v-list-item.vue
+++ b/app/src/components/v-list/v-list-item.vue
@@ -25,6 +25,7 @@
 <script lang="ts">
 import { Location } from 'vue-router';
 import { defineComponent, PropType, computed } from '@vue/composition-api';
+import { useGroupable } from '@/composables/groupable';
 
 export default defineComponent({
 	props: {
@@ -64,6 +65,10 @@ export default defineComponent({
 			type: String,
 			default: null,
 		},
+		value: {
+			type: [String, Number],
+			default: undefined,
+		}
 	},
 	setup(props, { listeners }) {
 		const component = computed<string>(() => {
@@ -72,6 +77,10 @@ export default defineComponent({
 			return 'li';
 		});
 
+		const { active: groupActive, toggle, activate, deactivate } = useGroupable({
+			value: props.value,
+		});
+
 		const isClickable = computed(() => Boolean(props.to || props.href || listeners.click !== undefined));
 
 		return { component, isClickable };
diff --git a/app/src/components/v-list/v-list.vue b/app/src/components/v-list/v-list.vue
index 9a6391a092..ca9ce37814 100644
--- a/app/src/components/v-list/v-list.vue
+++ b/app/src/components/v-list/v-list.vue
@@ -9,7 +9,15 @@ import { defineComponent, PropType, ref, toRefs } from '@vue/composition-api';
 import { useGroupableParent } from '@/composables/groupable';
 
 export default defineComponent({
+	model: {
+		prop: 'activeItems',
+		event: 'input'
+	},
 	props: {
+		activeItems: {
+			type: Array as PropType<(number | string)[]>,
+			default: () => []
+		},
 		large: {
 			type: Boolean,
 			default: false,
@@ -18,13 +26,23 @@ export default defineComponent({
 			type: Boolean,
 			default: true,
 		},
+		mandatory: {
+			type: Boolean,
+			default: true,
+		},
 	},
-	setup(props) {
+	setup(props, {emit}) {
+		const {activeItems, multiple, mandatory} = toRefs(props)
 		useGroupableParent(
-			{},
 			{
-				mandatory: ref(false),
-				multiple: toRefs(props).multiple,
+				selection: activeItems,
+				onSelectionChange: (newSelection) => {
+					emit('input', newSelection)
+				}
+			},
+			{
+				mandatory,
+				multiple
 			}
 		);
 
diff --git a/app/src/composables/use-shortcut/use-shortcut.ts b/app/src/composables/use-shortcut/use-shortcut.ts
index df599afee5..3e682e9b9c 100644
--- a/app/src/composables/use-shortcut/use-shortcut.ts
+++ b/app/src/composables/use-shortcut/use-shortcut.ts
@@ -83,9 +83,14 @@ function mapKeys(key: string) {
 
 function callHandlers(event: KeyboardEvent) {
 	Object.entries(handlers).forEach(([key, value]) => {
-		const rest = key.split('+').filter((keySegment) => keysdown.has(keySegment) === false);
+		const keys = key.split('+')
 
-		if (rest.length > 0) return;
+		for(key of keysdown) {
+			if(keys.includes(key) === false) return;
+		}
+		for(key of keys) {
+			if(keysdown.has(key) === false) return;
+		}
 
 		for (let i = 0; i < value.length; i++) {
 			let cancel = false;
diff --git a/app/src/interfaces/repeater/repeater-row-header.vue b/app/src/interfaces/repeater/repeater-row-header.vue
index 69552018aa..e349408bf5 100644
--- a/app/src/interfaces/repeater/repeater-row-header.vue
+++ b/app/src/interfaces/repeater/repeater-row-header.vue
@@ -25,7 +25,7 @@ export default defineComponent({
 		},
 		placeholder: {
 			type: String,
-			default: i18n.t('empty_item'),
+			default: null,
 		},
 		toggle: {
 			type: Function,
diff --git a/app/src/interfaces/repeater/repeater-row.vue b/app/src/interfaces/repeater/repeater-row.vue
index 936abf26f6..049ab459d3 100644
--- a/app/src/interfaces/repeater/repeater-row.vue
+++ b/app/src/interfaces/repeater/repeater-row.vue
@@ -7,6 +7,7 @@
 			:toggle="toggle"
 			@delete="$emit('delete')"
 			:disabled="disabled"
+			:placeholder="headerPlaceholder"
 		/>
 		<transition-expand>
 			<div v-if="active">
@@ -46,6 +47,10 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
+		headerPlaceholder: {
+			type: String,
+			default: null
+		}
 	},
 });
 </script>
diff --git a/app/src/interfaces/repeater/repeater.vue b/app/src/interfaces/repeater/repeater.vue
index d34de04600..2644d07f30 100644
--- a/app/src/interfaces/repeater/repeater.vue
+++ b/app/src/interfaces/repeater/repeater.vue
@@ -10,6 +10,7 @@
 				@input="updateValues(index, $event)"
 				@delete="removeItem(row)"
 				:disabled="disabled"
+				:headerPlaceholder="headerPlaceholder"
 			/>
 		</draggable>
 		<button @click="addNew" class="add-new" v-if="showAddNew">
@@ -54,6 +55,10 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
+		headerPlaceholder: {
+			type: String,
+			default: i18n.t('empty_item'),
+		}
 	},
 	setup(props, { emit }) {
 		const selection = ref<number[]>([]);
diff --git a/app/src/lang/en-US/index.json b/app/src/lang/en-US/index.json
index f1b467031d..6043af9607 100644
--- a/app/src/lang/en-US/index.json
+++ b/app/src/lang/en-US/index.json
@@ -424,6 +424,7 @@
 	"modified": "Modified",
 	"checksum": "Checksum",
 	"owner": "Owner",
+	"edited_by": "Edited by",
 	"folder": "Folder",
 
 	"set_to_now": "Set to Now",
@@ -977,6 +978,8 @@
   "collection_removed": "Collection Removed",
   "collection_updated": "Collection Updated",
   "collections_and_fields": "Collection & Fields",
+  "singleton": "Singleton",
+  "singleton_label": "Treat as single object",
 
   "fields": {
     "directus_activity": {
diff --git a/app/src/modules/collections/components/navigation.vue b/app/src/modules/collections/components/navigation.vue
index 85492ec7e0..447de604be 100644
--- a/app/src/modules/collections/components/navigation.vue
+++ b/app/src/modules/collections/components/navigation.vue
@@ -1,19 +1,28 @@
 <template>
 	<v-list large>
 		<template v-if="customNavItems && customNavItems.length > 0">
-			<v-detail
-				:active="group.accordion === 'always_open' || undefined"
-				:disabled="group.accordion === 'always_open'"
-				:start-open="group.accordion === 'start_open'"
-				:label="group.name"
-				:key="group.name"
-				v-for="group in customNavItems"
-			>
-				<v-list-item :exact="exact" v-for="navItem in group.items" :key="navItem.to" :to="navItem.to">
-					<v-list-item-icon><v-icon :name="navItem.icon" /></v-list-item-icon>
-					<v-list-item-content>{{ navItem.name }}</v-list-item-content>
-				</v-list-item>
-			</v-detail>
+			<template v-for="(group, index) in customNavItems">
+				<template v-if="(group.name === undefined || group.name === null) && group.accordion === 'always_open' && index === 0">
+					<v-list-item :exact="exact" v-for="navItem in group.items" :key="navItem.to" :to="navItem.to">
+						<v-list-item-icon><v-icon :name="navItem.icon" /></v-list-item-icon>
+						<v-list-item-content>{{ navItem.name }}</v-list-item-content>
+					</v-list-item>
+				</template>
+				<template v-else>
+					<v-detail
+						:active="group.accordion === 'always_open' || undefined"
+						:disabled="group.accordion === 'always_open'"
+						:start-open="group.accordion === 'start_open'"
+						:label="group.name || null"
+						:key="group.name"
+					>
+						<v-list-item :exact="exact" v-for="navItem in group.items" :key="navItem.to" :to="navItem.to">
+							<v-list-item-icon><v-icon :name="navItem.icon" /></v-list-item-icon>
+							<v-list-item-content>{{ navItem.name }}</v-list-item-content>
+						</v-list-item>
+					</v-detail>
+				</template>
+			</template>
 		</template>
 
 		<v-list-item v-else :exact="exact" v-for="navItem in navItems" :key="navItem.to" :to="navItem.to">
diff --git a/app/src/modules/docs/components/navigation-item.vue b/app/src/modules/docs/components/navigation-item.vue
index 8b684230a6..50aa55e050 100644
--- a/app/src/modules/docs/components/navigation-item.vue
+++ b/app/src/modules/docs/components/navigation-item.vue
@@ -1,6 +1,6 @@
 <template>
 	<v-divider v-if="section.divider" />
-	<v-list-group v-else-if="section.children" :dense="dense">
+	<v-list-group v-else-if="section.children" :dense="dense" :multiple="false" :value="section.to">
 		<template #activator>
 			<v-list-item-icon v-if="section.icon !== undefined"><v-icon :name="section.icon" /></v-list-item-icon>
 			<v-list-item-content>
@@ -8,14 +8,14 @@
 			</v-list-item-content>
 		</template>
 		<navigation-list-item
-			v-for="(childSection, index) in section.children"
+			v-for="(child, index) in section.children"
 			:key="index"
-			:section="childSection"
+			:section="child"
 			dense
 		/>
 	</v-list-group>
 
-	<v-list-item v-else :to="`/docs${section.to}`" :dense="dense">
+	<v-list-item v-else :to="`/docs${section.to}`" :dense="dense" :value="section.to">
 		<v-list-item-icon v-if="section.icon !== undefined"><v-icon :name="section.icon" /></v-list-item-icon>
 		<v-list-item-content>
 			<v-list-item-text>{{ section.name }}</v-list-item-text>
@@ -24,7 +24,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType } from '@vue/composition-api';
+import { defineComponent, PropType, computed } from '@vue/composition-api';
 import { Link, Group } from '@directus/docs';
 
 export default defineComponent({
@@ -37,7 +37,7 @@ export default defineComponent({
 		dense: {
 			type: Boolean,
 			default: false,
-		},
-	},
+		}
+	}
 });
 </script>
diff --git a/app/src/modules/docs/components/navigation.vue b/app/src/modules/docs/components/navigation.vue
index 8cbfd1bcb0..1c0587d057 100644
--- a/app/src/modules/docs/components/navigation.vue
+++ b/app/src/modules/docs/components/navigation.vue
@@ -1,18 +1,60 @@
 <template>
-	<v-list large>
+	<v-list large :multiple="false" v-model="selection" :mandatory="false">
 		<navigation-item v-for="item in navSections" :key="item.name" :section="item" />
 	</v-list>
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, computed } from '@vue/composition-api';
+import { defineComponent, PropType, computed, watch, ref } from '@vue/composition-api';
 import NavigationItem from './navigation-item.vue';
 import { nav } from '@directus/docs';
 
+function spreadPath(path: string) {
+	const sections = path.substr(1).split('/')
+	if(sections.length === 0) return []
+
+	const paths: string[] = ['/'+sections[0]]
+
+	for(let i = 1; i < sections.length; i++) {
+		paths.push(paths[i - 1] + '/' + sections[i])
+	}
+	return paths
+}
+
 export default defineComponent({
 	components: { NavigationItem },
-	setup() {
-		return { navSections: nav.app };
+	props: {
+		path: {
+			type: String,
+			default: null
+		}
+	},
+	setup(props) {
+		const _selection = ref<string[]>(spreadPath(props.path.replace('/docs','')))
+
+		watch(() => props.path, (newPath) => {
+			_selection.value = spreadPath(newPath.replace('/docs',''))
+		})
+
+		const selection = computed({
+			get() {
+				return _selection.value
+			},
+			set(newSelection: string[]) {
+				if(newSelection.length === 0) {
+					_selection.value =  []
+				} else {
+					if(_selection.value.includes(newSelection[0])) {
+						_selection.value = _selection.value.filter(s => s !== newSelection[0])
+					} else {
+						_selection.value = spreadPath(newSelection[0])
+					}
+					
+				}
+			}
+		})
+
+		return { navSections: nav.app, selection };
 	},
 });
 </script>
diff --git a/app/src/modules/docs/index.ts b/app/src/modules/docs/index.ts
index 6a21b46b5c..4ec6d8547f 100644
--- a/app/src/modules/docs/index.ts
+++ b/app/src/modules/docs/index.ts
@@ -31,19 +31,18 @@ export default defineModule(({ i18n }) => {
 		for (const doc of directory.children) {
 			if (doc.type === 'file') {
 				routes.push({
-					path: '/' + doc.path.replace('.md', ''),
+					path: '/' + doc.path.replace('.md', '').replaceAll('\\','/'),
 					component: StaticDocs,
 				});
 			} else if (doc.type === 'directory') {
 				routes.push({
-					path: '/' + doc.path,
-					redirect: '/' + doc.children![0].path.replace('.md', ''),
+					path: '/' + doc.path.replaceAll('\\','/'),
+					redirect: '/' + doc.children![0].path.replace('.md', '').replaceAll('\\','/'),
 				});
 
 				routes.push(...parseRoutes(doc));
 			}
 		}
-
 		return routes;
 	}
 });
diff --git a/app/src/modules/docs/routes/not-found.vue b/app/src/modules/docs/routes/not-found.vue
index 5778564643..94ae5e2810 100644
--- a/app/src/modules/docs/routes/not-found.vue
+++ b/app/src/modules/docs/routes/not-found.vue
@@ -1,7 +1,7 @@
 <template>
 	<private-view :title="$t('page_not_found')">
 		<template #navigation>
-			<docs-navigation />
+			<docs-navigation :path="path" />
 		</template>
 
 		<div class="not-found">
@@ -13,12 +13,25 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/composition-api';
+import { defineComponent, ref } from '@vue/composition-api';
 import DocsNavigation from '../components/navigation.vue';
 
 export default defineComponent({
 	name: 'NotFound',
 	components: { DocsNavigation },
+	async beforeRouteEnter(to, from, next) {
+		next((vm: any) => {
+			vm.path = to.path
+		});
+	},
+	async beforeRouteUpdate(to, from, next) {
+		this.path = to.path
+		next();
+	},
+	setup() {
+		const path = ref<string | null>(null)
+		return {path}
+	}
 });
 </script>
 
diff --git a/app/src/modules/docs/routes/static.vue b/app/src/modules/docs/routes/static.vue
index e02644a73f..ca7865b038 100644
--- a/app/src/modules/docs/routes/static.vue
+++ b/app/src/modules/docs/routes/static.vue
@@ -9,7 +9,7 @@
 		</template>
 
 		<template #navigation>
-			<docs-navigation />
+			<docs-navigation :path="path"/>
 		</template>
 
 		<div class="docs-content selectable">
@@ -55,16 +55,18 @@ export default defineComponent({
 	async beforeRouteEnter(to, from, next) {
 		const md = await getMarkdownForPath(to.path);
 
-		next((vm) => {
-			(vm as any).markdown = md;
+		next((vm: any) => {
+			vm.markdown = md;
+			vm.path = to.path
 		});
 	},
 	async beforeRouteUpdate(to, from, next) {
 		this.markdown = await getMarkdownForPath(to.path);
-
+		this.path = to.path
 		next();
 	},
 	setup() {
+		const path = ref<string | null>(null)
 		const markdown = ref('');
 		const view = ref<Vue>();
 
@@ -83,7 +85,7 @@ export default defineComponent({
 			view.value?.$data.contentEl?.scrollTo({ top: 0 });
 		});
 
-		return { markdown, title, markdownWithoutTitle, view, marked };
+		return { markdown, title, markdownWithoutTitle, view, marked, path };
 	},
 });
 </script>
diff --git a/app/src/modules/files/components/file-info-drawer-detail.vue b/app/src/modules/files/components/file-info-drawer-detail.vue
index 37ee114347..fe18f51c0d 100644
--- a/app/src/modules/files/components/file-info-drawer-detail.vue
+++ b/app/src/modules/files/components/file-info-drawer-detail.vue
@@ -41,11 +41,25 @@
 				<dd>{{ file.checksum }}</dd>
 			</div>
 
-			<div v-if="user">
+			<div v-if="user_created">
 				<dt>{{ $t('owner') }}</dt>
 				<dd>
-					<user-popover :user="user.id">
-						<router-link :to="user.link">{{ user.name }}</router-link>
+					<user-popover :user="user_created.id">
+						<router-link :to="user_created.link">{{ user_created.name }}</router-link>
+					</user-popover>
+				</dd>
+			</div>
+
+			<div v-if="modificationDate">
+				<dt>{{ $t('modified') }}</dt>
+				<dd>{{ modificationDate }}</dd>
+			</div>
+
+			<div v-if="user_modified">
+				<dt>{{ $t('edited_by') }}</dt>
+				<dd>
+					<user-popover :user="user_modified.id">
+						<router-link :to="user_modified.link">{{ user_modified.name }}</router-link>
 					</user-popover>
 				</dd>
 			</div>
@@ -123,14 +137,15 @@ export default defineComponent({
 			return bytes(props.file.filesize, { decimalPlaces: 2, unitSeparator: ' ' }); // { locale: i18n.locale.split('-')[0] }
 		});
 
-		const { creationDate } = useCreationDate();
-		const { user } = useUser();
+		const { creationDate, modificationDate } = useDates();
+		const { userCreated, userModified } = useUser();
 		const { folder } = useFolder();
 
-		return { readableMimeType, size, creationDate, user, folder, marked };
+		return { readableMimeType, size, creationDate, modificationDate, userCreated, userModified, folder, marked };
 
-		function useCreationDate() {
+		function useDates() {
 			const creationDate = ref<string | null>(null);
+			const modificationDate = ref<string | null>(null);
 
 			watch(
 				() => props.file,
@@ -141,11 +156,18 @@ export default defineComponent({
 						new Date(props.file.uploaded_on),
 						String(i18n.t('date-fns_date_short'))
 					);
+
+					if (props.file.modified_on) {
+						modificationDate.value = await localizedFormat(
+							new Date(props.file.modified_on),
+							String(i18n.t('date-fns_date_short'))
+						);
+					}
 				},
 				{ immediate: true }
 			);
 
-			return { creationDate };
+			return { creationDate, modificationDate };
 		}
 
 		function useUser() {
@@ -156,11 +178,12 @@ export default defineComponent({
 			};
 
 			const loading = ref(false);
-			const user = ref<User | null>(null);
+			const userCreated = ref<User | null>(null);
+			const userModified = ref<User | null>(null);
 
 			watch(() => props.file, fetchUser, { immediate: true });
 
-			return { user };
+			return { userCreated, userModified };
 
 			async function fetchUser() {
 				if (!props.file) return null;
@@ -177,11 +200,27 @@ export default defineComponent({
 
 					const { id, first_name, last_name, role } = response.data.data;
 
-					user.value = {
+					userCreated.value = {
 						id: props.file.uploaded_by,
 						name: first_name + ' ' + last_name,
 						link: `/users/${id}`,
 					};
+
+					if (props.file.modified_by) {
+						const response = await api.get(`/users/${props.file.modified_by}`, {
+							params: {
+								fields: ['id', 'first_name', 'last_name', 'role'],
+							},
+						});
+
+						const { id, first_name, last_name, role } = response.data.data;
+
+						userModified.value = {
+							id: props.file.modified_by,
+							name: first_name + ' ' + last_name,
+							link: `/users/${id}`,
+						};
+					}
 				} finally {
 					loading.value = false;
 				}
diff --git a/app/src/modules/files/routes/detail.vue b/app/src/modules/files/routes/detail.vue
index e36f2a3533..e749ac012e 100644
--- a/app/src/modules/files/routes/detail.vue
+++ b/app/src/modules/files/routes/detail.vue
@@ -274,6 +274,8 @@ export default defineComponent({
 			'checksum',
 			'uploaded_by',
 			'uploaded_on',
+			'modified_by',
+			'modified_on',
 			'duration',
 			'folder',
 			'charset',
diff --git a/app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2o.vue b/app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2o.vue
index ded9368e03..53811a0266 100644
--- a/app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2o.vue
+++ b/app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2o.vue
@@ -178,6 +178,7 @@ export default defineComponent({
 								interface: 'one-to-many',
 							},
 						});
+						state.relations[0].one_field = state.relations[0].one_collection;
 					} else {
 						state.newFields = state.newFields.filter((field: any) => field.$type !== 'corresponding');
 					}
diff --git a/app/src/modules/settings/routes/data-model/new-collection.vue b/app/src/modules/settings/routes/data-model/new-collection.vue
index 7b9f43688b..9ad0270556 100644
--- a/app/src/modules/settings/routes/data-model/new-collection.vue
+++ b/app/src/modules/settings/routes/data-model/new-collection.vue
@@ -26,19 +26,25 @@
 		<v-tabs-items v-model="currentTab">
 			<v-tab-item value="collection">
 				<h2 class="type-title">{{ $t('creating_collection_info') }}</h2>
-				<div class="type-label">
-					{{ $t('name') }}
-					<v-icon class="required" v-tooltip="$t('required')" name="star" sup />
-				</div>
-				<v-input
-					autofocus
-					class="monospace"
-					v-model="collectionName"
-					db-safe
-					:placeholder="$t('a_unique_table_name')"
-				/>
-				<v-divider />
 				<div class="grid">
+					<div>
+						<div class="type-label">
+							{{ $t('name') }}
+							<v-icon class="required" v-tooltip="$t('required')" name="star" sup />
+						</div>
+						<v-input
+							autofocus
+							class="monospace"
+							v-model="collectionName"
+							db-safe
+							:placeholder="$t('a_unique_table_name')"
+						/>
+					</div>
+					<div>
+						<div class="type-label">{{ $t('singleton') }}</div>
+						<v-checkbox block :label="$t('singleton_label')" v-model="singleton" />
+					</div>
+					<v-divider class="full" />
 					<div>
 						<div class="type-label">{{ $t('primary_key_field') }}</div>
 						<v-input
@@ -73,7 +79,7 @@
 			<v-tab-item value="system">
 				<h2 class="type-title">{{ $t('creating_collection_system') }}</h2>
 				<div class="grid system">
-					<div class="field" v-for="(info, field) in systemFields" :key="field">
+					<div v-for="(info, field) in systemFields" :key="field">
 						<div class="type-label">{{ $t(info.label) }}</div>
 						<v-input v-model="info.name" class="monospace" :class="{active: info.enabled}" @click.native="info.enabled = true">
 							<template #prepend>
@@ -124,6 +130,7 @@ export default defineComponent({
 		const currentTab = ref(['collection']);
 
 		const collectionName = ref(null);
+		const singleton = ref(false);
 		const primaryKeyFieldName = ref('id');
 		const primaryKeyFieldType = ref<'auto_int' | 'uuid' | 'manual'>('auto_int');
 
@@ -184,6 +191,7 @@ export default defineComponent({
 			collectionName,
 			saveError,
 			saving,
+			singleton
 		};
 
 		async function save() {
@@ -198,6 +206,7 @@ export default defineComponent({
 						archive_field: archiveField.value,
 						archive_value: archiveValue.value,
 						unarchive_value: unarchiveValue.value,
+						singleton: singleton.value
 					},
 				});
 
@@ -412,22 +421,14 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
+@import '@/styles/mixins/form-grid';
+
 .type-title {
 	margin-bottom: 48px;
 }
 
-.type-label {
-	margin-bottom: 12px;
-}
-
-.v-divider {
-	margin: 48px 0;
-}
-
 .grid {
-	display: grid;
-	grid-gap: 48px 36px;
-	grid-template-columns: repeat(2, 1fr);
+	@include form-grid;
 }
 
 .system {
diff --git a/docs/build.js b/docs/build.js
index 3662ff7beb..297a3db48e 100644
--- a/docs/build.js
+++ b/docs/build.js
@@ -7,6 +7,10 @@ const dirTree = require('directory-tree');
 const yaml = require('js-yaml');
 
 async function build() {
+	console.log('Building docs...');
+
+	const start = Date.now();
+
 	const distPath = path.resolve(__dirname, './dist');
 
 	await rimraf(distPath);
@@ -35,6 +39,8 @@ async function build() {
 			yaml.safeLoad(yamlString)
 		);
 	}
+
+	console.log(`Built docs in ${Date.now() - start} ms`);
 }
 
 build();
diff --git a/docs/index.d.ts b/docs/index.d.ts
index 4bf0c1d792..ab80f53be5 100644
--- a/docs/index.d.ts
+++ b/docs/index.d.ts
@@ -21,6 +21,7 @@ export type Link = {
 
 export type Group = {
 	name: string;
+	to: string;
 	children: (Group | Link | Divider)[];
 	icon?: string;
 };
diff --git a/docs/nav-app.yaml b/docs/nav-app.yaml
index d483917b7f..1823adffe9 100644
--- a/docs/nav-app.yaml
+++ b/docs/nav-app.yaml
@@ -1,5 +1,6 @@
 - name: Getting Started
   icon: play_arrow
+  to: "/getting-started"
   children:
   - name: Introduction
     to: "/getting-started/introduction"
@@ -12,6 +13,7 @@
 
 - name: Concepts
   icon: school
+  to: "/concepts"
   children:
   - name: Platform Overview
     to: "/concepts/platform-overview"
@@ -32,6 +34,7 @@
 
 - name: Guides
   icon: article
+  to: "/guides"
   children:
   - name: Collections
     to: "/guides/collections"
@@ -73,6 +76,7 @@
 
 - name: Reference
   icon: code
+  to: "/reference"
   children:
   - name: Command Line Interface
     to: "/reference/command-line-interface"
diff --git a/docs/package-lock.json b/docs/package-lock.json
index a334c0e8fd..a1d435e7c4 100644
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -1,5 +1,1082 @@
 {
   "name": "@directus/docs",
   "version": "9.0.0-beta.10",
-  "lockfileVersion": 1
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@sindresorhus/is": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
+      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
+      "dev": true
+    },
+    "@szmarczak/http-timer": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
+      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
+      "dev": true,
+      "requires": {
+        "defer-to-connect": "^1.0.1"
+      }
+    },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
+    "ansi-align": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
+      "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
+      "dev": true,
+      "requires": {
+        "string-width": "^3.0.0"
+      },
+      "dependencies": {
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        }
+      }
+    },
+    "ansi-regex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
+    "anymatch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "dev": true,
+      "requires": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "binary-extensions": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
+      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
+      "dev": true
+    },
+    "boxen": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz",
+      "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==",
+      "dev": true,
+      "requires": {
+        "ansi-align": "^3.0.0",
+        "camelcase": "^5.3.1",
+        "chalk": "^3.0.0",
+        "cli-boxes": "^2.2.0",
+        "string-width": "^4.1.0",
+        "term-size": "^2.1.0",
+        "type-fest": "^0.8.1",
+        "widest-line": "^3.1.0"
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
+    "cacheable-request": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
+      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
+      "dev": true,
+      "requires": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^3.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^4.1.0",
+        "responselike": "^1.0.2"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "lowercase-keys": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+          "dev": true
+        }
+      }
+    },
+    "camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true
+    },
+    "chalk": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "chokidar": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
+      "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
+      "dev": true,
+      "requires": {
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "fsevents": "~2.1.2",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.4.0"
+      }
+    },
+    "ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "dev": true
+    },
+    "cli-boxes": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
+      "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
+      "dev": true
+    },
+    "clone-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+      "dev": true,
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "configstore": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
+      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
+      "dev": true,
+      "requires": {
+        "dot-prop": "^5.2.0",
+        "graceful-fs": "^4.1.2",
+        "make-dir": "^3.0.0",
+        "unique-string": "^2.0.0",
+        "write-file-atomic": "^3.0.0",
+        "xdg-basedir": "^4.0.0"
+      }
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "crypto-random-string": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
+      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
+      "dev": true
+    },
+    "debug": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "dev": true,
+      "requires": {
+        "ms": "^2.1.1"
+      }
+    },
+    "decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "dev": true,
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "dev": true
+    },
+    "defer-to-connect": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
+      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
+      "dev": true
+    },
+    "dot-prop": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
+      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
+      "dev": true,
+      "requires": {
+        "is-obj": "^2.0.0"
+      }
+    },
+    "duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+      "dev": true
+    },
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "escape-goat": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
+      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
+      "dev": true
+    },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
+    "fsevents": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "dev": true,
+      "optional": true
+    },
+    "get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
+    "global-dirs": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz",
+      "integrity": "sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==",
+      "dev": true,
+      "requires": {
+        "ini": "^1.3.5"
+      }
+    },
+    "got": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
+      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
+      "dev": true,
+      "requires": {
+        "@sindresorhus/is": "^0.14.0",
+        "@szmarczak/http-timer": "^1.1.2",
+        "cacheable-request": "^6.0.0",
+        "decompress-response": "^3.3.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^4.1.0",
+        "lowercase-keys": "^1.0.1",
+        "mimic-response": "^1.0.1",
+        "p-cancelable": "^1.0.0",
+        "to-readable-stream": "^1.0.0",
+        "url-parse-lax": "^3.0.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "has-yarn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
+      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
+      "dev": true
+    },
+    "http-cache-semantics": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
+      "dev": true
+    },
+    "ignore-by-default": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
+      "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=",
+      "dev": true
+    },
+    "import-lazy": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
+      "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=",
+      "dev": true
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "dev": true
+    },
+    "is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^2.0.0"
+      }
+    },
+    "is-ci": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "dev": true,
+      "requires": {
+        "ci-info": "^2.0.0"
+      }
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-installed-globally": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz",
+      "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==",
+      "dev": true,
+      "requires": {
+        "global-dirs": "^2.0.1",
+        "is-path-inside": "^3.0.1"
+      }
+    },
+    "is-npm": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz",
+      "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==",
+      "dev": true
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
+    "is-obj": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
+      "dev": true
+    },
+    "is-path-inside": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
+      "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
+      "dev": true
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "is-yarn-global": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
+      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "json-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
+      "dev": true
+    },
+    "keyv": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
+      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
+      "dev": true,
+      "requires": {
+        "json-buffer": "3.0.0"
+      }
+    },
+    "latest-version": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
+      "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
+      "dev": true,
+      "requires": {
+        "package-json": "^6.3.0"
+      }
+    },
+    "lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "dev": true
+    },
+    "make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "requires": {
+        "semver": "^6.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "nodemon": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.4.tgz",
+      "integrity": "sha512-Ltced+hIfTmaS28Zjv1BM552oQ3dbwPqI4+zI0SLgq+wpJhSyqgYude/aZa/3i31VCQWMfXJVxvu86abcam3uQ==",
+      "dev": true,
+      "requires": {
+        "chokidar": "^3.2.2",
+        "debug": "^3.2.6",
+        "ignore-by-default": "^1.0.1",
+        "minimatch": "^3.0.4",
+        "pstree.remy": "^1.1.7",
+        "semver": "^5.7.1",
+        "supports-color": "^5.5.0",
+        "touch": "^3.1.0",
+        "undefsafe": "^2.0.2",
+        "update-notifier": "^4.0.0"
+      }
+    },
+    "nopt": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
+      "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
+      "dev": true,
+      "requires": {
+        "abbrev": "1"
+      }
+    },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
+    },
+    "normalize-url": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
+      "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
+      "dev": true
+    },
+    "npm-watch": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/npm-watch/-/npm-watch-0.7.0.tgz",
+      "integrity": "sha512-AN2scNyMljMGkn0mIkaRRk19I7Vx0qTK6GmsIcDblX5YRbSsoJORTAtrceICSx7Om9q48NWcwm/R0t6E7F4Ocg==",
+      "dev": true,
+      "requires": {
+        "nodemon": "^2.0.3",
+        "through2": "^2.0.0"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "p-cancelable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
+      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
+      "dev": true
+    },
+    "package-json": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
+      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
+      "dev": true,
+      "requires": {
+        "got": "^9.6.0",
+        "registry-auth-token": "^4.0.0",
+        "registry-url": "^5.0.0",
+        "semver": "^6.2.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "picomatch": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "dev": true
+    },
+    "prepend-http": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "pstree.remy": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
+      "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==",
+      "dev": true
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "pupa": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.0.1.tgz",
+      "integrity": "sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==",
+      "dev": true,
+      "requires": {
+        "escape-goat": "^2.0.0"
+      }
+    },
+    "rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "dev": true,
+      "requires": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "readdirp": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
+      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+      "dev": true,
+      "requires": {
+        "picomatch": "^2.2.1"
+      }
+    },
+    "registry-auth-token": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz",
+      "integrity": "sha512-P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w==",
+      "dev": true,
+      "requires": {
+        "rc": "^1.2.8"
+      }
+    },
+    "registry-url": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
+      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
+      "dev": true,
+      "requires": {
+        "rc": "^1.2.8"
+      }
+    },
+    "responselike": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+      "dev": true,
+      "requires": {
+        "lowercase-keys": "^1.0.0"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true
+    },
+    "semver-diff": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
+      "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
+      "dev": true,
+      "requires": {
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "signal-exit": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
+      "dev": true
+    },
+    "string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        }
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^4.1.0"
+      }
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "term-size": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz",
+      "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==",
+      "dev": true
+    },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "to-readable-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
+      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
+      "dev": true
+    },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
+    "touch": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz",
+      "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==",
+      "dev": true,
+      "requires": {
+        "nopt": "~1.0.10"
+      }
+    },
+    "type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true
+    },
+    "typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "dev": true,
+      "requires": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "undefsafe": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.3.tgz",
+      "integrity": "sha512-nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A==",
+      "dev": true,
+      "requires": {
+        "debug": "^2.2.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "unique-string": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
+      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
+      "dev": true,
+      "requires": {
+        "crypto-random-string": "^2.0.0"
+      }
+    },
+    "update-notifier": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz",
+      "integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==",
+      "dev": true,
+      "requires": {
+        "boxen": "^4.2.0",
+        "chalk": "^3.0.0",
+        "configstore": "^5.0.1",
+        "has-yarn": "^2.1.0",
+        "import-lazy": "^2.1.0",
+        "is-ci": "^2.0.0",
+        "is-installed-globally": "^0.3.1",
+        "is-npm": "^4.0.0",
+        "is-yarn-global": "^0.3.0",
+        "latest-version": "^5.0.0",
+        "pupa": "^2.0.1",
+        "semver-diff": "^3.1.1",
+        "xdg-basedir": "^4.0.0"
+      }
+    },
+    "url-parse-lax": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
+      "dev": true,
+      "requires": {
+        "prepend-http": "^2.0.0"
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "widest-line": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
+      "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
+      "dev": true,
+      "requires": {
+        "string-width": "^4.0.0"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "write-file-atomic": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "^0.1.4",
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
+      }
+    },
+    "xdg-basedir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
+      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
+      "dev": true
+    },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true
+    }
+  }
 }
diff --git a/docs/package.json b/docs/package.json
index b55ad80c4a..178104ea43 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -6,7 +6,17 @@
   "main": "index.js",
   "scripts": {
     "build": "node build.js",
-    "prepublish": "npm run build"
+    "prepublish": "npm run build",
+    "dev": "npm-watch build"
+  },
+  "watch": {
+    "build": {
+      "patterns": ["."],
+      "ignore": "dist",
+      "extensions": "md,yaml",
+      "silent": true,
+      "quiet": true
+    }
   },
   "files": [
     "dist"
@@ -14,5 +24,8 @@
   "keywords": [],
   "author": "",
   "license": "ISC",
-  "gitHead": "4476da28dbbc2824e680137aa28b2b91b5afabec"
+  "gitHead": "4476da28dbbc2824e680137aa28b2b91b5afabec",
+  "devDependencies": {
+    "npm-watch": "^0.7.0"
+  }
 }
diff --git a/packages/spec/package-lock.json b/packages/spec/package-lock.json
index 0ecd7bbc27..aba5c179fd 100644
--- a/packages/spec/package-lock.json
+++ b/packages/spec/package-lock.json
@@ -1,5 +1,1423 @@
 {
 	"name": "@directus/specs",
 	"version": "9.0.0-beta.10",
-	"lockfileVersion": 1
+	"lockfileVersion": 1,
+	"requires": true,
+	"dependencies": {
+		"@apidevtools/json-schema-ref-parser": {
+			"version": "9.0.6",
+			"resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.6.tgz",
+			"integrity": "sha512-M3YgsLjI0lZxvrpeGVk9Ap032W6TPQkH6pRAZz81Ac3WUNF79VQooAFnp8umjvVzUmD93NkogxEwbSce7qMsUg==",
+			"dev": true,
+			"requires": {
+				"@jsdevtools/ono": "^7.1.3",
+				"call-me-maybe": "^1.0.1",
+				"js-yaml": "^3.13.1"
+			}
+		},
+		"@apidevtools/openapi-schemas": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@apidevtools/openapi-schemas/-/openapi-schemas-2.0.4.tgz",
+			"integrity": "sha512-ob5c4UiaMYkb24pNhvfSABShAwpREvUGCkqjiz/BX9gKZ32y/S22M+ALIHftTAuv9KsFVSpVdIDzi9ZzFh5TCA==",
+			"dev": true
+		},
+		"@apidevtools/swagger-methods": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/@apidevtools/swagger-methods/-/swagger-methods-3.0.2.tgz",
+			"integrity": "sha512-QAkD5kK2b1WfjDS/UQn/qQkbwF31uqRjPTrsCs5ZG9BQGAkjwvqGFjjPqAuzac/IYzpPtRzjCP1WrTuAIjMrXg==",
+			"dev": true
+		},
+		"@apidevtools/swagger-parser": {
+			"version": "10.0.2",
+			"resolved": "https://registry.npmjs.org/@apidevtools/swagger-parser/-/swagger-parser-10.0.2.tgz",
+			"integrity": "sha512-JFxcEyp8RlNHgBCE98nwuTkZT6eNFPc1aosWV6wPcQph72TSEEu1k3baJD4/x1qznU+JiDdz8F5pTwabZh+Dhg==",
+			"dev": true,
+			"requires": {
+				"@apidevtools/json-schema-ref-parser": "^9.0.6",
+				"@apidevtools/openapi-schemas": "^2.0.4",
+				"@apidevtools/swagger-methods": "^3.0.2",
+				"@jsdevtools/ono": "^7.1.3",
+				"call-me-maybe": "^1.0.1",
+				"z-schema": "^4.2.3"
+			}
+		},
+		"@jsdevtools/ono": {
+			"version": "7.1.3",
+			"resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz",
+			"integrity": "sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==",
+			"dev": true
+		},
+		"@sindresorhus/is": {
+			"version": "0.14.0",
+			"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
+			"integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
+			"dev": true
+		},
+		"@szmarczak/http-timer": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
+			"integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
+			"dev": true,
+			"requires": {
+				"defer-to-connect": "^1.0.1"
+			}
+		},
+		"abbrev": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+			"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+			"dev": true
+		},
+		"ansi-align": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
+			"integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
+			"dev": true,
+			"requires": {
+				"string-width": "^3.0.0"
+			},
+			"dependencies": {
+				"string-width": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+					"dev": true,
+					"requires": {
+						"emoji-regex": "^7.0.1",
+						"is-fullwidth-code-point": "^2.0.0",
+						"strip-ansi": "^5.1.0"
+					}
+				}
+			}
+		},
+		"ansi-regex": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+			"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+			"dev": true
+		},
+		"ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"requires": {
+				"color-convert": "^2.0.1"
+			}
+		},
+		"anymatch": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+			"integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+			"dev": true,
+			"requires": {
+				"normalize-path": "^3.0.0",
+				"picomatch": "^2.0.4"
+			}
+		},
+		"argparse": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+			"dev": true,
+			"requires": {
+				"sprintf-js": "~1.0.2"
+			}
+		},
+		"balanced-match": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+			"dev": true
+		},
+		"binary-extensions": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
+			"integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
+			"dev": true
+		},
+		"boxen": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz",
+			"integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==",
+			"dev": true,
+			"requires": {
+				"ansi-align": "^3.0.0",
+				"camelcase": "^5.3.1",
+				"chalk": "^3.0.0",
+				"cli-boxes": "^2.2.0",
+				"string-width": "^4.1.0",
+				"term-size": "^2.1.0",
+				"type-fest": "^0.8.1",
+				"widest-line": "^3.1.0"
+			}
+		},
+		"brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"requires": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
+			"requires": {
+				"fill-range": "^7.0.1"
+			}
+		},
+		"cacheable-request": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
+			"integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
+			"dev": true,
+			"requires": {
+				"clone-response": "^1.0.2",
+				"get-stream": "^5.1.0",
+				"http-cache-semantics": "^4.0.0",
+				"keyv": "^3.0.0",
+				"lowercase-keys": "^2.0.0",
+				"normalize-url": "^4.1.0",
+				"responselike": "^1.0.2"
+			},
+			"dependencies": {
+				"get-stream": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+					"integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+					"dev": true,
+					"requires": {
+						"pump": "^3.0.0"
+					}
+				},
+				"lowercase-keys": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+					"integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+					"dev": true
+				}
+			}
+		},
+		"call-me-maybe": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
+			"integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
+			"dev": true
+		},
+		"camelcase": {
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+			"dev": true
+		},
+		"chalk": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+			"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+			"dev": true,
+			"requires": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"dependencies": {
+				"has-flag": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "7.2.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^4.0.0"
+					}
+				}
+			}
+		},
+		"chokidar": {
+			"version": "3.4.2",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
+			"integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
+			"dev": true,
+			"requires": {
+				"anymatch": "~3.1.1",
+				"braces": "~3.0.2",
+				"fsevents": "~2.1.2",
+				"glob-parent": "~5.1.0",
+				"is-binary-path": "~2.1.0",
+				"is-glob": "~4.0.1",
+				"normalize-path": "~3.0.0",
+				"readdirp": "~3.4.0"
+			}
+		},
+		"ci-info": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+			"integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+			"dev": true
+		},
+		"cli-boxes": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
+			"integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
+			"dev": true
+		},
+		"cliui": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+			"integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+			"dev": true,
+			"requires": {
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.0",
+				"wrap-ansi": "^6.2.0"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+					"integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+					"dev": true
+				},
+				"strip-ansi": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+					"integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "^5.0.0"
+					}
+				}
+			}
+		},
+		"clone-response": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+			"integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+			"dev": true,
+			"requires": {
+				"mimic-response": "^1.0.0"
+			}
+		},
+		"color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"requires": {
+				"color-name": "~1.1.4"
+			}
+		},
+		"color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"dev": true,
+			"optional": true
+		},
+		"concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+			"dev": true
+		},
+		"configstore": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
+			"integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
+			"dev": true,
+			"requires": {
+				"dot-prop": "^5.2.0",
+				"graceful-fs": "^4.1.2",
+				"make-dir": "^3.0.0",
+				"unique-string": "^2.0.0",
+				"write-file-atomic": "^3.0.0",
+				"xdg-basedir": "^4.0.0"
+			}
+		},
+		"core-util-is": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+			"dev": true
+		},
+		"crypto-random-string": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
+			"integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
+			"dev": true
+		},
+		"debug": {
+			"version": "3.2.6",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+			"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+			"dev": true,
+			"requires": {
+				"ms": "^2.1.1"
+			}
+		},
+		"decamelize": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+			"dev": true
+		},
+		"decompress-response": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+			"integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+			"dev": true,
+			"requires": {
+				"mimic-response": "^1.0.0"
+			}
+		},
+		"deep-extend": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+			"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+			"dev": true
+		},
+		"defer-to-connect": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
+			"integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
+			"dev": true
+		},
+		"dot-prop": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
+			"integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
+			"dev": true,
+			"requires": {
+				"is-obj": "^2.0.0"
+			}
+		},
+		"duplexer3": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+			"integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+			"dev": true
+		},
+		"emoji-regex": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+			"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+			"dev": true
+		},
+		"end-of-stream": {
+			"version": "1.4.4",
+			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+			"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+			"dev": true,
+			"requires": {
+				"once": "^1.4.0"
+			}
+		},
+		"escape-goat": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
+			"integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
+			"dev": true
+		},
+		"esprima": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+			"dev": true
+		},
+		"fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"dev": true,
+			"requires": {
+				"to-regex-range": "^5.0.1"
+			}
+		},
+		"find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"dev": true,
+			"requires": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			}
+		},
+		"fsevents": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+			"integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+			"dev": true,
+			"optional": true
+		},
+		"get-caller-file": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+			"dev": true
+		},
+		"get-stream": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+			"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+			"dev": true,
+			"requires": {
+				"pump": "^3.0.0"
+			}
+		},
+		"glob-parent": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+			"integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+			"dev": true,
+			"requires": {
+				"is-glob": "^4.0.1"
+			}
+		},
+		"global-dirs": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz",
+			"integrity": "sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==",
+			"dev": true,
+			"requires": {
+				"ini": "^1.3.5"
+			}
+		},
+		"got": {
+			"version": "9.6.0",
+			"resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
+			"integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
+			"dev": true,
+			"requires": {
+				"@sindresorhus/is": "^0.14.0",
+				"@szmarczak/http-timer": "^1.1.2",
+				"cacheable-request": "^6.0.0",
+				"decompress-response": "^3.3.0",
+				"duplexer3": "^0.1.4",
+				"get-stream": "^4.1.0",
+				"lowercase-keys": "^1.0.1",
+				"mimic-response": "^1.0.1",
+				"p-cancelable": "^1.0.0",
+				"to-readable-stream": "^1.0.0",
+				"url-parse-lax": "^3.0.0"
+			}
+		},
+		"graceful-fs": {
+			"version": "4.2.4",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+			"integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+			"dev": true
+		},
+		"has-flag": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+			"dev": true
+		},
+		"has-yarn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
+			"integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
+			"dev": true
+		},
+		"http-cache-semantics": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+			"integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
+			"dev": true
+		},
+		"ignore-by-default": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
+			"integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=",
+			"dev": true
+		},
+		"import-lazy": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
+			"integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=",
+			"dev": true
+		},
+		"imurmurhash": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+			"dev": true
+		},
+		"inherits": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+			"dev": true
+		},
+		"ini": {
+			"version": "1.3.5",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+			"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+			"dev": true
+		},
+		"is-binary-path": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+			"dev": true,
+			"requires": {
+				"binary-extensions": "^2.0.0"
+			}
+		},
+		"is-ci": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+			"integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+			"dev": true,
+			"requires": {
+				"ci-info": "^2.0.0"
+			}
+		},
+		"is-extglob": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+			"dev": true
+		},
+		"is-fullwidth-code-point": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+			"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+			"dev": true
+		},
+		"is-glob": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+			"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+			"dev": true,
+			"requires": {
+				"is-extglob": "^2.1.1"
+			}
+		},
+		"is-installed-globally": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz",
+			"integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==",
+			"dev": true,
+			"requires": {
+				"global-dirs": "^2.0.1",
+				"is-path-inside": "^3.0.1"
+			}
+		},
+		"is-npm": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz",
+			"integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==",
+			"dev": true
+		},
+		"is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true
+		},
+		"is-obj": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+			"integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
+			"dev": true
+		},
+		"is-path-inside": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
+			"integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
+			"dev": true
+		},
+		"is-typedarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+			"dev": true
+		},
+		"is-yarn-global": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
+			"integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
+			"dev": true
+		},
+		"isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+			"dev": true
+		},
+		"js-yaml": {
+			"version": "3.14.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+			"integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+			"dev": true,
+			"requires": {
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			}
+		},
+		"json-buffer": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+			"integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
+			"dev": true
+		},
+		"keyv": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
+			"integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
+			"dev": true,
+			"requires": {
+				"json-buffer": "3.0.0"
+			}
+		},
+		"latest-version": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
+			"integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
+			"dev": true,
+			"requires": {
+				"package-json": "^6.3.0"
+			}
+		},
+		"locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+			"dev": true,
+			"requires": {
+				"p-locate": "^4.1.0"
+			}
+		},
+		"lodash.get": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+			"integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+			"dev": true
+		},
+		"lodash.isequal": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+			"integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
+			"dev": true
+		},
+		"lowercase-keys": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+			"integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+			"dev": true
+		},
+		"make-dir": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+			"dev": true,
+			"requires": {
+				"semver": "^6.0.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"mimic-response": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+			"integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+			"dev": true
+		},
+		"minimatch": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"dev": true,
+			"requires": {
+				"brace-expansion": "^1.1.7"
+			}
+		},
+		"minimist": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+			"dev": true
+		},
+		"ms": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+			"dev": true
+		},
+		"nodemon": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.4.tgz",
+			"integrity": "sha512-Ltced+hIfTmaS28Zjv1BM552oQ3dbwPqI4+zI0SLgq+wpJhSyqgYude/aZa/3i31VCQWMfXJVxvu86abcam3uQ==",
+			"dev": true,
+			"requires": {
+				"chokidar": "^3.2.2",
+				"debug": "^3.2.6",
+				"ignore-by-default": "^1.0.1",
+				"minimatch": "^3.0.4",
+				"pstree.remy": "^1.1.7",
+				"semver": "^5.7.1",
+				"supports-color": "^5.5.0",
+				"touch": "^3.1.0",
+				"undefsafe": "^2.0.2",
+				"update-notifier": "^4.0.0"
+			}
+		},
+		"nopt": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
+			"integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
+			"dev": true,
+			"requires": {
+				"abbrev": "1"
+			}
+		},
+		"normalize-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+			"dev": true
+		},
+		"normalize-url": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
+			"integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
+			"dev": true
+		},
+		"npm-watch": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/npm-watch/-/npm-watch-0.7.0.tgz",
+			"integrity": "sha512-AN2scNyMljMGkn0mIkaRRk19I7Vx0qTK6GmsIcDblX5YRbSsoJORTAtrceICSx7Om9q48NWcwm/R0t6E7F4Ocg==",
+			"dev": true,
+			"requires": {
+				"nodemon": "^2.0.3",
+				"through2": "^2.0.0"
+			}
+		},
+		"once": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+			"dev": true,
+			"requires": {
+				"wrappy": "1"
+			}
+		},
+		"p-cancelable": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
+			"integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
+			"dev": true
+		},
+		"p-limit": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+			"dev": true,
+			"requires": {
+				"p-try": "^2.0.0"
+			}
+		},
+		"p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dev": true,
+			"requires": {
+				"p-limit": "^2.2.0"
+			}
+		},
+		"p-try": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+			"dev": true
+		},
+		"package-json": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
+			"integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
+			"dev": true,
+			"requires": {
+				"got": "^9.6.0",
+				"registry-auth-token": "^4.0.0",
+				"registry-url": "^5.0.0",
+				"semver": "^6.2.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true
+		},
+		"picomatch": {
+			"version": "2.2.2",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+			"integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+			"dev": true
+		},
+		"prepend-http": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+			"integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
+			"dev": true
+		},
+		"process-nextick-args": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+			"dev": true
+		},
+		"pstree.remy": {
+			"version": "1.1.8",
+			"resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
+			"integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==",
+			"dev": true
+		},
+		"pump": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+			"dev": true,
+			"requires": {
+				"end-of-stream": "^1.1.0",
+				"once": "^1.3.1"
+			}
+		},
+		"pupa": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/pupa/-/pupa-2.0.1.tgz",
+			"integrity": "sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==",
+			"dev": true,
+			"requires": {
+				"escape-goat": "^2.0.0"
+			}
+		},
+		"rc": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+			"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+			"dev": true,
+			"requires": {
+				"deep-extend": "^0.6.0",
+				"ini": "~1.3.0",
+				"minimist": "^1.2.0",
+				"strip-json-comments": "~2.0.1"
+			}
+		},
+		"readable-stream": {
+			"version": "2.3.7",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+			"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+			"dev": true,
+			"requires": {
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.3",
+				"isarray": "~1.0.0",
+				"process-nextick-args": "~2.0.0",
+				"safe-buffer": "~5.1.1",
+				"string_decoder": "~1.1.1",
+				"util-deprecate": "~1.0.1"
+			}
+		},
+		"readdirp": {
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
+			"integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+			"dev": true,
+			"requires": {
+				"picomatch": "^2.2.1"
+			}
+		},
+		"registry-auth-token": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz",
+			"integrity": "sha512-P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w==",
+			"dev": true,
+			"requires": {
+				"rc": "^1.2.8"
+			}
+		},
+		"registry-url": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
+			"integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
+			"dev": true,
+			"requires": {
+				"rc": "^1.2.8"
+			}
+		},
+		"require-directory": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+			"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+			"dev": true
+		},
+		"require-main-filename": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+			"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+			"dev": true
+		},
+		"responselike": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+			"integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+			"dev": true,
+			"requires": {
+				"lowercase-keys": "^1.0.0"
+			}
+		},
+		"safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"dev": true
+		},
+		"semver": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+			"dev": true
+		},
+		"semver-diff": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
+			"integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
+			"dev": true,
+			"requires": {
+				"semver": "^6.3.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"set-blocking": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+			"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+			"dev": true
+		},
+		"signal-exit": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+			"integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
+			"dev": true
+		},
+		"sprintf-js": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+			"dev": true
+		},
+		"string-width": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+			"integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+			"dev": true,
+			"requires": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+					"integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+					"dev": true
+				},
+				"emoji-regex": {
+					"version": "8.0.0",
+					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+					"dev": true
+				},
+				"is-fullwidth-code-point": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+					"dev": true
+				},
+				"strip-ansi": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+					"integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "^5.0.0"
+					}
+				}
+			}
+		},
+		"string_decoder": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+			"dev": true,
+			"requires": {
+				"safe-buffer": "~5.1.0"
+			}
+		},
+		"strip-ansi": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+			"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+			"dev": true,
+			"requires": {
+				"ansi-regex": "^4.1.0"
+			}
+		},
+		"strip-json-comments": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+			"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+			"dev": true
+		},
+		"supports-color": {
+			"version": "5.5.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+			"dev": true,
+			"requires": {
+				"has-flag": "^3.0.0"
+			}
+		},
+		"swagger-cli": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/swagger-cli/-/swagger-cli-4.0.4.tgz",
+			"integrity": "sha512-Cp8YYuLny3RJFQ4CvOBTaqmOOgYsem52dPx1xM5S4EUWFblIh2Q8atppMZvXKUr1e9xH5RwipYpmdUzdPcxWcA==",
+			"dev": true,
+			"requires": {
+				"@apidevtools/swagger-cli": "4.0.4"
+			},
+			"dependencies": {
+				"@apidevtools/swagger-cli": {
+					"version": "4.0.4",
+					"resolved": "https://registry.npmjs.org/@apidevtools/swagger-cli/-/swagger-cli-4.0.4.tgz",
+					"integrity": "sha512-hdDT3B6GLVovCsRZYDi3+wMcB1HfetTU20l2DC8zD3iFRNMC6QNAZG5fo/6PYeHWBEv7ri4MvnlKodhNB0nt7g==",
+					"dev": true,
+					"requires": {
+						"@apidevtools/swagger-parser": "^10.0.1",
+						"chalk": "^4.1.0",
+						"js-yaml": "^3.14.0",
+						"yargs": "^15.4.1"
+					}
+				},
+				"chalk": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^4.1.0",
+						"supports-color": "^7.1.0"
+					}
+				},
+				"has-flag": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "7.2.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^4.0.0"
+					}
+				}
+			}
+		},
+		"term-size": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz",
+			"integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==",
+			"dev": true
+		},
+		"through2": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+			"dev": true,
+			"requires": {
+				"readable-stream": "~2.3.6",
+				"xtend": "~4.0.1"
+			}
+		},
+		"to-readable-stream": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
+			"integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
+			"dev": true
+		},
+		"to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"dev": true,
+			"requires": {
+				"is-number": "^7.0.0"
+			}
+		},
+		"touch": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz",
+			"integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==",
+			"dev": true,
+			"requires": {
+				"nopt": "~1.0.10"
+			}
+		},
+		"type-fest": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+			"dev": true
+		},
+		"typedarray-to-buffer": {
+			"version": "3.1.5",
+			"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+			"integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+			"dev": true,
+			"requires": {
+				"is-typedarray": "^1.0.0"
+			}
+		},
+		"undefsafe": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.3.tgz",
+			"integrity": "sha512-nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A==",
+			"dev": true,
+			"requires": {
+				"debug": "^2.2.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+					"dev": true
+				}
+			}
+		},
+		"unique-string": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
+			"integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
+			"dev": true,
+			"requires": {
+				"crypto-random-string": "^2.0.0"
+			}
+		},
+		"update-notifier": {
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz",
+			"integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==",
+			"dev": true,
+			"requires": {
+				"boxen": "^4.2.0",
+				"chalk": "^3.0.0",
+				"configstore": "^5.0.1",
+				"has-yarn": "^2.1.0",
+				"import-lazy": "^2.1.0",
+				"is-ci": "^2.0.0",
+				"is-installed-globally": "^0.3.1",
+				"is-npm": "^4.0.0",
+				"is-yarn-global": "^0.3.0",
+				"latest-version": "^5.0.0",
+				"pupa": "^2.0.1",
+				"semver-diff": "^3.1.1",
+				"xdg-basedir": "^4.0.0"
+			}
+		},
+		"url-parse-lax": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+			"integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
+			"dev": true,
+			"requires": {
+				"prepend-http": "^2.0.0"
+			}
+		},
+		"util-deprecate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+			"dev": true
+		},
+		"validator": {
+			"version": "12.2.0",
+			"resolved": "https://registry.npmjs.org/validator/-/validator-12.2.0.tgz",
+			"integrity": "sha512-jJfE/DW6tIK1Ek8nCfNFqt8Wb3nzMoAbocBF6/Icgg1ZFSBpObdnwVY2jQj6qUqzhx5jc71fpvBWyLGO7Xl+nQ==",
+			"dev": true
+		},
+		"which-module": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+			"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+			"dev": true
+		},
+		"widest-line": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
+			"integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
+			"dev": true,
+			"requires": {
+				"string-width": "^4.0.0"
+			}
+		},
+		"wrap-ansi": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+			"integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+			"dev": true,
+			"requires": {
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+					"integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+					"dev": true
+				},
+				"strip-ansi": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+					"integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "^5.0.0"
+					}
+				}
+			}
+		},
+		"wrappy": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+			"dev": true
+		},
+		"write-file-atomic": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+			"integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+			"dev": true,
+			"requires": {
+				"imurmurhash": "^0.1.4",
+				"is-typedarray": "^1.0.0",
+				"signal-exit": "^3.0.2",
+				"typedarray-to-buffer": "^3.1.5"
+			}
+		},
+		"xdg-basedir": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
+			"integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
+			"dev": true
+		},
+		"xtend": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+			"dev": true
+		},
+		"y18n": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+			"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+			"dev": true
+		},
+		"yargs": {
+			"version": "15.4.1",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+			"integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+			"dev": true,
+			"requires": {
+				"cliui": "^6.0.0",
+				"decamelize": "^1.2.0",
+				"find-up": "^4.1.0",
+				"get-caller-file": "^2.0.1",
+				"require-directory": "^2.1.1",
+				"require-main-filename": "^2.0.0",
+				"set-blocking": "^2.0.0",
+				"string-width": "^4.2.0",
+				"which-module": "^2.0.0",
+				"y18n": "^4.0.0",
+				"yargs-parser": "^18.1.2"
+			}
+		},
+		"yargs-parser": {
+			"version": "18.1.3",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+			"integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+			"dev": true,
+			"requires": {
+				"camelcase": "^5.0.0",
+				"decamelize": "^1.2.0"
+			}
+		},
+		"z-schema": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/z-schema/-/z-schema-4.2.3.tgz",
+			"integrity": "sha512-zkvK/9TC6p38IwcrbnT3ul9in1UX4cm1y/VZSs4GHKIiDCrlafc+YQBgQBUdDXLAoZHf2qvQ7gJJOo6yT1LH6A==",
+			"dev": true,
+			"requires": {
+				"commander": "^2.7.1",
+				"lodash.get": "^4.4.2",
+				"lodash.isequal": "^4.5.0",
+				"validator": "^12.0.0"
+			}
+		}
+	}
 }
diff --git a/packages/spec/package.json b/packages/spec/package.json
index b4b399874a..940ab6e3b9 100644
--- a/packages/spec/package.json
+++ b/packages/spec/package.json
@@ -1,14 +1,23 @@
 {
 	"name": "@directus/specs",
 	"version": "9.0.0-beta.10",
-	"description": "Specification of the Directus Api",
+	"description": "OpenAPI Specification of the Directus API",
 	"main": "index.js",
 	"scripts": {
 		"ui:watch": "swagger-ui-watcher specs/openapi.yaml",
 		"validate": "swagger-cli validate specs/openapi.yaml",
 		"build": "swagger-cli bundle specs/openapi.yaml -o dist/openapi.json",
 		"build:deref": "swagger-cli bundle specs/openapi.yaml -o dist/openapi-deref.json --dereference",
-		"prepublishOnly": "npm run build && npm run build:deref"
+		"prepublishOnly": "npm run build && npm run build:deref",
+		"dev": "npm-watch build"
+	},
+	"watch": {
+		"build": {
+      "patterns": ["specs"],
+      "extensions": "yaml",
+      "quiet": true,
+      "silent": true
+    }
 	},
 	"repository": {
 		"type": "git",
@@ -26,5 +35,9 @@
 		"README.md",
 		"index.js"
 	],
-	"gitHead": "4476da28dbbc2824e680137aa28b2b91b5afabec"
+	"gitHead": "4476da28dbbc2824e680137aa28b2b91b5afabec",
+	"devDependencies": {
+		"npm-watch": "^0.7.0",
+		"swagger-cli": "^4.0.4"
+	}
 }
diff --git a/packages/spec/specs/components/activity.yaml b/packages/spec/specs/components/activity.yaml
index 85dd661de8..973066b37c 100644
--- a/packages/spec/specs/components/activity.yaml
+++ b/packages/spec/specs/components/activity.yaml
@@ -8,39 +8,44 @@ properties:
     description: Action that was performed.
     example: update
     type: string
-    enum: [authenticate, comment, upload, create, update, delete, soft-delete, revert, invalid-credentials]
+    enum:
+      - create
+      - update
+      - delete
+      - authenticate
   user:
-    description: Unique identifier of the user account who caused this action.
-    example: 63716273-0f29-4648-8a2a-2af2948f6f78
-    type: string
-    nullable: true # States the SQL structure
+    description: The user who performed this action.
+    oneOf:
+      - type: string
+      - $ref: "../openapi.yaml#/components/schemas/User"
+    nullable: true
   timestamp:
     description: When the action happened.
-    example: '2019-12-05 22:52:09'
+    example: "2019-12-05T22:52:09Z"
     type: string
     format: date-time
   ip:
     description: The IP address of the user at the time the action took place.
-    example: 160.72.72.58
+    example: 127.0.0.1
     oneOf:
       - type: string
         format: ipv4
-      - type: string
-        enum: [localhost]
   user_agent:
     description: User agent string of the browser the user used when the action took place.
     example: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_1) AppleWebKit/537.36 (KHTML,like Gecko) Chrome/78.0.3904.108 Safari/537.36
     type: string
   collection:
     description: Collection identifier in which the item resides.
-    example: movies
-    type: string
+    oneOf:
+      - type: string
+      - $ref: "../openapi.yaml#/components/schemas/Collection"
   item:
     description: Unique identifier for the item the action applied to. This is always a string, even for integer primary keys.
-    example: '328'
+    example: "328"
     type: string
   comment:
-    description: User comment. This will store the comments that show up in the right
+    description:
+      User comment. This will store the comments that show up in the right
       sidebar of the item edit page in the admin app.
     example: null
     type: string
diff --git a/packages/spec/specs/components/collection.yaml b/packages/spec/specs/components/collection.yaml
index f5e486dbfc..679e15cbc8 100644
--- a/packages/spec/specs/components/collection.yaml
+++ b/packages/spec/specs/components/collection.yaml
@@ -1,43 +1,85 @@
 type: object
 properties:
   collection:
-    description: The collection name.
+    description: The collection key.
     example: customers
     type: string
   meta:
     description: Metadata of the collection.
     type: object
+    example: null
     nullable: true
     properties:
       collection:
-        description: The collection name again!
+        description: The collection key.
+        example: customers
         type: string
-      hidden:
-        type: boolean
-      singleton:
-        type: boolean
       icon:
+        description: Name of a Google Material Design Icon that's assigned to this collection.
         type: string
+        example: people
         nullable: true
       note:
+        description: A note describing the collection.
         type: string
-        nullable: true
-      translation:
-        type: string
+        example: null
         nullable: true
       display_template:
+        description: Text representation of how items from this collection are shown across the system.
         type: string
+        example: null
+        nullable: true
+      hidden:
+        description: Whether or not the collection is hidden from the navigation in the admin app.
+        type: boolean
+        example: false
+      singleton:
+        description: Whether or not the collection is treated as a single object.
+        type: boolean
+        example: false
+      translations:
+        description: Key value pairs of how to show this collection's name in different languages in the admin app.
+        type: string
+        example: null
+        nullable: true
+      archive_field:
+        description: What field holds the archive value.
+        type: string
+        example: null
+        nullable: true
+      archive_app_filter:
+        description: What value to use for "archived" items.
+        type: string
+        example: null
+        nullable: true
+      archive_value:
+        description: What value to use to "unarchive" items.
+        type: string
+        example: null
+        nullable: true
+      unarchive_value:
+        description: Whether or not to show the "archived" filter.
+        type: string
+        example: null
+        nullable: true
+      sort_field:
+        description: The sort field in the collection.
+        type: string
+        example: null
         nullable: true
   schema:
     type: object
     properties:
       name:
+        description: The collection key.
         type: string
+        example: customers
       schema:
+        description: Database schema (pg only).
+        example: public
         type: string
       comment:
+        description: Comment as saved in the database.
         type: string
-      collation:
-        type: string
-      engine:
-        type: string
+        example: null
+        nullable: true
diff --git a/packages/spec/specs/components/field.yaml b/packages/spec/specs/components/field.yaml
index 5e93ece2ea..5a63edc112 100644
--- a/packages/spec/specs/components/field.yaml
+++ b/packages/spec/specs/components/field.yaml
@@ -1,10 +1,5 @@
 type: object
 properties:
-  id:
-    description: Unique identifier for the field in the `directus_fields` collection.
-    example: 167
-    type: integer
-    nullable: true
   collection:
     description: Unique name of the collection this field is in.
     example: about_us
@@ -13,102 +8,159 @@ properties:
     description: Unique name of the field. Field name is unique within the collection.
     example: id
     type: string
-  auto_increment:
-    description: If the value in this field is auto incremented. Only applies to integer
-      type fields.
-    example: true
-    type: boolean
-  datatype:
-    description: SQL datatype of the column that corresponds to this field.
-    example: INT
-    type: string
-    nullable: true
-  group:
-    description: What field group this field is part of.
-    example: null
-    type: integer
-    nullable: true
-  hidden_browse:
-    description: If this field should be hidden from the item browse (listing) page.
-    example: true
-    type: boolean
-  hidden_detail:
-    description: If this field should be hidden from the item detail (edit) page.
-    example: true
-    type: boolean
-  interface:
-    description: What interface is used in the admin app to edit the value for this
-      field.
-    example: primary-key
-    type: string
-    nullable: true
-  length:
-    description: Length of the field. Will be used in SQL to set the `length` property
-      of the colummn.
-    example: '10'
-    type: string
-    nullable: true
-  locked:
-    description: If the field can be altered by the end user. Directus system fields
-      have this value set to `true`.
-    example: true
-    type: boolean
-  note:
-    description: A user provided note for the field. Will be rendered alongside the
-      interface on the edit page.
-    example: ''
-    type: string
-    nullable: true
-  options:
-    description: Options for the interface that's used. This format is based on the
-      individual interface.
-    example: null
-    type: object
-    nullable: true
-  primary_key:
-    description: If this field is the primary key of the collection.
-    example: true
-    type: boolean
-  readonly:
-    description: Prevents the user from editing the value in the field.
-    example: false
-    type: boolean
-  required:
-    description: If this field requires a value.
-    example: true
-    type: boolean
-  signed:
-    description: If the value is signed or not. Only applies to integer type fields.
-    example: false
-    type: boolean
-  sort:
-    description: Sort order of this field on the edit page of the admin app.
-    example: 1
-    type: integer
-    nullable: true
-  translation:
-    description: 'Key value pair of `<locale>: <translation>` that allows the user
-      to change the displayed name of the field in the admin app.'
-    example: null
-    type: object
-    nullable: true
   type:
     description: Directus specific data type. Used to cast values in the API.
     example: integer
     type: string
-  unique:
-    description: If the value of this field should be unique within the collection.
-    example: false
-    type: boolean
-  validation:
-    description: User provided regex that will be used in the API to validate incoming
-      values. It uses the PHP flavor of RegEX.
-    example: null
-    type: string
+  schema:
+    description: The schema info.
+    type: object
+    properties:
+      name:
+        description: The name of the field.
+        example: title
+        type: string
+      table:
+        description: The collection of the field.
+        example: posts
+        type: string
+      type:
+        description: The datatype of the field.
+        example: string
+        type: string
+      default_value:
+        description: The default value of the field.
+        example: null
+        type: string
+        nullable: true
+      max_length:
+        description: The max length of the field.
+        example: null
+        type: integer
+        nullable: true
+      is_nullable:
+        description: If the field is nullable.
+        example: false
+        type: boolean
+      is_primary_key:
+        description: If the field is primary key.
+        example: false
+        type: boolean
+      has_auto_increment:
+        description: If the field has auto increment.
+        example: false
+        type: boolean
+      foreign_key_column:
+        description: Related column from the foreign key constraint.
+        example: null
+        type: string
+        nullable: true
+      foreign_key_table:
+        description: Related table from the foreign key constraint.
+        example: null
+        type: string
+        nullable: true
+      comment:
+        description: Comment as saved in the database.
+        example: null
+        type: string
+        nullable: true
+      schema:
+        description: Database schema (pg only).
+        example: public
+        type: string
+      foreign_key_schema:
+        description: Related schema from the foreign key constraint (pg only).
+        example: null
+        type: string
+        nullable: true
+  meta:
+    description: The meta info.
+    type: object
     nullable: true
-  width:
-    description: Width of the field on the edit form.
-    example: null
-    type: string
-    nullable: true
-    enum: [half, half-left, half-right, full, fill, null]
\ No newline at end of file
+    properties:
+      id:
+        description: Unique identifier for the field in the `directus_fields` collection.
+        example: 3
+        type: integer
+      collection:
+        description: Unique name of the collection this field is in.
+        example: posts
+        type: string
+      field:
+        description: Unique name of the field. Field name is unique within the collection.
+        example: title
+        type: string
+      special:
+        description: Transformation flags for field
+        example: null
+        type: array
+        items:
+          type: string
+        nullable: true
+      interface:
+        description:
+          What interface is used in the admin app to edit the value for this field.
+        example: primary-key
+        type: string
+        nullable: true
+      options:
+        description:
+          Options for the interface that's used. This format is based on the individual interface.
+        example: null
+        type: object
+        nullable: true
+      display:
+        description: What display is used in the admin app to display the value for this field.
+        example: null
+        type: string
+        nullable: true
+      display_options:
+        description: Options for the display that's used. This format is based on the individual display.
+        example: null
+        type: object
+        nullable: true
+      locked:
+        description:
+          If the field can be altered by the end user. Most Directus system fields
+          have this value set to `true`.
+        example: true
+        type: boolean
+      readonly:
+        description: Prevents the user from editing the value in the field.
+        example: false
+        type: boolean
+      hidden:
+        description: If this field should be hidden.
+        example: true
+        type: boolean
+      sort:
+        description: Sort order of this field on the edit page of the admin app.
+        example: 1
+        type: integer
+        nullable: true
+      width:
+        description: Width of the field on the edit form.
+        example: null
+        type: string
+        nullable: true
+        enum: [half, half-left, half-right, full, fill, null]
+      group:
+        description: What field group this field is part of.
+        example: null
+        type: integer
+        nullable: true
+      translations:
+        description:
+          "Key value pair of `<locale>: <translation>` that allows the user
+          to change the displayed name of the field in the admin app."
+        example: null
+        type: object
+        nullable: true
+      note:
+        description:
+          A user provided note for the field. Will be rendered alongside the
+          interface on the edit page.
+        example: ""
+        type: string
+        nullable: true
diff --git a/packages/spec/specs/components/file.yaml b/packages/spec/specs/components/file.yaml
index 7a89306a30..332b2b6569 100644
--- a/packages/spec/specs/components/file.yaml
+++ b/packages/spec/specs/components/file.yaml
@@ -1,60 +1,71 @@
 type: object
 properties:
+  id:
+    description: Unique identifier for the file.
+    example: 8cbb43fe-4cdf-4991-8352-c461779cec02
+    type: string
+  storage:
+    description:
+      Where the file is stored. Either `local` for the local filesystem
+      or the name of the storage adapter (for example `s3`).
+    example: local
+    type: string
+  filename_disk:
+    description:
+      Name of the file on disk. By default, Directus uses a random hash
+      for the filename.
+    example: a88c3b72-ac58-5436-a4ec-b2858531333a.jpg
+    type: string
+  filename_download:
+    description: How you want to the file to be named when it's being downloaded.
+    example: avatar.jpg
+    type: string
+  title:
+    description:
+      Title for the file. Is extracted from the filename on upload, but
+      can be edited by the user.
+    example: User Avatar
+    type: string
+  type:
+    description: MIME type of the file.
+    example: image/jpeg
+    type: string
+  folder:
+    description: Virtual folder where this file resides in.
+    example: null
+    oneOf:
+      - type: string
+      - $ref: "../openapi.yaml#/components/schemas/Folder"
+    nullable: true
+  uploaded_by:
+    description: Who uploaded the file.
+    example: 63716273-0f29-4648-8a2a-2af2948f6f78
+    oneOf:
+      - type: string
+      - $ref: "../openapi.yaml#/components/schemas/User"
+  uploaded_on:
+    description: When the file was uploaded.
+    example: "2019-12-03T00:10:15+00:00"
+    type: string
+    format: date-time
   charset:
     description: Character set of the file.
     example: binary
     type: string
-    nullable: true # Should not be null?
-  checksum:
-    description: Represents the sum of the correct digits of the file, can be used
-      to detect errors in and duplicates of the file later.
-    example: d41d8cd98f00b204e9800998ecf8427e
-    type: string
-  data:
-    example:
-      embed: null
-      full_url: 'https://demo.directus.io/uploads/thumper/originals/a88c3b72-ac58-5436-a4ec-b2858531333a.jpg'
-      thumbnails:
-        dimension: 64x64
-        height: 64
-        relative_url: '/thumper/assets/pnw7s9lqy68048g0?key=directus-small-crop'
-        url: 'https://demo.directus.io/thumper/assets/pnw7s9lqy68048g0?key=directus-small-crop'
-        width: 64
-      url: '/uploads/thumper/originals/a88c3b72-ac58-5436-a4ec-b2858531333a.jpg'
-    properties:
-      full_url:
-        description: Full URL to the original file.
-        type: string
-      thumbnails:
-        description: List of all available asset sizes with links.
-        type: array
-        nullable: true
-        items:
-          type: object
-          properties:
-            dimension:
-              description: Width x height of the thumbnail.
-              type: string
-            height:
-              description: Height of the thumbnail in pixels.
-              type: integer
-            relative_url:
-              description: Relative URL to the thumbnail.
-              type: string
-            url:
-              description: Full URL to the thumbnail.
-              type: string
-            width:
-              description: Width of the thumbnail in pixels.
-              type: integer
-      url:
-        description: Relative URL to the original file.
-        type: string
-    type: object
-  description:
-    description: Description for the file.
-    example: ''
-    type: string
+    nullable: true
+  filesize:
+    description: Size of the file in bytes.
+    example: 137862
+    type: integer
+  width:
+    description: Width of the file in pixels. Only applies to images.
+    example: 800
+    type: integer
+    nullable: true
+  height:
+    description: Height of the file in pixels. Only applies to images.
+    example: 838
+    type: integer
     nullable: true
   duration:
     description: Duration of the file in seconds. Only applies to audio and video.
@@ -66,82 +77,25 @@ properties:
     example: null
     type: string
     nullable: true
-  filename_disk:
-    description: Name of the file on disk. By default, Directus uses a random hash
-      for the filename.
-    example: a88c3b72-ac58-5436-a4ec-b2858531333a.jpg
+  description:
+    description: Description for the file.
     type: string
-  filename_download:
-    description: How you want to the file to be named when it's being downloaded.
-    example: avatar.jpg
-    type: string
-  filesize:
-    description: Size of the file in bytes.
-    example: 137862
-    type: integer
-  folder:
-    description: Virtual folder where this file resides in.
-    example: null
-    $ref: '../openapi.yaml#/components/schemas/Folder'
     nullable: true
-  height:
-    description: Height of the file in pixels. Only applies to images.
-    example: 838
-    type: integer
-    nullable: true
-  id:
-    description: Unique identifier for the file.
-    example: 8cbb43fe-4cdf-4991-8352-c461779cec02
-    type: string
   location:
-    description: Where the file was created. Is automatically populated based on EXIF
+    description:
+      Where the file was created. Is automatically populated based on EXIF
       data for images.
     type: string
     nullable: true
-  metadata:
-    description: User provided miscellaneous key value pairs that serve as additional
-      metadata for the file.
-    example: null
-    type: object
-    nullable: true
-  private_hash:
-    description: Random hash used to access the file privately. This can be rotated
-      to prevent unauthorized access to the file.
-    example: pnw7s9lqy68048g0
-    type: string
-  storage:
-    description: Where the file is stored. Either `local` for the local filesystem
-      or the name of the storage adapter (for example `s3`).
-    example: local
-    type: string
   tags:
-    description: Tags for the file. Is automatically populated based on EXIF data
-      for images.
+    description:
+      Tags for the file. Is automatically populated based on EXIF data for images.
     type: array
     nullable: true
     items:
       type: string
-  title:
-    description: Title for the file. Is extracted from the filename on upload, but
-      can be edited by the user.
-    example: User Avatar
-    type: string
-  type:
-    description: MIME type of the file.
-    example: image/jpeg
-    type: string
-  uploaded_by:
-    description: Who uploaded the file.
-    example: 63716273-0f29-4648-8a2a-2af2948f6f78
-    type: string
-    # $ref: '../openapi.yaml#/components/schemas/User'
-  uploaded_on:
-    description: When the file was uploaded.
-    example: '2019-12-03T00:10:15+00:00'
-    type: string
-    format: date-time
-  width:
-    description: Width of the file in pixels. Only applies to images.
-    example: 800
-    type: integer
-    nullable: true
\ No newline at end of file
+  metadata:
+    description:
+      IPTC, EXIF, and ICC metadata extracted from file
+    type: object
+    nullable: true
diff --git a/packages/spec/specs/components/folder.yaml b/packages/spec/specs/components/folder.yaml
index 70f58730d1..15f6e678c2 100644
--- a/packages/spec/specs/components/folder.yaml
+++ b/packages/spec/specs/components/folder.yaml
@@ -11,5 +11,7 @@ properties:
   parent:
     description: Unique identifier of the parent folder. This allows for nested folders.
     example: null
-    type: string
+    oneOf:
+      - type: string
+      - $ref: "../openapi.yaml#/components/schemas/Folder"
     nullable: true
diff --git a/packages/spec/specs/components/item.yaml b/packages/spec/specs/components/item.yaml
index 4ee2fb1f9d..03b0d8bfea 100644
--- a/packages/spec/specs/components/item.yaml
+++ b/packages/spec/specs/components/item.yaml
@@ -1,2 +1,2 @@
 type: object
-properties: {}
\ No newline at end of file
+properties: {}
diff --git a/packages/spec/specs/components/permissions.yaml b/packages/spec/specs/components/permissions.yaml
index 1f07a39c0e..044696fd64 100644
--- a/packages/spec/specs/components/permissions.yaml
+++ b/packages/spec/specs/components/permissions.yaml
@@ -1,70 +1,46 @@
 type: object
 properties:
-  collection:
-    description: What collection this permission applies to.
-    example: customers
-    type: string
-  comment:
-    description: If the user can post comments.
-    example: update
-    type: string
-    enum: [none, create, update, full]
-  create:
-    description: If the user can create items.
-    example: full
-    type: string
-    enum: [none, full]
-  delete:
-    description: If the user can update items.
-    example: none
-    type: string
-    enum: [none, mine, role, full]
-  explain:
-    description: If the user is required to leave a comment explaining what was changed.
-    example: none
-    type: string
-    enum: [none, create, update, always]
   id:
     description: Unique identifier for the permission.
     example: 1
     type: integer
-  read:
-    description: If the user can read items.
-    example: mine
-    type: string
-    enum: [none, mine, role, full]
-  read_field_blacklist:
-    description: Explicitly denies read access for specific fields.
-    example: []
-    type: array
-    items:
-      type: string
   role:
     description: Unique identifier of the role this permission applies to.
     example: 2f24211d-d928-469a-aea3-3c8f53d4e426
     type: string
-    nullable: true # Should this be nullable?
-  status:
-    description: What status this permission applies to.
-    example: null
-    type: string
     nullable: true
-  status_blacklist:
-    description: Explicitly denies specific statuses to be used.
-    example: []
-    oneOf:
-      - type: array
-        nullable: true
-        items:
-          type: string
-  update:
-    description: If the user can update items.
-    example: none
+  collection:
+    description: What collection this permission applies to.
+    example: customers
     type: string
-    enum: [none, mine, role, full]
-  write_field_blacklist:
-    description: Explicitly denies write access for specific fields.
-    example: []
+  action:
+    description: What action this permission applies to.
+    example: create
+    type: string
+    enum:
+      - create
+      - read
+      - update
+      - delete
+  permissions:
+    description: JSON structure containing the permissions checks for this permission.
+    type: object
+    nullable: true
+  validation:
+    description: JSON structure containing the validation checks for this permission.
+    type: object
+    nullable: true
+  presets:
+    description: JSON structure containing the preset value for created/updated items.
+    type: object
+    nullable: true
+  fields:
+    description: CSV of fields that the user is allowed to interact with.
     type: array
     items:
-      type: string
\ No newline at end of file
+      type: string
+    nullable: true
+  limit:
+    description: Maximum amount of items the user can interact with at a time.
+    type: number
+    nullable: true
diff --git a/packages/spec/specs/components/preset.yaml b/packages/spec/specs/components/preset.yaml
index 5c59944b48..9d24e66bae 100644
--- a/packages/spec/specs/components/preset.yaml
+++ b/packages/spec/specs/components/preset.yaml
@@ -1,73 +1,72 @@
 type: object
 properties:
+  id:
+    description: Unique identifier for this single collection preset.
+    example: 155
+    type: integer
+  bookmark:
+    description:
+      Name for the bookmark. If this is set, the preset will be considered a bookmark.
+    nullable: true
+    type: string
+  user:
+    description:
+      The unique identifier of the user to whom this collection preset applies.
+    example: 63716273-0f29-4648-8a2a-2af2948f6f78
+    nullable: true
+    oneOf:
+      - type: string
+      - $ref: "../openapi.yaml#/components/schemas/User"
+  role:
+    description:
+      The unique identifier of a role in the platform. If `user` is null,
+      this will be used to apply the collection preset or bookmark for all users in
+      the role.
+    example: 50419801-0f30-8644-2b3c-9bc2d980d0a0
+    nullable: true
+    oneOf:
+      - type: string
+      - $ref: "../openapi.yaml#/components/schemas/Role"
   collection:
     description: What collection this collection preset is used for.
     example: articles
+    oneOf:
+      - type: string
+      - $ref: "../openapi.yaml#/components/schemas/Collection"
+  search:
+    description: Search query.
     type: string
+    nullable: true
   filters:
     description: The filters that the user applied.
     example:
-      field: title
-      operator: contains
-      value: Hello
+      - key: 7RwVrquB5dPmfbrI1rcWy
+        field: title
+        operator: contains
+        value: Hello
     type: array
     nullable: true
     items:
       type: object
-  id:
-    description: Unique identifier for this single collection preset.
-    example: '155'
-    type: integer
-  role:
-    description: The unique identifier of a role in the platform. If `user` is null,
-      this will be used to apply the collection preset or bookmark for all users in
-      the role.
-    example: 63716273-0f29-4648-8a2a-2af2948f6f78
-    nullable: true
+  layout:
+    description: Key of the layout that is used.
     type: string
-  search_query:
-    description: What the user searched for in search/filter in the header bar.
     example: null
-    type: string
-    nullable: true
-  title:
-    description: Name for the bookmark. If this is set, the collection preset will
-      be considered to be a bookmark.
-    example: null
-    type: string
-    nullable: true
-  translation:
-    description: Key value pair of language-translation. Can be used to translate
-      the bookmark title in multiple languages.
-    example: null
-    type: object
-    nullable: true
-  user:
-    description: The unique identifier of the user to whom this collection preset
-      applies.
-    example: 63716273-0f29-4648-8a2a-2af2948f6f78
-    nullable: true
-    type: string
-  view_options:
-    description: Options of the views. The properties in here are controlled by the
-      layout.
-    example:
-      timeline:
-        color: action
-        content: excerpt
-        date: published_on
-        title: '{{ title }} ({{ author.first_name }} {{ author.last_name }})'
-    type: object
-    nullable: true
-  view_query:
-    description: View query that's saved per view type. Controls what data is fetched
+  layout_query:
+    description:
+      Layout query that's saved per layout type. Controls what data is fetched
       on load. These follow the same format as the JS SDK parameters.
     example:
-      timeline:
+      cards:
         sort: -published_on
-    type: object
     nullable: true
-  view_type:
-    description: Name of the view type that is used.
-    example: timeline
-    type: string
\ No newline at end of file
+  layout_options:
+    description:
+      Options of the views. The properties in here are controlled by the layout.
+    example:
+      cards:
+        icon: account_circle
+        title: "{{ first_name }} {{ last_name }}"
+        subtitle: "{{ title }}"
+        size: 3
+    nullable: true
diff --git a/packages/spec/specs/components/relation.yaml b/packages/spec/specs/components/relation.yaml
index a58f275ac5..32b90f9601 100644
--- a/packages/spec/specs/components/relation.yaml
+++ b/packages/spec/specs/components/relation.yaml
@@ -1,5 +1,9 @@
 type: object
 properties:
+  id:
+    description: Unique identifier for the relation.
+    example: 1
+    type: integer
   many_collection:
     description: Collection that has the field that holds the foreign key.
     example: directus_activity
@@ -9,7 +13,7 @@ properties:
     example: user
     type: string
   many_primary:
-    description: The primary field.
+    description: The primary key field of the current collection.
     example: id
     type: string
   one_collection:
@@ -22,16 +26,12 @@ properties:
     type: string
     nullable: true
   one_primary:
-    description: The primary field.
+    description: The primary key field of the related collection.
     example: id
     type: string
-  id:
-    description: Unique identifier for the relation.
-    example: 1
-    type: integer
   junction_field:
-    description: Field on the junction table that holds the primary key of the related
-      collection.
+    description:
+      Field on the junction table that holds the many field of the related relation.
     example: null
     type: string
     nullable: true
diff --git a/packages/spec/specs/components/revision.yaml b/packages/spec/specs/components/revision.yaml
index 33acaef79b..d9680e2888 100644
--- a/packages/spec/specs/components/revision.yaml
+++ b/packages/spec/specs/components/revision.yaml
@@ -1,12 +1,24 @@
 type: object
 properties:
-  activity:
-    description: Unique identifier for the [activity](/api/activity) record.
-    example: 2
+  id:
+    description: Unique identifier for the revision.
+    example: 1
     type: integer
+  activity:
+    description: Unique identifier for the activity record.
+    example: 2
+    oneOf:
+      - type: integer
+      - $ref: "../openapi.yaml#/components/schemas/Activity"
   collection:
     description: Collection of the updated item.
     example: articles
+    oneOf:
+      - type: string
+      - $ref: "../openapi.yaml#/components/schemas/Collection"
+  item:
+    description: Primary key of updated item.
+    example: "168"
     type: string
   data:
     description: Copy of item state at time of update.
@@ -14,38 +26,18 @@ properties:
       author: 1
       body: This is my first post
       featured_image: 15
-      id: '168'
+      id: "168"
       title: Hello, World!
     type: object
-    nullable: true # Should this be nullable?
+    nullable: true
   delta:
     description: Changes between the previous and the current revision.
     example:
       title: Hello, World!
-    oneOf:
-      - type: object
-  id:
-    description: Unique identifier for the revision.
-    example: 1
+    type: object
+  parent:
+    description:
+      If the current item was updated relationally, this is the id of the parent revision record
+    example: null
     type: integer
-  item:
-    description: Primary key of updated item.
-    example: '168'
-    type: string
-  parent_changed:
-    description: If the current item was updated relationally, this shows if the parent
-      item was updated as well.
-    example: false
-    type: boolean
-  parent_collection:
-    description: If the current item was updated relationally, this is the collection
-      of the parent item.
-    example: null
-    type: string
     nullable: true
-  parent_item:
-    description: If the current item was updated relationally, this is the unique
-      identifier of the parent item.
-    example: null
-    type: string
-    nullable: true
\ No newline at end of file
diff --git a/packages/spec/specs/components/role.yaml b/packages/spec/specs/components/role.yaml
index 2fa154c67e..035618125a 100644
--- a/packages/spec/specs/components/role.yaml
+++ b/packages/spec/specs/components/role.yaml
@@ -1,43 +1,51 @@
 type: object
 properties:
-  collection_listing:
-    description: Custom override for the admin app collection navigation.
-    example: null
-    type: object
-    nullable: true
+  id:
+    description: Unique identifier for the role.
+    example: 2f24211d-d928-469a-aea3-3c8f53d4e426
+    type: string
+  name:
+    description: Name of the role.
+    example: Administrator
+    type: string
+  icon:
+    description: The role's icon.
+    example: verified_user
+    type: string
   description:
     description: Description of the role.
     example: Admins have access to all managed data within the system by default
     type: string
     nullable: true
-  enforce_tfa:
-    description: Whether or not this role enforces the use of 2FA.
-    example: false
-    type: boolean
-  external_id:
-    description: ID used with external services in SCIM.
-    example: null
-    type: string
-    nullable: true
-  id:
-    description: Unique identifier for the role.
-    example: 2f24211d-d928-469a-aea3-3c8f53d4e426
-    type: string
-  ip_whitelist:
-    description: Array of IP addresses that are allowed to connect to the API as a
+  ip_access:
+    description:
+      Array of IP addresses that are allowed to connect to the API as a
       user of this role.
     example: []
     type: array
     items:
       type: string
-  module_listing:
+  enforce_tfa:
+    description: Whether or not this role enforces the use of 2FA.
+    example: false
+    type: boolean
+  module_list:
     description: Custom override for the admin app module bar navigation.
     example: null
     type: array
     items:
       type: object
     nullable: true
-  name:
-    description: Name of the role.
-    example: Administrator
-    type: string
\ No newline at end of file
+  collection_list:
+    description: Custom override for the admin app collection navigation.
+    example: null
+    type: object
+    nullable: true
+  admin_access:
+    description: Admin role. If true, skips all permission checks.
+    example: false
+    type: boolean
+  app_access:
+    description: The users in the role are allowed to use the app.
+    example: true
+    type: boolean
diff --git a/packages/spec/specs/components/setting.yaml b/packages/spec/specs/components/setting.yaml
index 4171ab656f..251e57d4fc 100644
--- a/packages/spec/specs/components/setting.yaml
+++ b/packages/spec/specs/components/setting.yaml
@@ -2,6 +2,82 @@ type: object
 properties:
   id:
     description: Unique identifier for the setting.
-    example: 1
     type: integer
-additionalProperties: true
\ No newline at end of file
+    example: 1
+  project_name:
+    description: The name of the project.
+    type: string
+    example: Directus
+  project_url:
+    description: The url of the project.
+    type: string
+    example: null
+    nullable: true
+  project_color:
+    description: The brand color of the project.
+    type: string
+    example: null
+    nullable: true
+  project_logo:
+    description: The logo of the project.
+    type: string
+    example: null
+    nullable: true
+  public_foreground:
+    description: The foreground of the project.
+    type: string
+    example: null
+    nullable: true
+  public_background:
+    description: The background of the project.
+    type: string
+    example: null
+    nullable: true
+  public_note:
+    description: Note rendered on the public pages of the app.
+    type: string
+    example: null
+    nullable: true
+  auth_login_attempts:
+    description: Allowed authentication login attempts before the user's status is set to blocked.
+    type: integer
+    example: 25
+  auth_password_policy:
+    description: Authentication password policy.
+    type: string
+    nullable: true
+  storage_asset_transform:
+    description: What transformations are allowed in the assets endpoint.
+    type: string
+    enum:
+      - all
+      - none
+      - presets
+    example: "all"
+    nullable: true
+  storage_asset_presets:
+    description: Array of allowed
+    type: array
+    items:
+      type: object
+      properties:
+        key:
+          description: Key for the asset. Used in the assets endpoint.
+          type: string
+        fit:
+          description: Whether to crop the thumbnail to match the size, or maintain the aspect ratio.
+          type: string
+          enum:
+            - cover
+            - contain
+        width:
+          description: Width of the thumbnail.
+          type: integer
+        height:
+          description: Height of the thumbnail.
+          type: integer
+        quality:
+          description: Quality of the compression used.
+          type: integer
+    example: null
+    nullable: true
diff --git a/packages/spec/specs/components/user.yaml b/packages/spec/specs/components/user.yaml
index aee4d712c2..d03fbd35ff 100644
--- a/packages/spec/specs/components/user.yaml
+++ b/packages/spec/specs/components/user.yaml
@@ -1,76 +1,91 @@
 type: object
 properties:
-  tfa_secret:
-    description: The 2FA secret string that's used to generate one time passwords.
-    example: null
+  id:
+    description: Unique identifier for the user.
+    example: 63716273-0f29-4648-8a2a-2af2948f6f78
+    type: string
+  first_name:
+    description: First name of the user.
+    example: Admin
+    type: string
+  last_name:
+    description: Last name of the user.
+    example: User
     type: string
-    nullable: true
-  avatar:
-    description: The user's avatar.
-    example: null
-    oneOf:
-      - type: integer
-        nullable: true
-      - type: string
-      - $ref: '../openapi.yaml#/components/schemas/File'
-    nullable: true
   email:
     description: Unique email address for the user.
     example: admin@example.com
     type: string
     format: email
-  external_id:
-    description: ID used for SCIM.
+  password:
+    description: Password of the user.
+    type: string
+  location:
+    description: The user's location.
     example: null
     type: string
     nullable: true
-  first_name:
-    description: First name of the user.
-    example: Admin
-    type: string
-  id:
-    description: Unique identifier for the user.
-    example: 63716273-0f29-4648-8a2a-2af2948f6f78
-    type: string
-  last_login:
-    description: When this user logged in last.
-    example: '2020-05-31 14:32:37'
+  title:
+    description: The user's title.
+    example: null
     type: string
     nullable: true
-    format: date-time
-  last_name:
-    description: First name of the user.
-    example: User
-    type: string
-  last_page:
-    description: Last page that the user was on.
-    example: /my-project/settings/collections/a
+  description:
+    description: The user's description.
+    example: null
     type: string
     nullable: true
+  tags:
+    description: The user's tags.
+    example: null
+    type: array
+    nullable: true
+    items:
+      type: string
+  avatar:
+    description: The user's avatar.
+    example: null
+    oneOf:
+      - type: string
+      - $ref: "../openapi.yaml#/components/schemas/File"
+    nullable: true
   language:
     description: The user's language used in Directus.
     example: en-US
     type: string
-  role:
-    description: Unique identifier of the role of this user.
-    example: 2f24211d-d928-469a-aea3-3c8f53d4e426
-    type: string
-  status:
-    description: Status of the user.
-    example: active
-    type: string
-    enum: [active, invited, draft, suspended, deleted]
   theme:
     description: What theme the user is using.
     example: auto
     type: string
     enum: [light, dark, auto]
-  timezone:
-    description: The user's timezone.
-    example: America/New_York
-    type: string
-  title:
-    description: The user's title.
+  tfa_secret:
+    description: The 2FA secret string that's used to generate one time passwords.
     example: null
     type: string
-    nullable: true
\ No newline at end of file
+    nullable: true
+  status:
+    description: Status of the user.
+    example: active
+    type: string
+    enum: [active, invited, draft, suspended, deleted]
+  role:
+    description: Unique identifier of the role of this user.
+    example: 2f24211d-d928-469a-aea3-3c8f53d4e426
+    oneOf:
+      - type: string
+      - $ref: "../openapi.yaml#/components/schemas/Role"
+  token:
+    description: Static token for the user.
+    type: string
+    nullable: true
+  last_acces:
+    description: When this user used the API last.
+    example: "2020-05-31T14:32:37Z"
+    type: string
+    nullable: true
+    format: date-time
+  last_page:
+    description: Last page that the user was on.
+    example: /my-project/settings/collections/a
+    type: string
+    nullable: true
diff --git a/packages/spec/specs/components/webhook.yaml b/packages/spec/specs/components/webhook.yaml
index c2d3f4ea36..7d86b38319 100644
--- a/packages/spec/specs/components/webhook.yaml
+++ b/packages/spec/specs/components/webhook.yaml
@@ -3,4 +3,39 @@ properties:
   id:
     description: The index of the webhook.
     type: integer
-    example: 1
\ No newline at end of file
+    example: 1
+  name:
+    description: The name of the webhook.
+    type: string
+    example: create articles
+  method:
+    description: Method used in the webhook.
+    type: string
+    example: POST
+  url:
+    description: The url of the webhook.
+    type: string
+    example: null
+    nullable: true
+  status:
+    description: The status of the webhook.
+    type: string
+    example: inactive
+  data:
+    description: If yes, send the content of what was done
+    type: boolean
+    example: true
+  actions:
+    description: The actions that triggers this webhook.
+    type: array
+    items:
+      type: string
+    example: null
+    nullable: true
+  collections:
+    description: The collections that triggers this webhook.
+    type: array
+    items:
+      type: string
+    example: null
+    nullable: true
diff --git a/packages/spec/specs/openapi.yaml b/packages/spec/specs/openapi.yaml
index 0df514aa82..3018339880 100644
--- a/packages/spec/specs/openapi.yaml
+++ b/packages/spec/specs/openapi.yaml
@@ -1,19 +1,16 @@
 openapi: 3.0.1
 info:
-  title: Directus SDK
+  title: Directus API
   description: Template for generating any kind of SDK.
   contact:
     email: contact@directus.io
   license:
     name: GPL-3.0
-    url: 'https://www.gnu.org/licenses/gpl-3.0.de.html'
-  version: 1.0.0
+    url: "https://www.gnu.org/licenses/gpl-3.0.html"
+  version: 9.0.0
 externalDocs:
   description: Directus Docs
-  url: 'https://docs.directus.io'
-servers:
-  - url: 'https://demo.directus.io/'
-  - url: '/'
+  url: "https://docs.directus.io"
 tags:
   - name: Activity
     description: All events that happen within Directus are tracked and stored in the activities collection. This gives you full accountability over everything that happens.
@@ -21,8 +18,8 @@ tags:
     description: Image typed files can be dynamically resized and transformed to fit any need.
   - name: Authentication
     description: All events that happen within Directus are tracked and stored in the activities collection. This gives you full accountability over everything that happens.
-  - name: Collection presets
-    description: Collection presets hold the preferences of individual users of the platform. This allows Directus to show and maintain custom item listings for users of the app.
+  - name: Presets
+    description: Presets hold the preferences of individual users of the platform. This allows Directus to show and maintain custom item listings for users of the app.
   - name: Collections
     description: Collections are the individual collections of items, similar to tables in a database. Changes to collections will alter the schema of the database.
   - name: Extensions
@@ -35,20 +32,14 @@ tags:
     description: Folders don't do anything yet, but will be used in the (near) future to be able to group files.
   - name: Items
     description: Items are individual pieces of data in your database. They can be anything, from articles, to IoT status checks.
-  - name: Mail
-    description: Send electronic mail through the electronic post.
   - name: Permissions
     description: Permissions control who has access to what and when.
-  - name: Projects
-    description: Projects are the individual tenants of the platform. Each project has its own database and data.
   - name: Relations
     description: What data is linked to what other data. Allows you to assign authors to articles, products to sales, and whatever other structures you can think of.
   - name: Revisions
     description: Revisions are individual changes to items made. Directus keeps track of changes made, so you're able to revert to a previous state at will.
   - name: Roles
     description: Roles are groups of users that share permissions.
-  - name: SCIM
-    description: Directus partially supports Version 2 of System for Cross-domain Identity Management (SCIM). It is an open standard that allows for the exchange of user information between systems, therefore allowing users to be externally managed using the endpoints described below.
   - name: Server
     description: Access to where Directus runs. Allows you to make sure your server has everything needed to run the platform, and check what kind of latency we're dealing with.
   - name: Settings
@@ -60,244 +51,234 @@ tags:
   - name: Webhooks
     description: Webhooks.
 paths:
-
   # Activity
   /activity:
-    $ref: './paths/activity/activitys.yaml'
-  /activity/comment:
-    $ref: './paths/activity/activity-comments.yaml'
-  /activity/{id}:
-    $ref: './paths/activity/activity.yaml'
-  /activity/comment/{id}:
-    $ref: './paths/activity/activity-comment.yaml'
+    $ref: "./paths/activity/activities.yaml"
+  # /activity/comment:
+  #   $ref: "./paths/activity/activity-comments.yaml"
+  # /activity/{id}:
+  #   $ref: "./paths/activity/activity.yaml"
+  # /activity/comment/{id}:
+  #   $ref: "./paths/activity/activity-comment.yaml"
 
-  # Assets
-  /assets/{key}:
-    $ref: './paths/assets/assets.yaml'
+  # # Assets
+  # /assets/{id}:
+  #   $ref: "./paths/assets/assets.yaml"
 
-  # Authentication
-  /auth/login:
-    $ref: './paths/auth/login.yaml'
-  /auth/refresh:
-    $ref: './paths/auth/refresh.yaml'
-  /auth/logout:
-    $ref: './paths/auth/logout.yaml'
-  /auth/password/request:
-    $ref: './paths/auth/password-request.yaml'
-  /auth/password/reset:
-    $ref: './paths/auth/password-reset.yaml'
-  /auth/sso:
-    $ref: './paths/auth/sso.yaml'
-  /auth/sso/{provider}:
-    $ref: './paths/auth/sso-provider.yaml'
+  # # Authentication
+  # /auth/login:
+  #   $ref: "./paths/auth/login.yaml"
+  # /auth/refresh:
+  #   $ref: "./paths/auth/refresh.yaml"
+  # /auth/logout:
+  #   $ref: "./paths/auth/logout.yaml"
+  # /auth/password/request:
+  #   $ref: "./paths/auth/password-request.yaml"
+  # /auth/password/reset:
+  #   $ref: "./paths/auth/password-reset.yaml"
+  # /auth/sso:
+  #   $ref: "./paths/auth/sso.yaml"
+  # /auth/sso/{provider}:
+  #   $ref: "./paths/auth/sso-provider.yaml"
 
-  # Items
-  /items/{collection}:
-    $ref: './paths/items/items.yaml'
-  /items/{collection}/{id}:
-    $ref: './paths/items/item.yaml'
+  # # Items
+  # /items/{collection}:
+  #   $ref: "./paths/items/items.yaml"
+  # /items/{collection}/{id}:
+  #   $ref: "./paths/items/item.yaml"
 
-  # Presets
-  /presets:
-    $ref: './paths/presets/presets.yaml'
-  /presets/{id}:
-    $ref: './paths/presets/preset.yaml'
+  # # Presets
+  # /presets:
+  #   $ref: "./paths/presets/presets.yaml"
+  # /presets/{id}:
+  #   $ref: "./paths/presets/preset.yaml"
 
-  # Collections
-  /collections:
-    $ref: './paths/collections/collections.yaml'
-  /collections/{collection}:
-    $ref: './paths/collections/collection.yaml'
-  
-  # Extensions
-  /interfaces:
-    $ref: './paths/extensions/interfaces.yaml'
-  /layouts:
-    $ref: './paths/extensions/layouts.yaml'
-  /modules:
-    $ref: './paths/extensions/modules.yaml'
+  # # Collections
+  # /collections:
+  #   $ref: "./paths/collections/collections.yaml"
+  # /collections/{id}:
+  #   $ref: "./paths/collections/collection.yaml"
 
-  # Fields
-  /fields:
-    $ref: './paths/fields/fields.yaml'
-  /fields/{collection}:
-    $ref: './paths/fields/collection-fields.yaml'
-  /fields/{collection}/{field}:
-    $ref: './paths/fields/collection-field.yaml'
+  # # Extensions
+  # /extensions/interfaces:
+  #   $ref: "./paths/extensions/interfaces.yaml"
+  # /extensions/layouts:
+  #   $ref: "./paths/extensions/layouts.yaml"
+  # /extensions/displays:
+  #   $ref: "./paths/extensions/displays.yaml"
+  # /extensions/modules:
+  #   $ref: "./paths/extensions/modules.yaml"
 
-  # Files
-  /files:
-    $ref: './paths/files/files.yaml'
-  /files/{id}:
-    $ref: './paths/files/file.yaml'
-  /files/{id}/revisions:
-    $ref: './paths/files/revisions.yaml'
-  /files/{id}/revisions/{offset}:
-    $ref: './paths/files/revision.yaml'
+  # # Fields
+  # /fields:
+  #   $ref: "./paths/fields/fields.yaml"
+  # /fields/{collection}:
+  #   $ref: "./paths/fields/collection-fields.yaml"
+  # /fields/{collection}/{id}:
+  #   $ref: "./paths/fields/collection-field.yaml"
 
-  # Folders
-  /folders:
-    $ref: './paths/folders/folders.yaml'
-  /folders/{id}:
-    $ref: './paths/folders/folder.yaml'
+  # # Files
+  # /files:
+  #   $ref: "./paths/files/files.yaml"
+  # /files/{id}:
+  #   $ref: "./paths/files/file.yaml"
+  # /files/{id}/revisions:
+  #   $ref: "./paths/files/revisions.yaml"
+  # /files/{id}/revisions/{offset}:
+  #   $ref: "./paths/files/revision.yaml"
 
-  # Mail
-  /mail:
-    $ref: './paths/mail/mail.yaml'
+  # # Folders
+  # /folders:
+  #   $ref: "./paths/folders/folders.yaml"
+  # /folders/{id}:
+  #   $ref: "./paths/folders/folder.yaml"
 
-  # Permissions
-  /permissions:
-    $ref: './paths/permissions/permissions.yaml'
-  /permissions/me:
-    $ref: './paths/permissions/permissions-me.yaml'
-  /permissions/{id}:
-    $ref: './paths/permissions/permission.yaml'
-  /permissions/me/{collection}:
-    $ref: './paths/permissions/permissions-me-collection.yaml'
+  # # Permissions
+  # /permissions:
+  #   $ref: "./paths/permissions/permissions.yaml"
+  # /permissions/me:
+  #   $ref: "./paths/permissions/permissions-me.yaml"
+  # /permissions/{id}:
+  #   $ref: "./paths/permissions/permission.yaml"
 
-  # Relations
-  /relations:
-    $ref: './paths/relations/relations.yaml'
-  /relations/{id}:
-    $ref: './paths/relations/relation.yaml'
+  # # Relations
+  # /relations:
+  #   $ref: "./paths/relations/relations.yaml"
+  # /relations/{id}:
+  #   $ref: "./paths/relations/relation.yaml"
 
-  # Revisions
-  /revisions:
-    $ref: './paths/revisions/revisions.yaml'
-  /revisions/{id}:
-    $ref: './paths/revisions/revision.yaml'
+  # # Revisions
+  # /revisions:
+  #   $ref: "./paths/revisions/revisions.yaml"
+  # /revisions/{id}:
+  #   $ref: "./paths/revisions/revision.yaml"
 
-  # Revisions
-  /roles:
-    $ref: './paths/roles/roles.yaml'
-  /roles/{id}:
-    $ref: './paths/roles/role.yaml'
+  # # Roles
+  # /roles:
+  #   $ref: "./paths/roles/roles.yaml"
+  # /roles/{id}:
+  #   $ref: "./paths/roles/role.yaml"
 
-  # SCIM
-  /scim/v2/Users:
-    $ref: './paths/scim/users.yaml'
-  /scim/v2/Users/{id}:
-    $ref: './paths/scim/user.yaml'
-  /scim/v2/Groups:
-    $ref: './paths/scim/groups.yaml'
-  /scim/v2/Groups/{id}:
-    $ref: './paths/scim/group.yaml'
-  
-  # Server
-  /server/info:
-    $ref: './paths/server/info.yaml'
-    servers:
-      - url: 'https://demo.directus.io/'
-  /server/ping:
-    $ref: './paths/server/ping.yaml'
-    servers:
-      - url: 'https://demo.directus.io/'
+  # # Server
+  # /server/info:
+  #   $ref: "./paths/server/info.yaml"
+  # /server/ping:
+  #   $ref: "./paths/server/ping.yaml"
 
-  # Settings
-  /settings:
-    $ref: './paths/settings/settings.yaml'
+  # # Settings
+  # /settings:
+  #   $ref: "./paths/settings/settings.yaml"
 
-  # Users
-  /users:
-    $ref: './paths/users/users.yaml'
-  /users/me:
-    $ref: './paths/users/me.yaml'
-  /users/invite:
-    $ref: './paths/users/user-invite.yaml'
-  /users/{id}:
-    $ref: './paths/users/user.yaml'
-  /users/invite/{token}:
-    $ref: './paths/users/user-invite-token.yaml'
-  /users/{id}/track/page:
-    $ref: './paths/users/user-tracking.yaml'
+  # # Users
+  # /users:
+  #   $ref: "./paths/users/users.yaml"
+  # /users/{id}:
+  #   $ref: "./paths/users/user.yaml"
+  # /users/{id}/track/page:
+  #   $ref: "./paths/users/user-tracking.yaml"
+  # /users/invite:
+  #   $ref: "./paths/users/user-invite.yaml"
+  # /users/invite/accept:
+  #   $ref: "./paths/users/user-invite-accept.yaml"
+  # /users/me:
+  #   $ref: "./paths/users/me.yaml"
+  # /users/me/track/page:
+  #   $ref: "./paths/users/me-tracking.yaml"
+  # /users/me/tfa/enable:
+  #   $ref: "./paths/users/me-tfa-enable.yaml"
+  # /users/me/tfa/disable:
+  #   $ref: "./paths/users/me-tfa-disable.yaml"
 
-  # Utilities
-  /utils/hash:
-    $ref: './paths/utils/hash.yaml'
-  /utils/hash/verify:
-    $ref: './paths/utils/hash-match.yaml'
-  /utils/random/string:
-    $ref: './paths/utils/random.yaml'
+  # # Utilities
+  # /utils/hash:
+  #   $ref: "./paths/utils/hash.yaml"
+  # /utils/hash/verify:
+  #   $ref: "./paths/utils/hash-match.yaml"
+  # /utils/random/string:
+  #   $ref: "./paths/utils/random.yaml"
+  # /utils/sort/{collection}:
+  #   $ref: "./paths/utils/sort.yaml"
 
-  # Webhooks
-  /webhooks:
-    $ref: './paths/webhooks/webhooks.yaml'
+  # # Webhooks
+  # /webhooks:
+  #   $ref: "./paths/webhooks/webhooks.yaml"
+  # /webhooks/{id}:
+  #   $ref: "./paths/webhooks/webhook.yaml"
 
 components:
   schemas:
     Activity:
-      $ref: './components/activity.yaml'
+      $ref: "./components/activity.yaml"
     Preset:
-      $ref: './components/preset.yaml'
+      $ref: "./components/preset.yaml"
     Collection:
-      $ref: './components/collection.yaml'
+      $ref: "./components/collection.yaml"
     Field:
-      $ref: './components/field.yaml'
+      $ref: "./components/field.yaml"
     File:
-      $ref: './components/file.yaml'
+      $ref: "./components/file.yaml"
     Folder:
-      $ref: './components/folder.yaml'
+      $ref: "./components/folder.yaml"
     Item:
-      $ref: './components/item.yaml'
+      $ref: "./components/item.yaml"
     Permissions:
-      $ref: './components/permissions.yaml'
+      $ref: "./components/permissions.yaml"
     Relation:
-      $ref: './components/relation.yaml'
+      $ref: "./components/relation.yaml"
     Revision:
-      $ref: './components/revision.yaml'
+      $ref: "./components/revision.yaml"
     Role:
-      $ref: './components/role.yaml'
+      $ref: "./components/role.yaml"
     Setting:
-      $ref: './components/setting.yaml'
+      $ref: "./components/setting.yaml"
     User:
-      $ref: './components/user.yaml'
+      $ref: "./components/user.yaml"
     Webhook:
-      $ref: './components/webhook.yaml'
+      $ref: "./components/webhook.yaml"
   parameters:
-    # All path parameters 
+    # All path parameters
     Id:
-      $ref: './parameters/id.yaml'
+      $ref: "./parameters/id.yaml"
     UUId:
-      $ref: './parameters/uuid.yaml'
+      $ref: "./parameters/uuid.yaml"
     Collection:
-      $ref: './parameters/collection.yaml'
+      $ref: "./parameters/collection.yaml"
+
     # All query parameters
-    q:
-      $ref: './parameters/q.yaml'
+    Search:
+      $ref: "./parameters/search.yaml"
     Page:
-      $ref: './parameters/page.yaml'
+      $ref: "./parameters/page.yaml"
     Offset:
-      $ref: './parameters/offset.yaml'
+      $ref: "./parameters/offset.yaml"
     Single:
-      $ref: './parameters/single.yaml'
+      $ref: "./parameters/single.yaml"
     Sort:
-      $ref: './parameters/sort.yaml'
+      $ref: "./parameters/sort.yaml"
     Meta:
-      $ref: './parameters/meta.yaml'
+      $ref: "./parameters/meta.yaml"
     Limit:
-      $ref: './parameters/limit.yaml'
+      $ref: "./parameters/limit.yaml"
     Filter:
-      $ref: './parameters/filter.yaml'
+      $ref: "./parameters/filter.yaml"
     Fields:
-      $ref: './parameters/fields.yaml'
+      $ref: "./parameters/fields.yaml"
     Mode:
-      $ref: './parameters/mode.yaml'
+      $ref: "./parameters/mode.yaml"
   responses:
     NotFoundError:
-      $ref: './responses/notFoundError.yaml'
+      $ref: "./responses/notFoundError.yaml"
     UnauthorizedError:
-      $ref: './responses/unauthorizedError.yaml'
+      $ref: "./responses/unauthorizedError.yaml"
   securitySchemes:
     KeyAuth:
       type: apiKey
       in: query
       name: access_token
-      description: Use the key 'admin' to authenticate to the public api.
     Auth:
       type: apiKey
       in: header
-      name: 'Authorization'
-      description: To authenticate, use the "/auth/authenticate" endpoint with the credentials "admin@example.com" | "password". Use the api key here like so "Bearer \<key\>".
-security: 
+      name: "Authorization"
+security:
   - Auth: []
   - KeyAuth: []
diff --git a/packages/spec/specs/parameters/collection.yaml b/packages/spec/specs/parameters/collection.yaml
index 24dbf70bca..dcc4d5c0f4 100644
--- a/packages/spec/specs/parameters/collection.yaml
+++ b/packages/spec/specs/parameters/collection.yaml
@@ -1,6 +1,6 @@
-description: Collection of which you want to retrieve the permissions.
+description: Collection of which you want to retrieve the items from.
 name: collection
 in: path
 required: true
 schema:
-  type: string
\ No newline at end of file
+  type: string
diff --git a/packages/spec/specs/parameters/filter.yaml b/packages/spec/specs/parameters/filter.yaml
index c0de438ed1..394de3f099 100644
--- a/packages/spec/specs/parameters/filter.yaml
+++ b/packages/spec/specs/parameters/filter.yaml
@@ -6,4 +6,4 @@ schema:
   type: array
   items:
     type: string
-    pattern: '^(\[[^\[\]]*?\]){1}(\[(=|eq|<>|!=|neq|<|lt|<=|lte|>|gt|>=|gte|in|nin|null|nnull|contains|like|ncontains|nlike|rlike|nrlike|between|nbetween|empty|nempty|all|has)\])?=.*?$'
\ No newline at end of file
+    pattern: '^(\[[^\[\]]*?\]){1}(\[(_eq|_neq|_lt|_lte|_gt|_gte|_in|_nin|_null|_nnull|_contains|_ncontains|_between|_nbetween|_empty|_nempty)\])?=.*?$'
diff --git a/packages/spec/specs/parameters/id.yaml b/packages/spec/specs/parameters/id.yaml
index ec7af1c934..ab577d31de 100644
--- a/packages/spec/specs/parameters/id.yaml
+++ b/packages/spec/specs/parameters/id.yaml
@@ -1,6 +1,6 @@
-description: Index of the file.
+description: Index
 name: id
 in: path
 required: true
 schema:
-  type: integer
\ No newline at end of file
+  type: integer
diff --git a/packages/spec/specs/parameters/page.yaml b/packages/spec/specs/parameters/page.yaml
index 20679756a0..a93d268630 100644
--- a/packages/spec/specs/parameters/page.yaml
+++ b/packages/spec/specs/parameters/page.yaml
@@ -3,4 +3,4 @@ in: query
 name: page
 required: false
 schema:
-  type: integer
\ No newline at end of file
+  type: integer
diff --git a/packages/spec/specs/parameters/q.yaml b/packages/spec/specs/parameters/search.yaml
similarity index 81%
rename from packages/spec/specs/parameters/q.yaml
rename to packages/spec/specs/parameters/search.yaml
index c1e44422b4..53613db413 100644
--- a/packages/spec/specs/parameters/q.yaml
+++ b/packages/spec/specs/parameters/search.yaml
@@ -1,6 +1,6 @@
 description: Filter by items that contain the given search query in one of their fields.
 in: query
-name: q
+name: search
 required: false
 schema:
-  type: string
\ No newline at end of file
+  type: string
diff --git a/packages/spec/specs/paths/activity/activities.yaml b/packages/spec/specs/paths/activity/activities.yaml
new file mode 100644
index 0000000000..e22bb6455f
--- /dev/null
+++ b/packages/spec/specs/paths/activity/activities.yaml
@@ -0,0 +1,30 @@
+get:
+  operationId: getActivities
+  description: Returns a list of activity actions.
+  parameters:
+    - $ref: "../../openapi.yaml#/components/parameters/Fields"
+    - $ref: "../../openapi.yaml#/components/parameters/Limit"
+    - $ref: "../../openapi.yaml#/components/parameters/Meta"
+    - $ref: "../../openapi.yaml#/components/parameters/Offset"
+    - $ref: "../../openapi.yaml#/components/parameters/Single"
+    - $ref: "../../openapi.yaml#/components/parameters/Sort"
+    - $ref: "../../openapi.yaml#/components/parameters/Filter"
+    - $ref: "../../openapi.yaml#/components/parameters/Search"
+  responses:
+    "200":
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              data:
+                type: array
+                items:
+                  $ref: "../../openapi.yaml#/components/schemas/Activity"
+      description: Successful request
+    "401":
+      $ref: "../../openapi.yaml#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../openapi.yaml#/components/responses/NotFoundError"
+  tags:
+    - Activity
diff --git a/packages/spec/specs/paths/activity/activity-comment.yaml b/packages/spec/specs/paths/activity/activity-comment.yaml
index d79f1da118..4a0ed9734a 100644
--- a/packages/spec/specs/paths/activity/activity-comment.yaml
+++ b/packages/spec/specs/paths/activity/activity-comment.yaml
@@ -2,7 +2,8 @@ patch:
   description: Update the content of an existing comment.
   operationId: updateComment
   parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Id"
+    - $ref: "../../#/components/parameters/Meta"
   requestBody:
     content:
       application/json:
@@ -13,32 +14,32 @@ patch:
               type: string
               example: My updated comment
   responses:
-    '200':
+    "200":
       content:
         application/json:
           schema:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Activity'
+                $ref: "../../#/components/schemas/Activity"
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Activity
+    - Activity
 delete:
   description: Delete an existing comment. Deleted comments can not be retrieved.
   operationId: deleteComment
+  parameters:
+    - $ref: "../../#/components/parameters/Id"
   responses:
-    '203':
+    "203":
       description: Deleted succsessfully
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Activity
-parameters:
-- $ref: '../../openapi.yaml#/components/parameters/Id'
\ No newline at end of file
+    - Activity
diff --git a/packages/spec/specs/paths/activity/activity-comments.yaml b/packages/spec/specs/paths/activity/activity-comments.yaml
index e9046aaf8b..abb4691075 100644
--- a/packages/spec/specs/paths/activity/activity-comments.yaml
+++ b/packages/spec/specs/paths/activity/activity-comments.yaml
@@ -2,13 +2,13 @@ post:
   description: Creates a new comment.
   operationId: createComment
   parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Meta"
   requestBody:
     content:
       application/json:
         schema:
           type: object
-          required: [ "collection", "item", "comment" ]
+          required: ["collection", "item", "comment"]
           properties:
             collection:
               type: string
@@ -20,18 +20,18 @@ post:
               type: string
               example: A new comment
   responses:
-    '200':
+    "200":
       content:
         application/json:
           schema:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Activity'
+                $ref: "../../#/components/schemas/Activity"
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Activity
\ No newline at end of file
+    - Activity
diff --git a/packages/spec/specs/paths/activity/activity.yaml b/packages/spec/specs/paths/activity/activity.yaml
index 95d9bf57aa..93a3fdb146 100644
--- a/packages/spec/specs/paths/activity/activity.yaml
+++ b/packages/spec/specs/paths/activity/activity.yaml
@@ -1,13 +1,14 @@
 get:
-  description: Retrieves the details of an existing activity action. Provide the primary
+  description:
+    Retrieves the details of an existing activity action. Provide the primary
     key of the activity action and Directus will return the corresponding information.
   operationId: getActivity
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Id'
-    - $ref: '../../openapi.yaml#/components/parameters/Fields'
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Id"
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -15,10 +16,10 @@ get:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Activity'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Activity"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Activity
\ No newline at end of file
+    - Activity
diff --git a/packages/spec/specs/paths/activity/activitys.yaml b/packages/spec/specs/paths/activity/activitys.yaml
deleted file mode 100644
index de6759b239..0000000000
--- a/packages/spec/specs/paths/activity/activitys.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-get:
-  operationId: getActivitys
-  description: Returns a list of activity actions.
-  parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Fields'
-    - $ref: '../../openapi.yaml#/components/parameters/Limit'
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
-    - $ref: '../../openapi.yaml#/components/parameters/Offset'
-    - $ref: '../../openapi.yaml#/components/parameters/Single'
-    - $ref: '../../openapi.yaml#/components/parameters/Sort'
-    - $ref: '../../openapi.yaml#/components/parameters/Filter'
-    - $ref: '../../openapi.yaml#/components/parameters/q'
-  responses:
-    '200':
-      content:
-        application/json:
-          schema:
-            type: object
-            properties:
-              data:
-                type: array
-                items:
-                  $ref: '../../openapi.yaml#/components/schemas/Activity'
-      description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
-  tags:
-  - Activity
\ No newline at end of file
diff --git a/packages/spec/specs/paths/assets/assets.yaml b/packages/spec/specs/paths/assets/assets.yaml
index 48aa4886a3..9137ffd7db 100644
--- a/packages/spec/specs/paths/assets/assets.yaml
+++ b/packages/spec/specs/paths/assets/assets.yaml
@@ -3,12 +3,12 @@ get:
     - Assets
   operationId: getAsset
   description: Image typed files can be dynamically resized and transformed to fit any need.
-  security: 
+  security:
     - Auth: []
   parameters:
-    - name: key
+    - name: id
       in: path
-      description: private_hash of the file
+      description: The id of the file.
       required: true
       schema:
         type: string
@@ -41,11 +41,11 @@ get:
         minimum: 1
         maximum: 100
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         text/plain:
           schema:
             type: string
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
\ No newline at end of file
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
diff --git a/packages/spec/specs/paths/auth/login.yaml b/packages/spec/specs/paths/auth/login.yaml
index 4630356887..fc3aa301f8 100644
--- a/packages/spec/specs/paths/auth/login.yaml
+++ b/packages/spec/specs/paths/auth/login.yaml
@@ -8,7 +8,7 @@ post:
       application/json:
         schema:
           type: object
-          required: [ email, password ]
+          required: [email, password]
           properties:
             email:
               type: string
@@ -21,26 +21,29 @@ post:
               example: password
             mode:
               type: string
-              enum: [jwt, cookie]
-              default: jwt
+              enum: ["json", cookie]
+              default: "json"
               description: Choose between retrieving the token as a string, or setting it as a cookie.
             otp:
               type: string
               description: If 2FA is enabled, you need to pass the one time password.
   responses:
-    '200':
+    "200":
       description: Successful authentification
       content:
         application/json:
           schema:
             type: object
             properties:
-              public:
-                type: boolean
               data:
                 type: object
                 properties:
-                  token:
+                  access_token:
                     type: string
-                  user:
-                    $ref: '../../openapi.yaml#/components/schemas/User'
\ No newline at end of file
+                    example: eyJhbGciOiJI...
+                  expires:
+                    type: integer
+                    example: 900
+                  refresh_token:
+                    type: string
+                    example: yuOJkjdPXMd...
diff --git a/packages/spec/specs/paths/auth/logout.yaml b/packages/spec/specs/paths/auth/logout.yaml
index 120471a4f0..2beb4b14eb 100644
--- a/packages/spec/specs/paths/auth/logout.yaml
+++ b/packages/spec/specs/paths/auth/logout.yaml
@@ -3,6 +3,17 @@ post:
   tags:
     - Authentication
   operationId: logout
+  requestBody:
+    content:
+      application/json:
+        schema:
+          type: object
+          required: [token]
+          properties:
+            refresh_token:
+              type: string
+              example: eyJ0eXAiOiJKV...
+              description: JWT access token you want to logout.
   responses:
-    '200':
-      description: Request successful
\ No newline at end of file
+    "200":
+      description: Request successful
diff --git a/packages/spec/specs/paths/auth/password-request.yaml b/packages/spec/specs/paths/auth/password-request.yaml
index e9a839f851..0434b3a5de 100644
--- a/packages/spec/specs/paths/auth/password-request.yaml
+++ b/packages/spec/specs/paths/auth/password-request.yaml
@@ -8,16 +8,12 @@ post:
       application/json:
         schema:
           type: object
-          required: [ email ]
+          required: [email]
           properties:
             email:
               type: string
               example: admin@example.com
               description: Email address of the user you're requesting a reset for.
-            reset_url:
-              type: string
-              example: https://mydomain.com/passwordreset
-              description: Provide a custom reset url which the link in the Email will lead to. The reset token will be passed as a parameter.
   responses:
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
\ No newline at end of file
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
diff --git a/packages/spec/specs/paths/auth/password-reset.yaml b/packages/spec/specs/paths/auth/password-reset.yaml
index 2f5530d739..2ff5b440ff 100644
--- a/packages/spec/specs/paths/auth/password-reset.yaml
+++ b/packages/spec/specs/paths/auth/password-reset.yaml
@@ -8,7 +8,7 @@ post:
       application/json:
         schema:
           type: object
-          required: [ token, password ]
+          required: [token, password]
           properties:
             token:
               type: string
@@ -20,5 +20,5 @@ post:
               format: password
               description: New password for the user.
   responses:
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError' 
\ No newline at end of file
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
diff --git a/packages/spec/specs/paths/auth/refresh.yaml b/packages/spec/specs/paths/auth/refresh.yaml
index c2074d85ef..3fa0548ab5 100644
--- a/packages/spec/specs/paths/auth/refresh.yaml
+++ b/packages/spec/specs/paths/auth/refresh.yaml
@@ -8,26 +8,31 @@ post:
       application/json:
         schema:
           type: object
-          required: [ token ]
+          required: [token]
           properties:
             refresh_token:
               type: string
               example: eyJ0eXAiOiJKV...
               description: JWT access token you want to refresh. This token can't be expired.
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
           schema:
             type: object
             properties:
-              public:
-                type: boolean
               data:
                 type: object
                 properties:
-                  token:
+                  access_token:
                     type: string
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
\ No newline at end of file
+                    example: eyJhbGciOiJI...
+                  expires:
+                    type: integer
+                    example: 900
+                  refresh_token:
+                    type: string
+                    example: Gy-caJMpmGTA...
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
diff --git a/packages/spec/specs/paths/auth/sso-provider.yaml b/packages/spec/specs/paths/auth/sso-provider.yaml
index 6d5d0f48a1..0c7efde447 100644
--- a/packages/spec/specs/paths/auth/sso-provider.yaml
+++ b/packages/spec/specs/paths/auth/sso-provider.yaml
@@ -10,7 +10,7 @@ get:
       required: true
       schema:
         type: string
-    - $ref: '../../openapi.yaml#/components/parameters/Mode'
+    - $ref: "../../#/components/parameters/Mode"
     - name: redirect_url
       in: query
       required: true
@@ -18,7 +18,7 @@ get:
       schema:
         type: string
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -32,5 +32,5 @@ get:
                 properties:
                   token:
                     type: string
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
\ No newline at end of file
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
diff --git a/packages/spec/specs/paths/auth/sso.yaml b/packages/spec/specs/paths/auth/sso.yaml
index 14d0283fc4..8a2ce03d35 100644
--- a/packages/spec/specs/paths/auth/sso.yaml
+++ b/packages/spec/specs/paths/auth/sso.yaml
@@ -4,7 +4,7 @@ get:
   operationId: sso
   description: List the SSO providers.
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -18,5 +18,5 @@ get:
                 example: ["github", "facebook"]
                 items:
                   type: string
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
\ No newline at end of file
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
diff --git a/packages/spec/specs/paths/collections/collection.yaml b/packages/spec/specs/paths/collections/collection.yaml
index 43ab3eee50..3051b58d92 100644
--- a/packages/spec/specs/paths/collections/collection.yaml
+++ b/packages/spec/specs/paths/collections/collection.yaml
@@ -2,84 +2,123 @@ get:
   description: Retrieves the details of a single collection.
   operationId: getCollection
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Meta"
   responses:
-    '200':
+    "200":
       content:
         application/json:
           schema:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Collection'
+                $ref: "../../#/components/schemas/Collection"
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Collections
+    - Collections
 patch:
   description: Update an existing collection.
   operationId: updateCollection
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Meta"
   requestBody:
     content:
       application/json:
         schema:
           type: object
           properties:
-            note:
-              type: string
-              description: A note describing the collection.
-            hidden:
-              type: boolean
-              description: Whether or not the collection is hidden from the navigation in the admin app.
-            single:
-              type: string
-              description: Whether or not the collection is treated as a single record.
-            managed:
-              type: string
-              description: If Directus is tracking and managing this collection currently.
-            icon:
-              type: string
-              description: Name of a Google Material Design Icon that's assigned to this collection.
-            translation:
+            meta:
+              description: Metadata of the collection.
               type: object
-              description: Key value pairs of how to show this collection's name in different languages in the admin app.
+              properties:
+                icon:
+                  description: Name of a Google Material Design Icon that's assigned to this collection.
+                  type: string
+                  example: people
+                  nullable: true
+                note:
+                  description: A note describing the collection.
+                  type: string
+                  example: null
+                  nullable: true
+                display_template:
+                  description: Text representation of how items from this collection are shown across the system.
+                  type: string
+                  example: null
+                  nullable: true
+                hidden:
+                  description: Whether or not the collection is hidden from the navigation in the admin app.
+                  type: boolean
+                  example: false
+                singleton:
+                  description: Whether or not the collection is treated as a single object.
+                  type: boolean
+                  example: false
+                translation:
+                  description: Key value pairs of how to show this collection's name in different languages in the admin app.
+                  type: string
+                  example: null
+                  nullable: true
+                archive_field:
+                  description: What field holds the archive value.
+                  type: string
+                  example: null
+                  nullable: true
+                archive_app_filter:
+                  description: What value to use for "archived" items.
+                  type: string
+                  example: null
+                  nullable: true
+                archive_value:
+                  description: What value to use to "unarchive" items.
+                  type: string
+                  example: null
+                  nullable: true
+                unarchive_value:
+                  description: Whether or not to show the "archived" filter.
+                  type: string
+                  example: null
+                  nullable: true
+                sort_field:
+                  description: The sort field in the collection.
+                  type: string
+                  example: null
+                  nullable: true
   responses:
-    '200':
+    "200":
       content:
         application/json:
           schema:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Collection'
+                $ref: "../../#/components/schemas/Collection"
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Collections
+    - Collections
 delete:
   description: "Delete an existing collection. Warning: This will delete the whole collection, including the items within. Proceed with caution."
   operationId: deleteCollection
   responses:
-    '200':
+    "200":
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Collections
+    - Collections
 parameters:
-  - name: collection
+  - name: id
     in: path
     required: true
-    description: The unique name of the collection.
+    description: Unique identifier of the collection.
     schema:
-      type: string
\ No newline at end of file
+      type: string
diff --git a/packages/spec/specs/paths/collections/collections.yaml b/packages/spec/specs/paths/collections/collections.yaml
index 0412d50783..3e6ab4e608 100644
--- a/packages/spec/specs/paths/collections/collections.yaml
+++ b/packages/spec/specs/paths/collections/collections.yaml
@@ -2,11 +2,11 @@ get:
   description: Returns a list of the collections available in the project.
   operationId: getCollections
   parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Offset'
-  - $ref: '../../openapi.yaml#/components/parameters/Single'
-  - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Offset"
+    - $ref: "../../#/components/parameters/Single"
+    - $ref: "../../#/components/parameters/Meta"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -16,63 +16,100 @@ get:
               data:
                 type: array
                 items:
-                  $ref: '../../openapi.yaml#/components/schemas/Collection'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                  $ref: "../../#/components/schemas/Collection"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Collections
+    - Collections
 post:
   description: Create a new collection in Directus.
   operationId: createCollection
   parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Meta"
   requestBody:
     content:
       application/json:
         schema:
           type: object
-          required: [ collection, fields ]
+          required: [collection, fields]
           properties:
             collection:
               type: string
               description: Unique name of the collection.
               example: my_collection
             fields:
-              type: object
+              type: array
               description: The fields contained in this collection. See the fields reference for more information. Each individual field requires field, type, and interface to be provided.
-            note:
-              type: string
-              description: A note describing the collection.
-            hidden:
-              type: string
-              description: Whether or not the collection is hidden from the navigation in the admin app.
-            single:
-              type: string
-              description: Whether or not the collection is treated as a single record.
-            managed:
-              type: string
-              description: If Directus is tracking and managing this collection currently.
+              items:
+                type: object
             icon:
-              type: string
               description: Name of a Google Material Design Icon that's assigned to this collection.
-            translation:
               type: string
+              example: people
+              nullable: true
+            note:
+              description: A note describing the collection.
+              type: string
+              example: null
+              nullable: true
+            display_template:
+              description: Text representation of how items from this collection are shown across the system.
+              type: string
+              example: null
+              nullable: true
+            hidden:
+              description: Whether or not the collection is hidden from the navigation in the admin app.
+              type: boolean
+              example: false
+            singleton:
+              description: Whether or not the collection is treated as a single object.
+              type: boolean
+              example: false
+            translation:
               description: Key value pairs of how to show this collection's name in different languages in the admin app.
+              type: string
+              example: null
+              nullable: true
+            archive_field:
+              description: What field holds the archive value.
+              type: string
+              example: null
+              nullable: true
+            archive_app_filter:
+              description: What value to use for "archived" items.
+              type: string
+              example: null
+              nullable: true
+            archive_value:
+              description: What value to use to "unarchive" items.
+              type: string
+              example: null
+              nullable: true
+            unarchive_value:
+              description: Whether or not to show the "archived" filter.
+              type: string
+              example: null
+              nullable: true
+            sort_field:
+              description: The sort field in the collection.
+              type: string
+              example: null
+              nullable: true
   responses:
-    '200':
+    "200":
       content:
         application/json:
           schema:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Collection'
+                $ref: "../../#/components/schemas/Collection"
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Collections
\ No newline at end of file
+    - Collections
diff --git a/packages/spec/specs/paths/extensions/displays.yaml b/packages/spec/specs/paths/extensions/displays.yaml
new file mode 100644
index 0000000000..c78d51e416
--- /dev/null
+++ b/packages/spec/specs/paths/extensions/displays.yaml
@@ -0,0 +1,21 @@
+get:
+  description: List all installed custom displays.
+  operationId: getDisplays
+  responses:
+    "200":
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              data:
+                type: array
+                items:
+                  type: object
+      description: Successful request
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
+  tags:
+    - Extensions
diff --git a/packages/spec/specs/paths/extensions/interfaces.yaml b/packages/spec/specs/paths/extensions/interfaces.yaml
index 199e5bcfd7..8ecaff116c 100644
--- a/packages/spec/specs/paths/extensions/interfaces.yaml
+++ b/packages/spec/specs/paths/extensions/interfaces.yaml
@@ -2,7 +2,7 @@ get:
   description: List all installed custom interfaces.
   operationId: getInterfaces
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -13,9 +13,9 @@ get:
                 type: array
                 items:
                   type: object
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Extensions
\ No newline at end of file
+    - Extensions
diff --git a/packages/spec/specs/paths/extensions/layouts.yaml b/packages/spec/specs/paths/extensions/layouts.yaml
index e3c336dea6..9a8fa1e5f9 100644
--- a/packages/spec/specs/paths/extensions/layouts.yaml
+++ b/packages/spec/specs/paths/extensions/layouts.yaml
@@ -2,7 +2,7 @@ get:
   description: List all installed custom layouts.
   operationId: getLayouts
   responses:
-    '200':
+    "200":
       content:
         application/json:
           schema:
@@ -13,9 +13,9 @@ get:
                 items:
                   type: object
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Extensions
\ No newline at end of file
+    - Extensions
diff --git a/packages/spec/specs/paths/extensions/modules.yaml b/packages/spec/specs/paths/extensions/modules.yaml
index b84aa75ea6..da93b04cd7 100644
--- a/packages/spec/specs/paths/extensions/modules.yaml
+++ b/packages/spec/specs/paths/extensions/modules.yaml
@@ -2,7 +2,7 @@ get:
   description: List all installed custom modules.
   operationId: getModules
   responses:
-    '200':
+    "200":
       content:
         application/json:
           schema:
@@ -13,9 +13,9 @@ get:
                 items:
                   type: object
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Extensions
\ No newline at end of file
+    - Extensions
diff --git a/packages/spec/specs/paths/fields/collection-field.yaml b/packages/spec/specs/paths/fields/collection-field.yaml
index bf1ba19a98..af4743cec3 100644
--- a/packages/spec/specs/paths/fields/collection-field.yaml
+++ b/packages/spec/specs/paths/fields/collection-field.yaml
@@ -2,7 +2,7 @@ get:
   description: Retrieves the details of a single field in a given collection.
   operationId: getCollectionField
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -10,13 +10,13 @@ get:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Field'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Field"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Fields
+    - Fields
 patch:
   description: Update an existing field.
   operationId: updateField
@@ -24,68 +24,172 @@ patch:
     content:
       application/json:
         schema:
-          properties:
-            datatype:
-              description: SQL datatype of the column that corresponds to this field.
-              type: string
-            auto_increment:
-              description: If the value in this field is auto incremented. Only applies to integer type fields.
-              type: boolean
-            group:
-              description: What field group this field is part of.
-              type: string
-            hidden_browse:
-              description: If this field should be hidden from the item browse (listing) page.
-              type: boolean
-            hidden_detail:
-              description: If this field should be hidden from the item detail (edit) page.
-              type: boolean
-            interface:
-              description: What interface is used in the admin app to edit the value for this field.
-              type: string
-            locked:
-              description: If the field can be altered by the end user. Directus system fields have this value set to `true`.
-              type: boolean
-            note:
-              description: A user provided note for the field. Will be rendered alongside the interface on the edit page.
-              type: string
-            options:
-              description: Options for the interface that's used. This format is based on the individual interface.
-              type: object
-            primary_key:
-              description: If this field is the primary key of the collection.
-              type: boolean
-            readonly:
-              description: Prevents the user from editing the value in the field.
-              type: boolean
-            required:
-              description: If this field requires a value.
-              type: boolean
-            signed:
-              description: If the value is signed or not. Only applies to integer type fields.
-              type: boolean
-            sort:
-              description: Sort order of this field on the edit page of the admin app.
-              type: integer
-            translation:
-              description: 'Key value pair of `<locale>: <translation>` that allows the user to change the displayed name of the field in the admin app.'
-              type: object
-            unique:
-              description: If the value of this field should be unique within the collection.
-              type: boolean
-            validation:
-              description: User provided regex that will be used in the API to validate incoming values.
-              type: string
-            width:
-              description: Width of the field on the edit form.
-              type: string
-              enum: [half, half-left, half-right, full, fill]
-            length:
-              description: Length of the field. Will be used in SQL to set the length property of the colummn. Requirement of this attribute depends on the provided datatype.
-              type: integer
           type: object
+          properties:
+            field:
+              description: Unique name of the field. Field name is unique within the collection.
+              example: id
+              type: string
+            type:
+              description: Directus specific data type. Used to cast values in the API.
+              example: integer
+              type: string
+            schema:
+              description: The schema info.
+              type: object
+              properties:
+                name:
+                  description: The name of the field.
+                  example: title
+                  type: string
+                table:
+                  description: The collection of the field.
+                  example: posts
+                  type: string
+                type:
+                  description: The type of the field.
+                  example: string
+                  type: string
+                default_value:
+                  description: The default value of the field.
+                  example: null
+                  type: string
+                  nullable: true
+                max_length:
+                  description: The max length of the field.
+                  example: null
+                  type: integer
+                  nullable: true
+                is_nullable:
+                  description: If the field is nullable.
+                  example: false
+                  type: boolean
+                is_primary_key:
+                  description: If the field is primary key.
+                  example: false
+                  type: boolean
+                has_auto_increment:
+                  description: If the field has auto increment.
+                  example: false
+                  type: boolean
+                foreign_key_column:
+                  description: Related column from the foreign key constraint.
+                  example: null
+                  type: string
+                  nullable: true
+                foreign_key_table:
+                  description: Related table from the foreign key constraint.
+                  example: null
+                  type: string
+                  nullable: true
+                comment:
+                  description: Comment as saved in the database.
+                  example: null
+                  type: string
+                  nullable: true
+                schema:
+                  description: Database schema (pg only).
+                  example: public
+                  type: string
+                foreign_key_schema:
+                  description: Related schema from the foreign key constraint (pg only).
+                  example: null
+                  type: string
+                  nullable: true
+            meta:
+              description: The meta info.
+              type: object
+              nullable: true
+              properties:
+                id:
+                  description: Unique identifier for the field in the `directus_fields` collection.
+                  example: 3
+                  type: integer
+                collection:
+                  description: Unique name of the collection this field is in.
+                  example: posts
+                  type: string
+                field:
+                  description: Unique name of the field. Field name is unique within the collection.
+                  example: title
+                  type: string
+                special:
+                  description: Transformation flag for field
+                  example: null
+                  type: array
+                  items:
+                    type: string
+                  nullable: true
+                interface:
+                  description:
+                    What interface is used in the admin app to edit the value for this
+                    field.
+                  example: primary-key
+                  type: string
+                  nullable: true
+                options:
+                  description:
+                    Options for the interface that's used. This format is based on the
+                    individual interface.
+                  example: null
+                  type: object
+                  nullable: true
+                display:
+                  description: What display is used in the admin app to display the value for this field.
+                  example: null
+                  type: string
+                  nullable: true
+                display_options:
+                  description: Options for the display that's used. This format is based on the individual display.
+                  example: null
+                  type: object
+                  nullable: true
+                locked:
+                  description:
+                    If the field can be altered by the end user. Directus system fields
+                    have this value set to `true`.
+                  example: true
+                  type: boolean
+                readonly:
+                  description: Prevents the user from editing the value in the field.
+                  example: false
+                  type: boolean
+                hidden:
+                  description: If this field should be hidden.
+                  example: true
+                  type: boolean
+                sort:
+                  description: Sort order of this field on the edit page of the admin app.
+                  example: 1
+                  type: integer
+                  nullable: true
+                width:
+                  description: Width of the field on the edit form.
+                  example: null
+                  type: string
+                  nullable: true
+                  enum: [half, half-left, half-right, full, fill, null]
+                group:
+                  description: What field group this field is part of.
+                  example: null
+                  type: integer
+                  nullable: true
+                translation:
+                  description:
+                    "Key value pair of `<locale>: <translation>` that allows the user
+                    to change the displayed name of the field in the admin app."
+                  example: null
+                  type: object
+                  nullable: true
+                note:
+                  description:
+                    A user provided note for the field. Will be rendered alongside the
+                    interface on the edit page.
+                  example: ""
+                  type: string
+                  nullable: true
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -93,26 +197,25 @@ patch:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Field'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Field"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Fields
-
+    - Fields
 delete:
   description: Delete an existing field.
   operationId: deleteField
   responses:
-    '200':
+    "200":
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Fields
+    - Fields
 parameters:
   - name: collection
     in: path
@@ -120,9 +223,9 @@ parameters:
     schema:
       type: string
     required: true
-  - name: field
+  - name: id
     in: path
-    description: The unique name of the field.
+    description: Unique identifier of the field.
     schema:
       type: string
-    required: true
\ No newline at end of file
+    required: true
diff --git a/packages/spec/specs/paths/fields/collection-fields.yaml b/packages/spec/specs/paths/fields/collection-fields.yaml
index b619042720..b89fd795e3 100644
--- a/packages/spec/specs/paths/fields/collection-fields.yaml
+++ b/packages/spec/specs/paths/fields/collection-fields.yaml
@@ -2,9 +2,9 @@ get:
   description: Returns a list of the fields available in the given collection.
   operationId: getCollectionFields
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Sort'
+    - $ref: "../../#/components/parameters/Sort"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -14,13 +14,13 @@ get:
               data:
                 type: array
                 items:
-                  $ref: '../../openapi.yaml#/components/schemas/Field'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                  $ref: "../../#/components/schemas/Field"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Fields
+    - Fields
 post:
   description: Create a new field in a given collection.
   operationId: createField
@@ -28,93 +28,191 @@ post:
     content:
       application/json:
         schema:
-          required: [ field, datatype, type, length ]
+          required: [field, datatype, type, length]
+          type: object
           properties:
             field:
               description: Unique name of the field. Field name is unique within the collection.
-              type: string
-            datatype:
-              description: SQL datatype of the column that corresponds to this field.
+              example: id
               type: string
             type:
               description: Directus specific data type. Used to cast values in the API.
+              example: integer
               type: string
-            auto_increment:
-              description: If the value in this field is auto incremented. Only applies to integer type fields.
-              type: boolean
-            group:
-              description: What field group this field is part of.
-              type: string
-            hidden_browse:
-              description: If this field should be hidden from the item browse (listing) page.
-              type: boolean
-            hidden_detail:
-              description: If this field should be hidden from the item detail (edit) page.
-              type: boolean
-            interface:
-              description: What interface is used in the admin app to edit the value for this field.
-              type: string
-            locked:
-              description: If the field can be altered by the end user. Directus system fields have this value set to `true`.
-              type: boolean
-            note:
-              description: A user provided note for the field. Will be rendered alongside the interface on the edit page.
-              type: string
-            options:
-              description: Options for the interface that's used. This format is based on the individual interface.
+            schema:
+              description: The schema info.
               type: object
-            primary_key:
-              description: If this field is the primary key of the collection.
-              type: boolean
-            readonly:
-              description: Prevents the user from editing the value in the field.
-              type: boolean
-            required:
-              description: If this field requires a value.
-              type: boolean
-            signed:
-              description: If the value is signed or not. Only applies to integer type fields.
-              type: boolean
-            sort:
-              description: Sort order of this field on the edit page of the admin app.
-              type: integer
-            translation:
-              description: 'Key value pair of `<locale>: <translation>` that allows the user to change the displayed name of the field in the admin app.'
+              properties:
+                name:
+                  description: The name of the field.
+                  example: title
+                  type: string
+                table:
+                  description: The collection of the field.
+                  example: posts
+                  type: string
+                type:
+                  description: The type of the field.
+                  example: string
+                  type: string
+                default_value:
+                  description: The default value of the field.
+                  example: null
+                  type: string
+                  nullable: true
+                max_length:
+                  description: The max length of the field.
+                  example: null
+                  type: integer
+                  nullable: true
+                is_nullable:
+                  description: If the field is nullable.
+                  example: false
+                  type: boolean
+                is_primary_key:
+                  description: If the field is primary key.
+                  example: false
+                  type: boolean
+                has_auto_increment:
+                  description: If the field has auto increment.
+                  example: false
+                  type: boolean
+                foreign_key_column:
+                  description: Related column from the foreign key constraint.
+                  example: null
+                  type: string
+                  nullable: true
+                foreign_key_table:
+                  description: Related table from the foreign key constraint.
+                  example: null
+                  type: string
+                  nullable: true
+                comment:
+                  description: Comment as saved in the database.
+                  example: null
+                  type: string
+                  nullable: true
+                schema:
+                  description: Database schema (pg only).
+                  example: public
+                  type: string
+                foreign_key_schema:
+                  description: Related schema from the foreign key constraint (pg only).
+                  example: null
+                  type: string
+                  nullable: true
+            meta:
+              description: The meta info.
               type: object
-            unique:
-              description: If the value of this field should be unique within the collection.
-              type: boolean
-            validation:
-              description: User provided regex that will be used in the API to validate incoming values.
-              type: string
-            width:
-              description: Width of the field on the edit form.
-              type: string
-              enum: [half, half-left, half-right, full, fill]
-            length:
-              description: Length of the field. Will be used in SQL to set the length property of the colummn. Requirement of this attribute depends on the provided datatype.
-              type: integer
-          type: object
+              nullable: true
+              properties:
+                id:
+                  description: Unique identifier for the field in the `directus_fields` collection.
+                  example: 3
+                  type: integer
+                collection:
+                  description: Unique name of the collection this field is in.
+                  example: posts
+                  type: string
+                field:
+                  description: Unique name of the field. Field name is unique within the collection.
+                  example: title
+                  type: string
+                special:
+                  description: Transformation flag for field
+                  example: null
+                  type: array
+                  items:
+                    type: string
+                  nullable: true
+                interface:
+                  description:
+                    What interface is used in the admin app to edit the value for this
+                    field.
+                  example: primary-key
+                  type: string
+                  nullable: true
+                options:
+                  description:
+                    Options for the interface that's used. This format is based on the
+                    individual interface.
+                  example: null
+                  type: object
+                  nullable: true
+                display:
+                  description: What display is used in the admin app to display the value for this field.
+                  example: null
+                  type: string
+                  nullable: true
+                display_options:
+                  description: Options for the display that's used. This format is based on the individual display.
+                  example: null
+                  type: object
+                  nullable: true
+                locked:
+                  description:
+                    If the field can be altered by the end user. Directus system fields
+                    have this value set to `true`.
+                  example: true
+                  type: boolean
+                readonly:
+                  description: Prevents the user from editing the value in the field.
+                  example: false
+                  type: boolean
+                hidden:
+                  description: If this field should be hidden.
+                  example: true
+                  type: boolean
+                sort:
+                  description: Sort order of this field on the edit page of the admin app.
+                  example: 1
+                  type: integer
+                  nullable: true
+                width:
+                  description: Width of the field on the edit form.
+                  example: null
+                  type: string
+                  nullable: true
+                  enum: [half, half-left, half-right, full, fill, null]
+                group:
+                  description: What field group this field is part of.
+                  example: null
+                  type: integer
+                  nullable: true
+                translation:
+                  description:
+                    "Key value pair of `<locale>: <translation>` that allows the user
+                    to change the displayed name of the field in the admin app."
+                  example: null
+                  type: object
+                  nullable: true
+                note:
+                  description:
+                    A user provided note for the field. Will be rendered alongside the
+                    interface on the edit page.
+                  example: ""
+                  type: string
+                  nullable: true
   responses:
-    '200':
+    "200":
       content:
         application/json:
           schema:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Field'
+                $ref: "../../#/components/schemas/Field"
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Fields
+    - Fields
 parameters:
   - description: Unique identifier of the collection the item resides in.
     in: path
     name: collection
     required: true
     schema:
-      type: string
\ No newline at end of file
+      type: string
diff --git a/packages/spec/specs/paths/fields/fields.yaml b/packages/spec/specs/paths/fields/fields.yaml
index 1b893014ac..70ef9e2eb2 100644
--- a/packages/spec/specs/paths/fields/fields.yaml
+++ b/packages/spec/specs/paths/fields/fields.yaml
@@ -2,10 +2,10 @@ get:
   description: Returns a list of the fields available in the project.
   operationId: getFields
   parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Limit'
-  - $ref: '../../openapi.yaml#/components/parameters/Sort'
+    - $ref: "../../#/components/parameters/Limit"
+    - $ref: "../../#/components/parameters/Sort"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -15,10 +15,10 @@ get:
               data:
                 type: array
                 items:
-                  $ref: '../../openapi.yaml#/components/schemas/Field'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                  $ref: "../../#/components/schemas/Field"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Fields
\ No newline at end of file
+    - Fields
diff --git a/packages/spec/specs/paths/files/file.yaml b/packages/spec/specs/paths/files/file.yaml
index 415848c69a..6b73a0aeeb 100644
--- a/packages/spec/specs/paths/files/file.yaml
+++ b/packages/spec/specs/paths/files/file.yaml
@@ -4,7 +4,7 @@ get:
     - Files
   operationId: getFile
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -12,9 +12,9 @@ get:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/File'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
+                $ref: "../../#/components/schemas/File"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
 patch:
   description: Update an existing file.
   tags:
@@ -26,7 +26,7 @@ patch:
         schema:
           type: object
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -34,18 +34,18 @@ patch:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/File'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
+                $ref: "../../#/components/schemas/File"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
 delete:
   description: Delete an existing file.
   tags:
     - Files
   operationId: deleteFile
   responses:
-    '200':
+    "200":
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
 parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Id'
\ No newline at end of file
+  - $ref: "../../#/components/parameters/Id"
diff --git a/packages/spec/specs/paths/files/files.yaml b/packages/spec/specs/paths/files/files.yaml
index 83512ee80c..ad9f946b4b 100644
--- a/packages/spec/specs/paths/files/files.yaml
+++ b/packages/spec/specs/paths/files/files.yaml
@@ -4,7 +4,7 @@ get:
     - Files
   operationId: getFiles
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -14,9 +14,9 @@ get:
               data:
                 type: array
                 items:
-                  $ref: '../../openapi.yaml#/components/schemas/File'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
+                  $ref: "../../#/components/schemas/File"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
 post:
   description: Create a new file.
   tags:
@@ -31,7 +31,7 @@ post:
             data:
               type: string
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -39,6 +39,6 @@ post:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/File'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
\ No newline at end of file
+                $ref: "../../#/components/schemas/File"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
diff --git a/packages/spec/specs/paths/files/revision.yaml b/packages/spec/specs/paths/files/revision.yaml
index 962a3177b5..9012a206cd 100644
--- a/packages/spec/specs/paths/files/revision.yaml
+++ b/packages/spec/specs/paths/files/revision.yaml
@@ -4,7 +4,7 @@ get:
     - Files
   operationId: getFileRevision
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/UUId'
+    - $ref: "../../#/components/parameters/UUId"
     - name: offset
       in: path
       description: offset or revision
@@ -12,7 +12,7 @@ get:
       schema:
         type: integer
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -20,6 +20,6 @@ get:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Revision'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
\ No newline at end of file
+                $ref: "../../#/components/schemas/Revision"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
diff --git a/packages/spec/specs/paths/files/revisions.yaml b/packages/spec/specs/paths/files/revisions.yaml
index eb6e56a072..4c57dce030 100644
--- a/packages/spec/specs/paths/files/revisions.yaml
+++ b/packages/spec/specs/paths/files/revisions.yaml
@@ -4,9 +4,9 @@ get:
     - Files
   operationId: getFileRevisions
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/UUId'
+    - $ref: "../../#/components/parameters/UUId"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -16,6 +16,6 @@ get:
               data:
                 type: array
                 items:
-                  $ref: '../../openapi.yaml#/components/schemas/Revision'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
\ No newline at end of file
+                  $ref: "../../#/components/schemas/Revision"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
diff --git a/packages/spec/specs/paths/folders/folder.yaml b/packages/spec/specs/paths/folders/folder.yaml
index dfc855829d..19f70501fa 100644
--- a/packages/spec/specs/paths/folders/folder.yaml
+++ b/packages/spec/specs/paths/folders/folder.yaml
@@ -2,10 +2,10 @@ get:
   description: Retrieve a single folder by unique identifier.
   operationId: getFolder
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Fields'
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -13,19 +13,19 @@ get:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Folder'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Folder"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Folders
+    - Folders
 patch:
   description: Update an existing folder
   operationId: updateFolder
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Fields'
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
   requestBody:
     content:
       application/json:
@@ -40,7 +40,7 @@ patch:
               example: 3
               description: Unique identifier of the parent folder. This allows for nested folders.
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -48,25 +48,25 @@ patch:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Folder'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Folder"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Folders
+    - Folders
 
 delete:
   description: Delete an existing folder
   operationId: deleteFolder
   responses:
-    '200':
+    "200":
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Folders
+    - Folders
 parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/UUId'
+  - $ref: "../../#/components/parameters/UUId"
diff --git a/packages/spec/specs/paths/folders/folders.yaml b/packages/spec/specs/paths/folders/folders.yaml
index fcbfe51b48..d79e7cf241 100644
--- a/packages/spec/specs/paths/folders/folders.yaml
+++ b/packages/spec/specs/paths/folders/folders.yaml
@@ -2,16 +2,16 @@ get:
   description: List the folders.
   operationId: getFolders
   parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Fields'
-  - $ref: '../../openapi.yaml#/components/parameters/Limit'
-  - $ref: '../../openapi.yaml#/components/parameters/Offset'
-  - $ref: '../../openapi.yaml#/components/parameters/Sort'
-  - $ref: '../../openapi.yaml#/components/parameters/Single'
-  - $ref: '../../openapi.yaml#/components/parameters/Filter'
-  - $ref: '../../openapi.yaml#/components/parameters/q'
-  - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Limit"
+    - $ref: "../../#/components/parameters/Offset"
+    - $ref: "../../#/components/parameters/Sort"
+    - $ref: "../../#/components/parameters/Single"
+    - $ref: "../../#/components/parameters/Filter"
+    - $ref: "../../#/components/parameters/search"
+    - $ref: "../../#/components/parameters/Meta"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -21,19 +21,19 @@ get:
               data:
                 type: array
                 items:
-                  $ref: '../../openapi.yaml#/components/schemas/Folder'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                  $ref: "../../#/components/schemas/Folder"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Folders
+    - Folders
 post:
   description: Create a new folder.
   operationId: createFolder
   parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Fields'
-  - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
   requestBody:
     content:
       application/json:
@@ -49,7 +49,7 @@ post:
               type: integer
           required: [name]
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -57,10 +57,10 @@ post:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Folder'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Folder"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
   - Folders
diff --git a/packages/spec/specs/paths/items/item.yaml b/packages/spec/specs/paths/items/item.yaml
index 8f4147382f..3ffedcf59f 100644
--- a/packages/spec/specs/paths/items/item.yaml
+++ b/packages/spec/specs/paths/items/item.yaml
@@ -4,10 +4,10 @@ get:
     - Items
   operationId: getItem
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Fields'
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -16,25 +16,25 @@ get:
             properties:
               data:
                 type: object
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
 patch:
   description: Update an existing item.
   tags:
     - Items
   operationId: updateItem
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Fields'
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
   requestBody:
     content:
       application/json:
         schema:
           type: object
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -43,24 +43,24 @@ patch:
             properties:
               data:
                 type: object
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
 delete:
   description: Delete an existing item.
   tags:
     - Items
   operationId: deleteItem
   responses:
-    '200':
+    "200":
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
 parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Collection'
+  - $ref: "../../#/components/parameters/Collection"
   - name: id
     description: Index of the item.
     in: path
@@ -72,4 +72,4 @@ parameters:
           example: 1
         - type: string
           description: Unique identifier of the item.
-          example: 8cbb43fe-4cdf-4991-8352-c461779cec02
\ No newline at end of file
+          example: 8cbb43fe-4cdf-4991-8352-c461779cec02
diff --git a/packages/spec/specs/paths/items/items.yaml b/packages/spec/specs/paths/items/items.yaml
index 7f08c07e17..38b1b6067c 100644
--- a/packages/spec/specs/paths/items/items.yaml
+++ b/packages/spec/specs/paths/items/items.yaml
@@ -3,17 +3,17 @@ get:
   tags:
     - Items
   operationId: getItems
-  security: 
+  security:
     - Auth: []
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Fields'
-    - $ref: '../../openapi.yaml#/components/parameters/Limit'
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
-    - $ref: '../../openapi.yaml#/components/parameters/Offset'
-    - $ref: '../../openapi.yaml#/components/parameters/Single'
-    - $ref: '../../openapi.yaml#/components/parameters/Sort'
-    - $ref: '../../openapi.yaml#/components/parameters/Filter'
-    - $ref: '../../openapi.yaml#/components/parameters/q'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Limit"
+    - $ref: "../../#/components/parameters/Meta"
+    - $ref: "../../#/components/parameters/Offset"
+    - $ref: "../../#/components/parameters/Single"
+    - $ref: "../../#/components/parameters/Sort"
+    - $ref: "../../#/components/parameters/Filter"
+    - $ref: "../../#/components/parameters/search"
     - name: status
       in: query
       description: Filter items by the given status
@@ -23,7 +23,7 @@ get:
         items:
           type: string
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -34,28 +34,28 @@ get:
                 type: array
                 items:
                   type: object
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
 post:
   description: Create a new item.
   tags:
     - Items
   operationId: createItem
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Meta"
   requestBody:
     content:
       application/json:
         schema:
           type: object
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
           schema:
             type: object
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
 parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Collection'
\ No newline at end of file
+  - $ref: "../../#/components/parameters/Collection"
diff --git a/packages/spec/specs/paths/mail/mail.yaml b/packages/spec/specs/paths/mail/mail.yaml
deleted file mode 100644
index 7b4a4db6da..0000000000
--- a/packages/spec/specs/paths/mail/mail.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-post:
-  description: Send an email
-  operationId: sendMail
-  requestBody:
-    content:
-      application/json:
-        schema:
-          type: object
-          properties:
-            to:
-              description: User ID, email address, or object in the format { email, name }. You can send an email to multiple people at the same time by passing an array here.
-              type: array
-              example: ["user@example.com", "admin@example.com"]
-              items:
-                type: string
-                format: email
-            body:
-              description: Body of the email.
-              type: string
-              example: "Hello <b>{{name}}</b>, this is your new password: {{password}}."
-            data:
-              description: Key value pairs of variables that can be used in the body.
-              type: object
-              properties:
-                name:
-                  type: string
-                  example: John Doe
-                password:
-                  type: string
-                  example: secret
-            subject:
-              description: Email subject.
-              type: string
-              example: New Password
-            type:
-              description: HTML or plain text
-              example: html
-              type: string
-              enum: [html, text]
-  responses:
-    '200':
-      content:
-        application/json:
-          schema:
-            type: string
-      description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
-  tags:
-  - Mail
\ No newline at end of file
diff --git a/packages/spec/specs/paths/permissions/permission.yaml b/packages/spec/specs/paths/permissions/permission.yaml
index 1238a461b3..780e4457a7 100644
--- a/packages/spec/specs/paths/permissions/permission.yaml
+++ b/packages/spec/specs/paths/permissions/permission.yaml
@@ -2,10 +2,10 @@ get:
   description: Retrieve a single permissions object by unique identifier.
   operationId: getPermission
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Fields'
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -13,18 +13,18 @@ get:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Permissions'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Permissions"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Permissions
+    - Permissions
 patch:
   description: Update an existing permission
   operationId: updatePermission
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Meta"
   requestBody:
     content:
       application/json:
@@ -75,7 +75,7 @@ patch:
               type: object
           type: object
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -83,24 +83,24 @@ patch:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Permissions'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Permissions"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Permissions
+    - Permissions
 delete:
   description: Delete an existing permission
   operationId: deletePermission
   responses:
-    '200':
+    "200":
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Permissions
+    - Permissions
 parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Id'
\ No newline at end of file
+  - $ref: "../../#/components/parameters/Id"
diff --git a/packages/spec/specs/paths/permissions/permissions-me-collection.yaml b/packages/spec/specs/paths/permissions/permissions-me-collection.yaml
deleted file mode 100644
index 724ab3de77..0000000000
--- a/packages/spec/specs/paths/permissions/permissions-me-collection.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-get:
-  description: List the permissions that apply to the current user for the given collection
-  operationId: Enter text here
-  parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Collection'
-  responses:
-    '200':
-      description: Successful request
-      content:
-        application/json:
-          schema:
-            type: object
-            properties:
-              data:
-                type: array
-                items:
-                  $ref: '../../openapi.yaml#/components/schemas/Permissions'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
-  tags:
-  - Permissions
\ No newline at end of file
diff --git a/packages/spec/specs/paths/permissions/permissions-me.yaml b/packages/spec/specs/paths/permissions/permissions-me.yaml
index efb11ed592..45841cefb2 100644
--- a/packages/spec/specs/paths/permissions/permissions-me.yaml
+++ b/packages/spec/specs/paths/permissions/permissions-me.yaml
@@ -2,7 +2,7 @@ get:
   description: List the permissions that apply to the current user.
   operationId: getMyPermissions
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -12,10 +12,10 @@ get:
               data:
                 type: array
                 items:
-                  $ref: '../../openapi.yaml#/components/schemas/Permissions'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                  $ref: "../../#/components/schemas/Permissions"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Permissions
\ No newline at end of file
+    - Permissions
diff --git a/packages/spec/specs/paths/permissions/permissions.yaml b/packages/spec/specs/paths/permissions/permissions.yaml
index 3d93dc9f30..0b965a76db 100644
--- a/packages/spec/specs/paths/permissions/permissions.yaml
+++ b/packages/spec/specs/paths/permissions/permissions.yaml
@@ -2,17 +2,17 @@ get:
   description: List all permissions.
   operationId: getPermissions
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Fields'
-    - $ref: '../../openapi.yaml#/components/parameters/Limit'
-    - $ref: '../../openapi.yaml#/components/parameters/Offset'
-    - $ref: '../../openapi.yaml#/components/parameters/Single'
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
-    - $ref: '../../openapi.yaml#/components/parameters/Sort'
-    - $ref: '../../openapi.yaml#/components/parameters/Filter'
-    - $ref: '../../openapi.yaml#/components/parameters/q'
-    - $ref: '../../openapi.yaml#/components/parameters/Page'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Limit"
+    - $ref: "../../#/components/parameters/Offset"
+    - $ref: "../../#/components/parameters/Single"
+    - $ref: "../../#/components/parameters/Meta"
+    - $ref: "../../#/components/parameters/Sort"
+    - $ref: "../../#/components/parameters/Filter"
+    - $ref: "../../#/components/parameters/search"
+    - $ref: "../../#/components/parameters/Page"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -22,18 +22,18 @@ get:
               data:
                 type: array
                 items:
-                  $ref: '../../openapi.yaml#/components/schemas/Permissions'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'    
+                  $ref: "../../#/components/schemas/Permissions"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Permissions
+    - Permissions
 post:
   description: Create a new permission.
   operationId: createPermission
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Meta"
   requestBody:
     content:
       application/json:
@@ -72,7 +72,7 @@ post:
               type: array
               items:
                 type: string
-              example: ['featured_image']
+              example: ["featured_image"]
             status:
               description: What status this permission applies to.
               type: string
@@ -92,7 +92,7 @@ post:
                 type: string
           type: object
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -100,10 +100,10 @@ post:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Permissions'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Permissions"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Permissions
\ No newline at end of file
+    - Permissions
diff --git a/packages/spec/specs/paths/presets/preset.yaml b/packages/spec/specs/paths/presets/preset.yaml
index 3382bb5d53..a1f1ec2bfd 100644
--- a/packages/spec/specs/paths/presets/preset.yaml
+++ b/packages/spec/specs/paths/presets/preset.yaml
@@ -3,13 +3,13 @@ get:
     - Presets
   operationId: getPreset
   description: Retrieve a single preset by unique identifier.
-  security: 
+  security:
     - Auth: []
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Fields'
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -17,23 +17,23 @@ get:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Preset'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
+                $ref: "../../#/components/schemas/Preset"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
 patch:
   tags:
     - Presets
   operationId: updatePreset
   description: Update an existing preset.
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Fields'
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
   requestBody:
     content:
       application/json:
         schema:
           type: object
-          required: [ collection ]
+          required: [collection]
           properties:
             collection:
               type: string
@@ -60,7 +60,7 @@ patch:
                   operator:
                     type: string
                     example: gte
-                  value: 
+                  value:
                     type: integer
                     example: 4.5
             view_type:
@@ -76,7 +76,7 @@ patch:
               type: object
               description: Key value pair of language-translation. Can be used to translate the bookmark title in multiple languages.
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -84,9 +84,9 @@ patch:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Preset'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
+                $ref: "../../#/components/schemas/Preset"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
 delete:
   tags:
     - Presets
@@ -95,9 +95,9 @@ delete:
   security:
     - Auth: []
   responses:
-    '200':
+    "200":
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
 parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Id'
\ No newline at end of file
+  - $ref: "../../#/components/parameters/Id"
diff --git a/packages/spec/specs/paths/presets/presets.yaml b/packages/spec/specs/paths/presets/presets.yaml
index c02ee8c185..62447ed6c3 100644
--- a/packages/spec/specs/paths/presets/presets.yaml
+++ b/packages/spec/specs/paths/presets/presets.yaml
@@ -3,20 +3,20 @@ get:
     - Presets
   operationId: getPresets
   description: List the presets.
-  security: 
+  security:
     - Auth: []
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Fields'
-    - $ref: '../../openapi.yaml#/components/parameters/Limit'
-    - $ref: '../../openapi.yaml#/components/parameters/Offset'
-    - $ref: '../../openapi.yaml#/components/parameters/Page'
-    - $ref: '../../openapi.yaml#/components/parameters/Sort'
-    - $ref: '../../openapi.yaml#/components/parameters/Single'
-    - $ref: '../../openapi.yaml#/components/parameters/Filter'
-    - $ref: '../../openapi.yaml#/components/parameters/q'
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Limit"
+    - $ref: "../../#/components/parameters/Offset"
+    - $ref: "../../#/components/parameters/Page"
+    - $ref: "../../#/components/parameters/Sort"
+    - $ref: "../../#/components/parameters/Single"
+    - $ref: "../../#/components/parameters/Filter"
+    - $ref: "../../#/components/parameters/search"
+    - $ref: "../../#/components/parameters/Meta"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -26,23 +26,23 @@ get:
               data:
                 type: array
                 items:
-                  $ref: '../../openapi.yaml#/components/schemas/Preset'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
+                  $ref: "../../#/components/schemas/Preset"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
 post:
   tags:
     - Presets
   operationId: createPreset
   description: Create a new preset.
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Fields'
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
   requestBody:
     content:
       application/json:
         schema:
           type: object
-          required: [ collection ]
+          required: [collection]
           properties:
             collection:
               type: string
@@ -53,9 +53,10 @@ post:
               description: Name for the bookmark. If this is set, the collection preset will be considered to be a bookmark.
               example: Highly rated articles
             role:
-              type: integer
+              type: string
               description: The unique identifier of a role in the platform. If user is null, this will be used to apply the collection preset or bookmark for all users in the role.
-            search_query:
+              example: null
+            search:
               type: string
               description: What the user searched for in search/filter in the header bar.
             filters:
@@ -63,29 +64,29 @@ post:
               items:
                 type: object
                 properties:
+                  key:
+                    type: string
+                    example: aHKLAakdVghzD
                   field:
                     type: string
                     example: rating
                   operator:
                     type: string
                     example: gte
-                  value: 
+                  value:
                     type: integer
                     example: 4.5
-            view_type:
+            layout:
               type: string
-              description: Name of the view type that is used. Defaults to tabular.
-            view_query:
+              description: Name of the view type that is used.
+            layout_query:
               type: string
-              description: View query that's saved per view type. Controls what data is fetched on load. These follow the same format as the JS SDK parameters.
-            view_options:
+              description: Layout query that's saved per layout type. Controls what data is fetched on load. These follow the same format as the JS SDK parameters.
+            layout_options:
               type: string
               description: Options of the views. The properties in here are controlled by the layout.
-            translation:
-              type: object
-              description: Key value pair of language-translation. Can be used to translate the bookmark title in multiple languages.
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -93,6 +94,6 @@ post:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Preset'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
\ No newline at end of file
+                $ref: "../../#/components/schemas/Preset"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
diff --git a/packages/spec/specs/paths/relations/relation.yaml b/packages/spec/specs/paths/relations/relation.yaml
index dd7f0ed240..6aa0ba1e2d 100644
--- a/packages/spec/specs/paths/relations/relation.yaml
+++ b/packages/spec/specs/paths/relations/relation.yaml
@@ -2,10 +2,10 @@ get:
   description: Retrieve a single relation by unique identifier.
   operationId: getRelation
   parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Fields'
-  - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -13,19 +13,19 @@ get:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Relation'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Relation"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Relations
+    - Relations
 patch:
   description: Update an existing relation
   operationId: updateRelation
   parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Fields'
-  - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
   requestBody:
     content:
       application/json:
@@ -38,7 +38,8 @@ patch:
               description: Collection on the _one_ side of the relationship.
               type: string
             field_many:
-              description: Foreign key. Field that holds the primary key of the related
+              description:
+                Foreign key. Field that holds the primary key of the related
                 collection.
               type: string
             field_one:
@@ -46,12 +47,13 @@ patch:
               type: string
               example: books
             junction_field:
-              description: Field on the junction table that holds the primary key of
+              description:
+                Field on the junction table that holds the primary key of
                 the related collection.
               type: string
           type: object
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -59,24 +61,24 @@ patch:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Relation'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Relation"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Relations
+    - Relations
 delete:
   description: Delete an existing relation.
   operationId: deleteRelation
   responses:
-    '200':
+    "200":
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Relations
+    - Relations
 parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Id'
\ No newline at end of file
+  - $ref: "../../#/components/parameters/Id"
diff --git a/packages/spec/specs/paths/relations/relations.yaml b/packages/spec/specs/paths/relations/relations.yaml
index 07c49fc2c0..311fbef152 100644
--- a/packages/spec/specs/paths/relations/relations.yaml
+++ b/packages/spec/specs/paths/relations/relations.yaml
@@ -2,17 +2,17 @@ get:
   description: List the relations.
   operationId: getRelations
   parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Fields'
-  - $ref: '../../openapi.yaml#/components/parameters/Limit'
-  - $ref: '../../openapi.yaml#/components/parameters/Offset'
-  - $ref: '../../openapi.yaml#/components/parameters/Single'
-  - $ref: '../../openapi.yaml#/components/parameters/Meta'
-  - $ref: '../../openapi.yaml#/components/parameters/Sort'
-  - $ref: '../../openapi.yaml#/components/parameters/Filter'
-  - $ref: '../../openapi.yaml#/components/parameters/q'
-  - $ref: '../../openapi.yaml#/components/parameters/Page'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Limit"
+    - $ref: "../../#/components/parameters/Offset"
+    - $ref: "../../#/components/parameters/Single"
+    - $ref: "../../#/components/parameters/Meta"
+    - $ref: "../../#/components/parameters/Sort"
+    - $ref: "../../#/components/parameters/Filter"
+    - $ref: "../../#/components/parameters/search"
+    - $ref: "../../#/components/parameters/Page"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -22,19 +22,19 @@ get:
               data:
                 type: array
                 items:
-                  $ref: '../../openapi.yaml#/components/schemas/Relation'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                  $ref: "../../#/components/schemas/Relation"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Relations
+    - Relations
 post:
   description: Create a new relation.
   operationId: createRelation
   parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Fields'
-  - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
   requestBody:
     content:
       application/json:
@@ -61,7 +61,7 @@ post:
               type: string
           type: object
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -69,10 +69,10 @@ post:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Relation'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Relation"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Relations
\ No newline at end of file
+    - Relations
diff --git a/packages/spec/specs/paths/revisions/revision.yaml b/packages/spec/specs/paths/revisions/revision.yaml
index d93acacc6f..ed822a606c 100644
--- a/packages/spec/specs/paths/revisions/revision.yaml
+++ b/packages/spec/specs/paths/revisions/revision.yaml
@@ -2,11 +2,11 @@ get:
   description: Retrieve a single revision by unique identifier.
   operationId: getRevision
   parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Id'
-  - $ref: '../../openapi.yaml#/components/parameters/Fields'
-  - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Id"
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -14,10 +14,10 @@ get:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Revision'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Revision"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Revisions
\ No newline at end of file
+    - Revisions
diff --git a/packages/spec/specs/paths/revisions/revisions.yaml b/packages/spec/specs/paths/revisions/revisions.yaml
index c8b28e308b..134d03160e 100644
--- a/packages/spec/specs/paths/revisions/revisions.yaml
+++ b/packages/spec/specs/paths/revisions/revisions.yaml
@@ -2,17 +2,17 @@ get:
   description: List the revisions.
   operationId: getRevisions
   parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Fields'
-  - $ref: '../../openapi.yaml#/components/parameters/Limit'
-  - $ref: '../../openapi.yaml#/components/parameters/Offset'
-  - $ref: '../../openapi.yaml#/components/parameters/Single'
-  - $ref: '../../openapi.yaml#/components/parameters/Meta'
-  - $ref: '../../openapi.yaml#/components/parameters/Sort'
-  - $ref: '../../openapi.yaml#/components/parameters/Filter'
-  - $ref: '../../openapi.yaml#/components/parameters/q'
-  - $ref: '../../openapi.yaml#/components/parameters/Page'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Limit"
+    - $ref: "../../#/components/parameters/Offset"
+    - $ref: "../../#/components/parameters/Single"
+    - $ref: "../../#/components/parameters/Meta"
+    - $ref: "../../#/components/parameters/Sort"
+    - $ref: "../../#/components/parameters/Filter"
+    - $ref: "../../#/components/parameters/search"
+    - $ref: "../../#/components/parameters/Page"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -22,10 +22,10 @@ get:
               data:
                 type: array
                 items:
-                  $ref: '../../openapi.yaml#/components/schemas/Revision'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                  $ref: "../../#/components/schemas/Revision"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Revisions
\ No newline at end of file
+    - Revisions
diff --git a/packages/spec/specs/paths/roles/role.yaml b/packages/spec/specs/paths/roles/role.yaml
index f50a2f2c57..26523b7fe0 100644
--- a/packages/spec/specs/paths/roles/role.yaml
+++ b/packages/spec/specs/paths/roles/role.yaml
@@ -2,10 +2,10 @@ get:
   description: Retrieve a single role by unique identifier.
   operationId: getRole
   parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Fields'
-  - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -13,19 +13,19 @@ get:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Role'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Role"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Roles
+    - Roles
 patch:
   description: Update an existing role
   operationId: updateRole
   parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Fields'
-  - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
   requestBody:
     content:
       application/json:
@@ -44,7 +44,8 @@ patch:
               description: ID used with external services in SCIM.
               type: string
             ip_whitelist:
-              description: Array of IP addresses that are allowed to connect to the
+              description:
+                Array of IP addresses that are allowed to connect to the
                 API as a user of this role.
               type: array
               items:
@@ -57,7 +58,7 @@ patch:
               type: string
           type: object
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -65,24 +66,24 @@ patch:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Role'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Role"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Roles
+    - Roles
 delete:
   description: Delete an existing role
   operationId: deleteRole
   responses:
-    '200':
+    "200":
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Roles
+    - Roles
 parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/UUId'
\ No newline at end of file
+  - $ref: "../../#/components/parameters/UUId"
diff --git a/packages/spec/specs/paths/roles/roles.yaml b/packages/spec/specs/paths/roles/roles.yaml
index aca6b7b071..5953b0a7a8 100644
--- a/packages/spec/specs/paths/roles/roles.yaml
+++ b/packages/spec/specs/paths/roles/roles.yaml
@@ -2,17 +2,17 @@ get:
   description: List the roles.
   operationId: getRoles
   parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Fields'
-  - $ref: '../../openapi.yaml#/components/parameters/Limit'
-  - $ref: '../../openapi.yaml#/components/parameters/Offset'
-  - $ref: '../../openapi.yaml#/components/parameters/Single'
-  - $ref: '../../openapi.yaml#/components/parameters/Meta'
-  - $ref: '../../openapi.yaml#/components/parameters/Sort'
-  - $ref: '../../openapi.yaml#/components/parameters/Filter'
-  - $ref: '../../openapi.yaml#/components/parameters/q'
-  - $ref: '../../openapi.yaml#/components/parameters/Page'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Limit"
+    - $ref: "../../#/components/parameters/Offset"
+    - $ref: "../../#/components/parameters/Single"
+    - $ref: "../../#/components/parameters/Meta"
+    - $ref: "../../#/components/parameters/Sort"
+    - $ref: "../../#/components/parameters/Filter"
+    - $ref: "../../#/components/parameters/search"
+    - $ref: "../../#/components/parameters/Page"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -22,19 +22,19 @@ get:
               data:
                 type: array
                 items:
-                  $ref: '../../openapi.yaml#/components/schemas/Role'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                  $ref: "../../#/components/schemas/Role"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Roles
+    - Roles
 post:
   description: Create a new role.
   operationId: createRole
   parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Fields'
-  - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
   requestBody:
     content:
       application/json:
@@ -53,7 +53,8 @@ post:
               description: ID used with external services in SCIM.
               type: string
             ip_whitelist:
-              description: Array of IP addresses that are allowed to connect to the
+              description:
+                Array of IP addresses that are allowed to connect to the
                 API as a user of this role.
               type: array
               items:
@@ -67,7 +68,7 @@ post:
               example: Interns
           type: object
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -75,10 +76,10 @@ post:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Role'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Role"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Roles
\ No newline at end of file
+    - Roles
diff --git a/packages/spec/specs/paths/scim/group.yaml b/packages/spec/specs/paths/scim/group.yaml
deleted file mode 100644
index 379454e940..0000000000
--- a/packages/spec/specs/paths/scim/group.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-get:
-  description: Retrieve a single SCIM Group by unique identifier.
-  operationId: getSCIMGroup
-  responses:
-    '200':
-      description: Successful request
-      content:
-        application/json:
-          schema:
-            type: object
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
-  tags:
-  - SCIM
-patch:
-  description: Update an existing SCIM Group
-  operationId: updateSCIMGroup
-  requestBody:
-    content:
-      application/json:
-        schema:
-          type: object
-  responses:
-    '200':
-      content:
-        application/json:
-          schema:
-            type: object
-      description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
-  tags:
-  - SCIM
-delete:
-  description: Delete an existing SCIM Group
-  operationId: deleteSCIMGroup
-  responses:
-    '200':
-      description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
-  tags:
-  - SCIM
-parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Id'
\ No newline at end of file
diff --git a/packages/spec/specs/paths/scim/groups.yaml b/packages/spec/specs/paths/scim/groups.yaml
deleted file mode 100644
index 412c33e0f0..0000000000
--- a/packages/spec/specs/paths/scim/groups.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-get:
-  description: List the SCIM Groups.
-  operationId: getSCIMGroups
-  parameters:
-  - description: The 1-based index of the first result in the current set of list results.
-    in: query
-    name: startIndex
-    required: false
-    schema:
-      type: integer
-  - description: Specifies the desired maximum number of query results per page.
-    in: query
-    name: count
-    required: false
-    schema:
-      type: integer
-  - description: Filter by `id`, `userName`, `emails.value` and `externalId` attributes
-      are supported. Only the `eq` operator is supported. Uses format `?filter=id eq
-      15`
-    in: query
-    name: filter
-    required: false
-    schema:
-      type: integer
-  responses:
-    '200':
-      description: Successful request
-      content:
-        application/json:
-          schema:
-            type: object
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
-  tags:
-  - SCIM
-post:
-  description: Create a new SCIM Group.
-  operationId: createSCIMGroup
-  requestBody:
-    content:
-      application/json:
-        schema:
-          type: object
-  responses:
-    '200':
-      description: Successful request
-      content:
-        application/json:
-          schema:
-            type: object
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
-  tags:
-  - SCIM
\ No newline at end of file
diff --git a/packages/spec/specs/paths/scim/user.yaml b/packages/spec/specs/paths/scim/user.yaml
deleted file mode 100644
index 3934a31219..0000000000
--- a/packages/spec/specs/paths/scim/user.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-get:
-  description: Retrieve a single SCIM user by unique identifier.
-  operationId: getSCIMUser
-  parameters:
-    - description: The `external_id` saved in `directus_users`. Corresponds to the `id`
-        in the SCIM Users endpoint result.
-      in: path
-      name: id
-      required: true
-      schema:
-        type: integer
-  responses:
-    '200':
-      description: Successful request
-      content:
-        application/json:
-          schema:
-            type: object
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
-  tags:
-  - SCIM
-patch:
-  description: Update an existing SCIM User
-  operationId: updateSCIMUser
-  parameters:
-  - description: The `external_id` saved in `directus_users`. Corresponds to the `id`
-      in the SCIM Users endpoint result.
-    in: path
-    name: id
-    required: true
-    schema:
-      type: integer
-  requestBody:
-    content:
-      application/json:
-        schema:
-          type: object
-  responses:
-    '200':
-      content:
-        application/json:
-          schema:
-            type: object
-      description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
-  tags:
-  - SCIM
-delete:
-  description: Delete an existing SCIM User
-  operationId: deleteSCIMUser
-  parameters:
-  - description: The `external_id` saved in `directus_users`. Corresponds to the `id`
-      in the SCIM Users endpoint result.
-    in: path
-    name: id
-    required: true
-    schema:
-      type: integer
-  responses:
-    '200':
-      description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
-  tags:
-  - SCIM
\ No newline at end of file
diff --git a/packages/spec/specs/paths/scim/users.yaml b/packages/spec/specs/paths/scim/users.yaml
deleted file mode 100644
index b6e2a8c07e..0000000000
--- a/packages/spec/specs/paths/scim/users.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-get:
-  description: List the SCIM users
-  operationId: getSCIMUsers
-  parameters:
-    - description: The 1-based index of the first result in the current set of list results.
-      in: query
-      name: startIndex
-      required: false
-      schema:
-        type: integer
-    - description: Specifies the desired maximum number of query results per page.
-      in: query
-      name: count
-      required: false
-      schema:
-        type: integer
-    - description: Filter by `id`, `userName`, `emails.value` and `externalId` attributes   
-        are supported. Only the `eq` operator is supported. Uses format `?filter=id eq      
-        15`
-      in: query
-      name: filter
-      required: false
-      schema:
-        type: integer
-  responses:
-    '200':
-      description: Successful request
-      content:
-        application/json:
-          schema:
-            type: object
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
-  tags:
-  - SCIM
-post:
-  description: Create a new SCIM User.
-  operationId: createSCIMUser
-  requestBody:
-    content:
-      application/json:
-        schema:
-          type: object
-  responses:
-    '200':
-      content:
-        application/json:
-          schema:
-            type: object
-      description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
-  tags:
-  - SCIM
\ No newline at end of file
diff --git a/packages/spec/specs/paths/server/info.yaml b/packages/spec/specs/paths/server/info.yaml
index 42e7ecc755..60e535d943 100644
--- a/packages/spec/specs/paths/server/info.yaml
+++ b/packages/spec/specs/paths/server/info.yaml
@@ -2,14 +2,14 @@ get:
   description: Perform a system status check and return the options.
   operationId: serverInfo
   parameters:
-  - description: The first time you create a project, the provided token will be saved and required for subsequent project installs. It can also be found and configured in `/config/__api.json` on your server.
-    in: query
-    name: super_admin_token
-    required: true
-    schema:
-      type: integer
+    - description: The first time you create a project, the provided token will be saved and required for subsequent project installs. It can also be found and configured in `/config/__api.json` on your server.
+      in: query
+      name: super_admin_token
+      required: true
+      schema:
+        type: integer
   responses:
-    '200':
+    "200":
       content:
         application/json:
           schema:
@@ -18,9 +18,9 @@ get:
                 type: object
             type: object
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Server
\ No newline at end of file
+    - Server
diff --git a/packages/spec/specs/paths/settings/setting.yaml b/packages/spec/specs/paths/settings/setting.yaml
index 869c5f8231..abc7a76660 100644
--- a/packages/spec/specs/paths/settings/setting.yaml
+++ b/packages/spec/specs/paths/settings/setting.yaml
@@ -2,9 +2,9 @@ get:
   description: Retrieve a single setting by unique identifier.
   operationId: getSetting
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Meta"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -12,18 +12,18 @@ get:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Setting'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Setting"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Settings
+    - Settings
 patch:
   description: Update an existing setting
   operationId: updateSetting
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Meta"
   requestBody:
     content:
       application/json:
@@ -37,7 +37,7 @@ patch:
               type: string
           type: object
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -45,24 +45,24 @@ patch:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Setting'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Setting"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Settings
+    - Settings
 delete:
   description: Delete an existing setting
   operationId: deleteSetting
   responses:
-    '200':
+    "200":
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Settings
+    - Settings
 parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/Id'
\ No newline at end of file
+  - $ref: "../../#/components/parameters/Id"
diff --git a/packages/spec/specs/paths/settings/settings.yaml b/packages/spec/specs/paths/settings/settings.yaml
index cca6921656..ddc08a660d 100644
--- a/packages/spec/specs/paths/settings/settings.yaml
+++ b/packages/spec/specs/paths/settings/settings.yaml
@@ -2,13 +2,13 @@ get:
   description: List the settings.
   operationId: getSettings
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Limit'
-    - $ref: '../../openapi.yaml#/components/parameters/Offset'
-    - $ref: '../../openapi.yaml#/components/parameters/Single'
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
-    - $ref: '../../openapi.yaml#/components/parameters/Page'
+    - $ref: "../../#/components/parameters/Limit"
+    - $ref: "../../#/components/parameters/Offset"
+    - $ref: "../../#/components/parameters/Single"
+    - $ref: "../../#/components/parameters/Meta"
+    - $ref: "../../#/components/parameters/Page"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -16,13 +16,13 @@ get:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Setting'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'        
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Setting"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Settings
+    - Settings
 patch:
   description: Update an existing setting
   operationId: updateSetting
@@ -32,7 +32,7 @@ patch:
         schema:
           type: object
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -40,18 +40,18 @@ patch:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Setting'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Setting"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Settings
+    - Settings
 # post:
 #   description: Create a new setting.
 #   operationId: createSettings
 #   parameters:
-#     - $ref: '../../openapi.yaml#/components/parameters/Meta'
+#     - $ref: '../../#/components/parameters/Meta'
 #   requestBody:
 #     content:
 #       application/json:
@@ -66,10 +66,10 @@ patch:
 #             type: object
 #             properties:
 #               data:
-#                 $ref: '../../openapi.yaml#/components/schemas/Setting'
+#                 $ref: '../../#/components/schemas/Setting'
 #     '401':
-#       $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
+#       $ref: '../../#/components/responses/UnauthorizedError'
 #     '404':
-#       $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+#       $ref: '../../#/components/responses/NotFoundError'
 #   tags:
-#   - Settings
\ No newline at end of file
+#   - Settings
diff --git a/packages/spec/specs/paths/users/me-tfa-disable.yaml b/packages/spec/specs/paths/users/me-tfa-disable.yaml
new file mode 100644
index 0000000000..0a85c9fadf
--- /dev/null
+++ b/packages/spec/specs/paths/users/me-tfa-disable.yaml
@@ -0,0 +1,12 @@
+post:
+  description: Disables two-factor authentication for the currently authenticated user.
+  operationId: meTfaDisable
+  responses:
+    "200":
+      description: Successful request
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
+  tags:
+    - Users
diff --git a/packages/spec/specs/paths/users/me-tfa-enable.yaml b/packages/spec/specs/paths/users/me-tfa-enable.yaml
new file mode 100644
index 0000000000..59e58391dd
--- /dev/null
+++ b/packages/spec/specs/paths/users/me-tfa-enable.yaml
@@ -0,0 +1,12 @@
+post:
+  description: Enables two-factor authentication for the currently authenticated user.
+  operationId: meTfaEnable
+  responses:
+    "200":
+      description: Successful request
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
+  tags:
+    - Users
diff --git a/packages/spec/specs/paths/users/me-tracking.yaml b/packages/spec/specs/paths/users/me-tracking.yaml
new file mode 100644
index 0000000000..9fdb41e3d4
--- /dev/null
+++ b/packages/spec/specs/paths/users/me-tracking.yaml
@@ -0,0 +1,23 @@
+patch:
+  description:
+    Updates the last used page field of the currently authenticated user. This is used internally
+    to be able to open the Directus admin app from the last page you used.
+  operationId: updateLastUsedPageMe
+  requestBody:
+    content:
+      application/json:
+        schema:
+          properties:
+            last_page:
+              description: Path of the page you used last.
+              type: string
+          type: object
+  responses:
+    "200":
+      description: Successful request
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
+  tags:
+    - Users
diff --git a/packages/spec/specs/paths/users/me.yaml b/packages/spec/specs/paths/users/me.yaml
index 140cfb1d83..ded6e97494 100644
--- a/packages/spec/specs/paths/users/me.yaml
+++ b/packages/spec/specs/paths/users/me.yaml
@@ -2,10 +2,10 @@ get:
   description: Retrieve the currently authenticated user.
   operationId: me
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Fields'
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -13,10 +13,29 @@ get:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/User'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/User"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Users
\ No newline at end of file
+    - Users
+patch:
+  description: Update the currently authenticated user.
+  operationId: me
+  responses:
+    "200":
+      description: Successful request
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              data:
+                $ref: "../../#/components/schemas/User"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
+  tags:
+    - Users
diff --git a/packages/spec/specs/paths/users/user-invite-token.yaml b/packages/spec/specs/paths/users/user-invite-accept.yaml
similarity index 64%
rename from packages/spec/specs/paths/users/user-invite-token.yaml
rename to packages/spec/specs/paths/users/user-invite-accept.yaml
index 29bbb675de..e4d4753b67 100644
--- a/packages/spec/specs/paths/users/user-invite-token.yaml
+++ b/packages/spec/specs/paths/users/user-invite-accept.yaml
@@ -9,7 +9,7 @@ post:
       schema:
         type: integer
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -17,10 +17,10 @@ post:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/User'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/User"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Users
\ No newline at end of file
+    - Users
diff --git a/packages/spec/specs/paths/users/user-invite.yaml b/packages/spec/specs/paths/users/user-invite.yaml
index 3d93f7e5f8..60e3bb4e87 100644
--- a/packages/spec/specs/paths/users/user-invite.yaml
+++ b/packages/spec/specs/paths/users/user-invite.yaml
@@ -1,5 +1,6 @@
 post:
-  description: Invites one or more users to this project. It creates a user with an
+  description:
+    Invites one or more users to this project. It creates a user with an
     invited status, and then sends an email to the user with instructions on how to
     activate their account.
   operationId: invite
@@ -13,7 +14,7 @@ post:
               description: Email address or array of email addresses of the to-be-invited user(s).
               type: string
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -21,10 +22,10 @@ post:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/User'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/User"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Users
\ No newline at end of file
+    - Users
diff --git a/packages/spec/specs/paths/users/user-tracking.yaml b/packages/spec/specs/paths/users/user-tracking.yaml
index b96fb51fae..528437b31f 100644
--- a/packages/spec/specs/paths/users/user-tracking.yaml
+++ b/packages/spec/specs/paths/users/user-tracking.yaml
@@ -1,9 +1,10 @@
 patch:
-  description: Updates the last used page field of the user. This is used internally
+  description:
+    Updates the last used page field of the user. This is used internally
     to be able to open the Directus admin app from the last page you used.
   operationId: updateLastUsedPage
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/UUId'
+    - $ref: "../../#/components/parameters/UUId"
   requestBody:
     content:
       application/json:
@@ -14,11 +15,11 @@ patch:
               type: string
           type: object
   responses:
-    '200':
+    "200":
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Users
\ No newline at end of file
+    - Users
diff --git a/packages/spec/specs/paths/users/user.yaml b/packages/spec/specs/paths/users/user.yaml
index d6d4a85c82..bfbc0923a1 100644
--- a/packages/spec/specs/paths/users/user.yaml
+++ b/packages/spec/specs/paths/users/user.yaml
@@ -2,10 +2,10 @@ get:
   description: Retrieve a single user by unique identifier.
   operationId: getUser
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Fields'
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -13,26 +13,26 @@ get:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/User'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/User"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Users
+    - Users
 patch:
   description: Update an existing user
   operationId: updateUser
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Fields'
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
   requestBody:
     content:
       application/json:
         schema:
-          $ref: '../../openapi.yaml#/components/schemas/User'
+          $ref: "../../#/components/schemas/User"
   responses:
-    '200':
+    "200":
       content:
         application/json:
           schema:
@@ -41,23 +41,23 @@ patch:
                 type: object
             type: object
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Users
+    - Users
 delete:
   description: Delete an existing user
   operationId: deleteUser
   responses:
-    '200':
+    "200":
       description: Successful request
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Users
+    - Users
 parameters:
-  - $ref: '../../openapi.yaml#/components/parameters/UUId'
\ No newline at end of file
+  - $ref: "../../#/components/parameters/UUId"
diff --git a/packages/spec/specs/paths/users/users.yaml b/packages/spec/specs/paths/users/users.yaml
index 5a3a1ce0be..8a4bc20bb2 100644
--- a/packages/spec/specs/paths/users/users.yaml
+++ b/packages/spec/specs/paths/users/users.yaml
@@ -2,16 +2,16 @@ get:
   description: List the users.
   operationId: getUsers
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Fields'
-    - $ref: '../../openapi.yaml#/components/parameters/Limit'
-    - $ref: '../../openapi.yaml#/components/parameters/Offset'
-    - $ref: '../../openapi.yaml#/components/parameters/Single'
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
-    - $ref: '../../openapi.yaml#/components/parameters/Sort'
-    - $ref: '../../openapi.yaml#/components/parameters/Filter'
-    - $ref: '../../openapi.yaml#/components/parameters/q'
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Limit"
+    - $ref: "../../#/components/parameters/Offset"
+    - $ref: "../../#/components/parameters/Single"
+    - $ref: "../../#/components/parameters/Meta"
+    - $ref: "../../#/components/parameters/Sort"
+    - $ref: "../../#/components/parameters/Filter"
+    - $ref: "../../#/components/parameters/search"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -21,25 +21,25 @@ get:
               data:
                 type: array
                 items:
-                  $ref: '../../openapi.yaml#/components/schemas/User'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'    
+                  $ref: "../../#/components/schemas/User"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Users
+    - Users
 post:
   description: Create a new user.
   operationId: createUser
   parameters:
-    - $ref: '../../openapi.yaml#/components/parameters/Meta'
+    - $ref: "../../#/components/parameters/Meta"
   requestBody:
     content:
       application/json:
         schema:
-          $ref: '../../openapi.yaml#/components/schemas/User'
+          $ref: "../../#/components/schemas/User"
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -47,10 +47,10 @@ post:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/User'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/User"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Users
\ No newline at end of file
+    - Users
diff --git a/packages/spec/specs/paths/utils/sort.yaml b/packages/spec/specs/paths/utils/sort.yaml
new file mode 100644
index 0000000000..fab70ca320
--- /dev/null
+++ b/packages/spec/specs/paths/utils/sort.yaml
@@ -0,0 +1,19 @@
+post:
+  description: Re-sort items in collection based on start and to value of item
+  operationId: sort
+  requestBody:
+    content:
+      application/json:
+        schema:
+          properties:
+            item:
+              description: Primary key of item to move
+              type: number
+            to:
+              description: Primary key of item where to move the current item to
+              type: number
+  responses:
+    "200":
+      description: Successful request
+  tags:
+    - Utilities
diff --git a/packages/spec/specs/paths/webhooks/webhook.yaml b/packages/spec/specs/paths/webhooks/webhook.yaml
new file mode 100644
index 0000000000..fa4173e40e
--- /dev/null
+++ b/packages/spec/specs/paths/webhooks/webhook.yaml
@@ -0,0 +1,87 @@
+get:
+  description: Retrieve a single webhook by unique identifier.
+  operationId: getWebhook
+  responses:
+    "200":
+      description: Successful request
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              data:
+                $ref: "../../#/components/schemas/Webhook"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
+  tags:
+    - Webhooks
+patch:
+  description: Update an existing webhook
+  operationId: updateWebhook
+  parameters:
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
+  requestBody:
+    content:
+      application/json:
+        schema:
+          properties:
+            name:
+              description: The name of the webhook.
+              type: string
+              example: create articles
+            method:
+              description: Method used in the webhook.
+              type: string
+              example: POST
+            url:
+              description: The url of the webhook.
+              type: string
+              example: null
+            status:
+              description: The status of the webhook.
+              type: string
+              example: active
+            data:
+              description: If yes, send the content of what was done
+              type: boolean
+              example: true
+            actions:
+              description: The actions that triggers this webhook.
+              example: null
+            collections:
+              description: The collections that triggers this webhook.
+              example: null
+          type: object
+  responses:
+    "200":
+      description: Successful request
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              data:
+                $ref: "../../#/components/schemas/Role"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
+  tags:
+    - Webhooks
+delete:
+  description: Delete an existing webhook
+  operationId: deleteWebhook
+  responses:
+    "200":
+      description: Successful request
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
+  tags:
+    - Webhooks
+parameters:
+  - $ref: "../../#/components/parameters/UUId"
diff --git a/packages/spec/specs/paths/webhooks/webhooks.yaml b/packages/spec/specs/paths/webhooks/webhooks.yaml
index 8a73d71f19..6f2317e114 100644
--- a/packages/spec/specs/paths/webhooks/webhooks.yaml
+++ b/packages/spec/specs/paths/webhooks/webhooks.yaml
@@ -2,7 +2,7 @@ get:
   description: Get all webhooks.
   operationId: getWebhooks
   responses:
-    '200':
+    "200":
       description: Successful request
       content:
         application/json:
@@ -10,10 +10,64 @@ get:
             type: object
             properties:
               data:
-                $ref: '../../openapi.yaml#/components/schemas/Webhook'
-    '401':
-      $ref: '../../openapi.yaml#/components/responses/UnauthorizedError'
-    '404':
-      $ref: '../../openapi.yaml#/components/responses/NotFoundError'
+                $ref: "../../#/components/schemas/Webhook"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
   tags:
-  - Webhooks
\ No newline at end of file
+    - Webhooks
+post:
+  description: Create a new webhook.
+  operationId: createWebhook
+  parameters:
+    - $ref: "../../#/components/parameters/Fields"
+    - $ref: "../../#/components/parameters/Meta"
+  requestBody:
+    content:
+      application/json:
+        schema:
+          properties:
+            name:
+              description: The name of the webhook.
+              type: string
+              example: create articles
+            method:
+              description: Method used in the webhook.
+              type: string
+              example: POST
+            url:
+              description: The url of the webhook.
+              type: string
+              example: null
+            status:
+              description: The status of the webhook.
+              type: string
+              example: active
+            data:
+              description: If yes, send the content of what was done
+              type: boolean
+              example: true
+            actions:
+              description: The actions that triggers this webhook.
+              example: null
+            collections:
+              description: The collections that triggers this webhook.
+              example: null
+          type: object
+  responses:
+    "200":
+      description: Successful request
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              data:
+                $ref: "../../#/components/schemas/Role"
+    "401":
+      $ref: "../../#/components/responses/UnauthorizedError"
+    "404":
+      $ref: "../../#/components/responses/NotFoundError"
+  tags:
+    - Webhooks