diff --git a/packages/documentation/components/ComponentInfo.vue b/packages/documentation/components/ComponentInfo.vue
index c8ee3b6d4c..c594ae9dae 100644
--- a/packages/documentation/components/ComponentInfo.vue
+++ b/packages/documentation/components/ComponentInfo.vue
@@ -130,6 +130,7 @@ import { Kotti } from '@3yourmind/kotti-ui'
 import { Yoco } from '@3yourmind/yoco'
 import { Dashes } from '@metatypes/typography'
 import { computed, defineComponent, ref } from '@vue/composition-api'
+import { kebabCase } from 'lodash'
 
 import ComponentInfoSlots from './component-info/Slots.vue'
 
@@ -141,7 +142,11 @@ type VuePropType =
 	| StringConstructor
 
 export default defineComponent<{
-	component: { meta: Kotti.Meta; name: string }
+	component: {
+		meta: Kotti.Meta
+		name: string
+		props?: Record<string, unknown>
+	}
 }>({
 	props: {
 		component: { required: true, type: Object },
@@ -162,11 +167,15 @@ export default defineComponent<{
 				}> = []
 
 				const {
-					addedVersion,
-					deprecated,
-					designs,
-					typeScript,
-				} = props.component.meta
+					meta: { addedVersion, deprecated, designs, typeScript },
+					name,
+				} = props.component
+
+				const componentSourceFolder = props.component.props
+					? `https://github.com/3YOURMIND/kotti/blob/master/packages/kotti-ui/source/${kebabCase(
+							name.replace(/^Kt/, 'Kotti'),
+					  )}`
+					: null
 
 				if (deprecated !== null)
 					result.push({
@@ -212,6 +221,9 @@ export default defineComponent<{
 						backgroundColor: 'var(--primary-20)',
 						color: 'var(--primary-70)',
 						left: 'TS',
+						link: componentSourceFolder
+							? `${componentSourceFolder}/types.ts`
+							: undefined,
 						right: typeScript.namespace,
 					})
 
@@ -229,6 +241,15 @@ export default defineComponent<{
 						  }),
 				})
 
+				if (componentSourceFolder)
+					result.push({
+						backgroundColor: 'var(--purple-20)',
+						color: 'var(--purple-70)',
+						left: 'Source',
+						link: `${componentSourceFolder}/${name}.vue`,
+						right: `${name}.vue`,
+					})
+
 				return result
 			}),
 			showProps: ref(false),
diff --git a/packages/kotti-ui/source/index.ts b/packages/kotti-ui/source/index.ts
index f09d3bb0a9..93fa2c6c17 100644
--- a/packages/kotti-ui/source/index.ts
+++ b/packages/kotti-ui/source/index.ts
@@ -55,15 +55,16 @@ import { KtFieldTextArea } from './kotti-field-text-area'
 export * from './kotti-field-text-area'
 import { KtFieldToggle, KtFieldToggleGroup } from './kotti-field-toggle'
 export * from './kotti-field-toggle'
-import { KtFilters } from './kotti-filter'
-export * from './kotti-filter'
-import {
-	KtForm,
-	KtFormControllerList,
-	KtFormControllerObject,
-	KtFormSubmit,
-} from './kotti-form'
+import { KtFilters } from './kotti-filters'
+export * from './kotti-filters'
+import { KtForm } from './kotti-form'
 export * from './kotti-form'
+import { KtFormControllerList } from './kotti-form-controller-list'
+export * from './kotti-form-controller-list'
+import { KtFormControllerObject } from './kotti-form-controller-object'
+export * from './kotti-form-controller-object'
+import { KtFormSubmit } from './kotti-form-submit'
+export * from './kotti-form-submit'
 import { KtHeading } from './kotti-heading'
 export * from './kotti-heading'
 import { KtInlineEdit } from './kotti-inline-edit'
@@ -95,7 +96,6 @@ import {
 	KtTableColumn,
 	KtTableProvider,
 	KtTableConsumer,
-	KtTableColumnsStateMixin,
 } from './kotti-table'
 export * from './kotti-table'
 import { KtTheme } from './kotti-theme'
@@ -165,7 +165,6 @@ export default {
 			KtTableColumn,
 			KtTableProvider,
 			KtTableConsumer,
-			KtTableColumnsStateMixin,
 			KtTheme,
 			KtToaster,
 			KtTranslationContext,
diff --git a/packages/kotti-ui/source/kotti-filter/KtFilters.vue b/packages/kotti-ui/source/kotti-filters/KtFilters.vue
similarity index 100%
rename from packages/kotti-ui/source/kotti-filter/KtFilters.vue
rename to packages/kotti-ui/source/kotti-filters/KtFilters.vue
diff --git a/packages/kotti-ui/source/kotti-filter/components/ButtonLink.vue b/packages/kotti-ui/source/kotti-filters/components/ButtonLink.vue
similarity index 100%
rename from packages/kotti-ui/source/kotti-filter/components/ButtonLink.vue
rename to packages/kotti-ui/source/kotti-filters/components/ButtonLink.vue
diff --git a/packages/kotti-ui/source/kotti-filter/components/FilterActions.vue b/packages/kotti-ui/source/kotti-filters/components/FilterActions.vue
similarity index 100%
rename from packages/kotti-ui/source/kotti-filter/components/FilterActions.vue
rename to packages/kotti-ui/source/kotti-filters/components/FilterActions.vue
diff --git a/packages/kotti-ui/source/kotti-filter/components/FilterList.vue b/packages/kotti-ui/source/kotti-filters/components/FilterList.vue
similarity index 100%
rename from packages/kotti-ui/source/kotti-filter/components/FilterList.vue
rename to packages/kotti-ui/source/kotti-filters/components/FilterList.vue
diff --git a/packages/kotti-ui/source/kotti-filter/components/FilterRow.vue b/packages/kotti-ui/source/kotti-filters/components/FilterRow.vue
similarity index 100%
rename from packages/kotti-ui/source/kotti-filter/components/FilterRow.vue
rename to packages/kotti-ui/source/kotti-filters/components/FilterRow.vue
diff --git a/packages/kotti-ui/source/kotti-filter/components/FilterSearch.vue b/packages/kotti-ui/source/kotti-filters/components/FilterSearch.vue
similarity index 100%
rename from packages/kotti-ui/source/kotti-filter/components/FilterSearch.vue
rename to packages/kotti-ui/source/kotti-filters/components/FilterSearch.vue
diff --git a/packages/kotti-ui/source/kotti-filter/index.ts b/packages/kotti-ui/source/kotti-filters/index.ts
similarity index 100%
rename from packages/kotti-ui/source/kotti-filter/index.ts
rename to packages/kotti-ui/source/kotti-filters/index.ts
diff --git a/packages/kotti-ui/source/kotti-filter/types.ts b/packages/kotti-ui/source/kotti-filters/types.ts
similarity index 100%
rename from packages/kotti-ui/source/kotti-filter/types.ts
rename to packages/kotti-ui/source/kotti-filters/types.ts
diff --git a/packages/kotti-ui/source/kotti-filter/utils.ts b/packages/kotti-ui/source/kotti-filters/utils.ts
similarity index 100%
rename from packages/kotti-ui/source/kotti-filter/utils.ts
rename to packages/kotti-ui/source/kotti-filters/utils.ts
diff --git a/packages/kotti-ui/source/kotti-filter/validators.ts b/packages/kotti-ui/source/kotti-filters/validators.ts
similarity index 100%
rename from packages/kotti-ui/source/kotti-filter/validators.ts
rename to packages/kotti-ui/source/kotti-filters/validators.ts
diff --git a/packages/kotti-ui/source/kotti-form/controllers/KtFormControllerList.vue b/packages/kotti-ui/source/kotti-form-controller-list/KtFormControllerList.vue
similarity index 93%
rename from packages/kotti-ui/source/kotti-form/controllers/KtFormControllerList.vue
rename to packages/kotti-ui/source/kotti-form-controller-list/KtFormControllerList.vue
index 066f0d7c62..a519ee8574 100644
--- a/packages/kotti-ui/source/kotti-form/controllers/KtFormControllerList.vue
+++ b/packages/kotti-ui/source/kotti-form-controller-list/KtFormControllerList.vue
@@ -5,7 +5,7 @@
 			name="header"
 			:values="cloneDeep(valuesList)"
 		/>
-		<KtFormControllerListItem
+		<FormControllerListItem
 			v-for="(values, index) in valuesList"
 			:key="index"
 			:context="context"
@@ -23,7 +23,7 @@
 				:setValues="(newValue) => setValuesIndex(index, newValue)"
 				:values="cloneDeep(values)"
 			/>
-		</KtFormControllerListItem>
+		</FormControllerListItem>
 		<slot
 			v-bind="slotFunctions"
 			name="footer"
@@ -36,15 +36,15 @@
 import { defineComponent, inject, computed } from '@vue/composition-api'
 import cloneDeep from 'lodash/cloneDeep'
 
-import { KT_FORM_CONTEXT } from '../constants'
-import { KottiForm } from '../types'
+import { KT_FORM_CONTEXT } from '../kotti-form/constants'
+import { KottiForm } from '../kotti-form/types'
 
-import KtFormControllerListItem from './KtFormControllerListItem.vue'
+import FormControllerListItem from './components/FormControllerListItem.vue'
 import { KottiFormControllerList } from './types'
 
 export default defineComponent({
 	name: 'KtFormControllerList',
-	components: { KtFormControllerListItem },
+	components: { FormControllerListItem },
 	props: {
 		formKey: { required: true, type: String },
 	},
diff --git a/packages/kotti-ui/source/kotti-form/controllers/KtFormControllerListItem.vue b/packages/kotti-ui/source/kotti-form-controller-list/components/FormControllerListItem.vue
similarity index 82%
rename from packages/kotti-ui/source/kotti-form/controllers/KtFormControllerListItem.vue
rename to packages/kotti-ui/source/kotti-form-controller-list/components/FormControllerListItem.vue
index 97c4b46fd1..f5ab171d42 100644
--- a/packages/kotti-ui/source/kotti-form/controllers/KtFormControllerListItem.vue
+++ b/packages/kotti-ui/source/kotti-form-controller-list/components/FormControllerListItem.vue
@@ -5,13 +5,12 @@
 <script lang="ts">
 import { defineComponent, provide, computed } from '@vue/composition-api'
 
-import { KT_FORM_CONTEXT } from '../constants'
-import { KottiForm } from '../types'
-
-import { KottiFormControllerListItem } from './types'
+import { KT_FORM_CONTEXT } from '../../kotti-form/constants'
+import { KottiForm } from '../../kotti-form/types'
+import { KottiFormControllerListItem } from '../types'
 
 export default defineComponent({
-	name: 'KtFormControllerListItem',
+	name: 'FormControllerListItem',
 	props: {
 		context: { required: true, type: Object },
 		formKey: { required: true, type: String },
diff --git a/packages/kotti-ui/source/kotti-form-controller-list/index.ts b/packages/kotti-ui/source/kotti-form-controller-list/index.ts
new file mode 100644
index 0000000000..3ea2979ec6
--- /dev/null
+++ b/packages/kotti-ui/source/kotti-form-controller-list/index.ts
@@ -0,0 +1,74 @@
+import { Kotti } from '../types'
+import { attachMeta, makeInstallable } from '../utilities'
+
+import KtFormControllerListVue from './KtFormControllerList.vue'
+
+export const sharedHeaderFooterScope: Kotti.Meta['slots'][string]['scope'] = {
+	addAfter: {
+		description: 'append an item to the list',
+		type: 'function',
+	},
+	addBefore: {
+		description: 'prepend an item to the list',
+		type: 'function',
+	},
+	setValues: {
+		description: 'replace the list',
+		type: 'function',
+	},
+	values: {
+		description: 'all items in the list',
+		type: 'object',
+	},
+}
+
+export const KtFormControllerList = attachMeta(
+	makeInstallable(KtFormControllerListVue),
+	{
+		addedVersion: '2.0.0',
+		deprecated: null,
+		designs: null,
+		slots: {
+			default: {
+				description: null,
+				scope: {
+					addAfter: {
+						description: null,
+						type: 'function',
+					},
+					addBefore: {
+						description: null,
+						type: 'function',
+					},
+					deleteSelf: {
+						description: null,
+						type: 'function',
+					},
+					index: {
+						description: null,
+						type: 'integer',
+					},
+					setValues: {
+						description: null,
+						type: 'function',
+					},
+					values: {
+						description: null,
+						type: 'object',
+					},
+				},
+			},
+			footer: {
+				description: 'inserted below the list, exposes list utilities',
+				scope: sharedHeaderFooterScope,
+			},
+			header: {
+				description: 'inserted above the list, exposes list utilities',
+				scope: sharedHeaderFooterScope,
+			},
+		},
+		typeScript: {
+			namespace: 'Kotti.FormControllerList',
+		},
+	},
+)
diff --git a/packages/kotti-ui/source/kotti-form/controllers/tests.ts b/packages/kotti-ui/source/kotti-form-controller-list/tests.ts
similarity index 61%
rename from packages/kotti-ui/source/kotti-form/controllers/tests.ts
rename to packages/kotti-ui/source/kotti-form-controller-list/tests.ts
index 3f757440cc..0fc38d28d5 100644
--- a/packages/kotti-ui/source/kotti-form/controllers/tests.ts
+++ b/packages/kotti-ui/source/kotti-form-controller-list/tests.ts
@@ -3,16 +3,15 @@ require('jsdom-global')()
 import { defineComponent, ref } from '@vue/composition-api'
 import { mount, Wrapper } from '@vue/test-utils'
 
-import { KOTTI_FIELD_PROPS } from '../../kotti-field/constants'
-import { useField } from '../../kotti-field/hooks'
-import KtField from '../../kotti-field/KtField.vue'
-import { KottiField } from '../../kotti-field/types'
-import { useTranslationProvide } from '../../kotti-translation/hooks'
-import { localVue } from '../../test-utils/index'
-import KtForm from '../KtForm.vue'
+import { KOTTI_FIELD_PROPS } from '../kotti-field/constants'
+import { useField } from '../kotti-field/hooks'
+import KtField from '../kotti-field/KtField.vue'
+import { KottiField } from '../kotti-field/types'
+import KtForm from '../kotti-form/KtForm.vue'
+import { useTranslationProvide } from '../kotti-translation/hooks'
+import { localVue } from '../test-utils/index'
 
 import KtFormControllerList from './KtFormControllerList.vue'
-import KtFormControllerObject from './KtFormControllerObject.vue'
 
 const TestField = defineComponent({
 	name: 'TestField',
@@ -53,20 +52,6 @@ const TestControllerListForm = {
 	template: `<KtForm v-bind="formProps" @input="$event => $emit('input', $event)"><TestControllerList v-bind="controllerProps"/></KtForm>`,
 }
 
-const TestControllerObject = {
-	components: { TestField, KtFormControllerObject },
-	template: `<KtFormControllerObject v-bind="$attrs"><TestField formKey="testKey"/></KtFormControllerObject>`,
-}
-
-const TestControllerObjectForm = {
-	components: { KtForm, TestControllerObject },
-	props: {
-		controllerProps: { required: true, type: Object },
-		formProps: { required: true, type: Object },
-	},
-	template: `<KtForm v-bind="formProps" @input="$event => $emit('input', $event)"><TestControllerObject v-bind="controllerProps"/></KtForm>`,
-}
-
 const getField = (
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	wrapper: Wrapper<any>,
@@ -190,79 +175,3 @@ describe('KtFormControllerList', () => {
 		})
 	})
 })
-
-describe('KtFormControllerObject', () => {
-	it('provides context with nested data, and passes-down the other properties of the KtFormContext', () => {
-		const wrapper = mount(TestControllerObjectForm, {
-			localVue,
-			propsData: {
-				controllerProps: { formKey: 'parentKey' },
-				formProps: {
-					hideValidation: true,
-					validators: { testKey: () => ({ type: 'empty' }) },
-					value: { parentKey: { testKey: 'something' } },
-				},
-			},
-		})
-
-		const field = getField(wrapper, 0)
-
-		expect(field.currentValue).toBe('something')
-		expect(field.hideValidation).toBe(true)
-		expect(field.validation).toEqual({ type: 'empty' })
-	})
-
-	it('implements setValue properly', async () => {
-		const wrapper = mount(TestControllerObjectForm, {
-			localVue,
-			propsData: {
-				controllerProps: { formKey: 'parentKey' },
-				formProps: {
-					hideValidation: true,
-					validators: {
-						testKey: () => ({ type: 'empty' }),
-					},
-					value: { parentKey: { testKey: 'something' } },
-				},
-			},
-		})
-		const field = getField(wrapper, 0)
-
-		field.setValue('setSomething')
-
-		await wrapper.vm.$nextTick()
-
-		expect(wrapper.emitted('input')).toEqual([
-			[{ parentKey: { testKey: 'setSomething' } }],
-		])
-	})
-
-	describe('reactivity', () => {
-		it('hideValidation', async () => {
-			const FORM_PROPS = {
-				hideValidation: false,
-				value: {
-					parentKey: { testKey: 'something' },
-				},
-			}
-
-			const wrapper = mount(TestControllerObjectForm, {
-				localVue,
-				propsData: {
-					controllerProps: { formKey: 'parentKey' },
-					formProps: FORM_PROPS,
-				},
-			})
-
-			const field = getField(wrapper, 0)
-
-			expect(field.hideValidation).toBe(false)
-
-			wrapper.setProps({ formProps: { ...FORM_PROPS, hideValidation: true } })
-
-			await wrapper.vm.$nextTick()
-
-			expect(field.hideValidation).toBe(true)
-		})
-	})
-})
diff --git a/packages/kotti-ui/source/kotti-form/controllers/types.ts b/packages/kotti-ui/source/kotti-form-controller-list/types.ts
similarity index 62%
rename from packages/kotti-ui/source/kotti-form/controllers/types.ts
rename to packages/kotti-ui/source/kotti-form-controller-list/types.ts
index 72006742c0..27590a2b0c 100644
--- a/packages/kotti-ui/source/kotti-form/controllers/types.ts
+++ b/packages/kotti-ui/source/kotti-form-controller-list/types.ts
@@ -1,18 +1,11 @@
-import { KottiField } from '../../kotti-field/types'
-import { KottiForm } from '../types'
+import { KottiField } from '../kotti-field/types'
+import { KottiForm } from '../kotti-form/types'
 
 export namespace KottiFormControllerList {
 	export type Props = {
 		formKey: string
 	}
 }
-
-export namespace KottiFormControllerObject {
-	export type Props = {
-		formKey: string
-	}
-}
-
 export namespace KottiFormControllerListItem {
 	export type Props = {
 		context: KottiForm.Context
diff --git a/packages/kotti-ui/source/kotti-form/controllers/KtFormControllerObject.vue b/packages/kotti-ui/source/kotti-form-controller-object/KtFormControllerObject.vue
similarity index 94%
rename from packages/kotti-ui/source/kotti-form/controllers/KtFormControllerObject.vue
rename to packages/kotti-ui/source/kotti-form-controller-object/KtFormControllerObject.vue
index dce6f31cc9..8674bae7fe 100644
--- a/packages/kotti-ui/source/kotti-form/controllers/KtFormControllerObject.vue
+++ b/packages/kotti-ui/source/kotti-form-controller-object/KtFormControllerObject.vue
@@ -16,8 +16,8 @@ import {
 	provide,
 } from '@vue/composition-api'
 
-import { KT_FORM_CONTEXT } from '../constants'
-import { KottiForm } from '../types'
+import { KT_FORM_CONTEXT } from '../kotti-form/constants'
+import { KottiForm } from '../kotti-form/types'
 
 import { KottiFormControllerObject } from './types'
 
diff --git a/packages/kotti-ui/source/kotti-form-controller-object/index.ts b/packages/kotti-ui/source/kotti-form-controller-object/index.ts
new file mode 100644
index 0000000000..e48844c1e3
--- /dev/null
+++ b/packages/kotti-ui/source/kotti-form-controller-object/index.ts
@@ -0,0 +1,34 @@
+import { attachMeta, makeInstallable } from '../utilities'
+
+import KtFormControllerObjectVue from './KtFormControllerObject.vue'
+
+export const KtFormControllerObject = attachMeta(
+	makeInstallable(KtFormControllerObjectVue),
+	{
+		addedVersion: '2.0.0',
+		deprecated: null,
+		designs: null,
+		slots: {
+			default: {
+				description: null,
+				scope: {
+					setValue: {
+						description: 'sets a key on the controller object',
+						type: 'function',
+					},
+					setValues: {
+						description: 'sets value of the controller object',
+						type: 'function',
+					},
+					values: {
+						description: 'current value of the controller object',
+						type: 'object',
+					},
+				},
+			},
+		},
+		typeScript: {
+			namespace: 'Kotti.FormControllerObject',
+		},
+	},
+)
diff --git a/packages/kotti-ui/source/kotti-form-controller-object/tests.ts b/packages/kotti-ui/source/kotti-form-controller-object/tests.ts
new file mode 100644
index 0000000000..dabf17be0f
--- /dev/null
+++ b/packages/kotti-ui/source/kotti-form-controller-object/tests.ts
@@ -0,0 +1,137 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+require('jsdom-global')()
+import { defineComponent, ref } from '@vue/composition-api'
+import { mount, Wrapper } from '@vue/test-utils'
+
+import { KOTTI_FIELD_PROPS } from '../kotti-field/constants'
+import { useField } from '../kotti-field/hooks'
+import KtField from '../kotti-field/KtField.vue'
+import { KottiField } from '../kotti-field/types'
+import KtForm from '../kotti-form/KtForm.vue'
+import { useTranslationProvide } from '../kotti-translation/hooks'
+import { localVue } from '../test-utils/index'
+
+import KtFormControllerObject from './KtFormControllerObject.vue'
+
+const TestField = defineComponent({
+	name: 'TestField',
+	components: { KtField },
+	props: KOTTI_FIELD_PROPS,
+	setup: (props: KottiField.Props<string | null>, { emit }) => {
+		useTranslationProvide(ref('en-US'), ref({}))
+
+		return {
+			field: useField({
+				emit,
+				isCorrectDataType: (value): value is string | null =>
+					typeof value === 'string' || value === null,
+				isEmpty: (value) => value === null,
+				props,
+				supports: {
+					clear: true,
+					decoration: true,
+					tabIndex: true,
+				},
+			}),
+		}
+	},
+	template: `<KtField :field="field" :getEmptyValue="() => null">FIELD</KtField>`,
+})
+
+const TestControllerObject = {
+	components: { TestField, KtFormControllerObject },
+	template: `<KtFormControllerObject v-bind="$attrs"><TestField formKey="testKey"/></KtFormControllerObject>`,
+}
+
+const TestControllerObjectForm = {
+	components: { KtForm, TestControllerObject },
+	props: {
+		controllerProps: { required: true, type: Object },
+		formProps: { required: true, type: Object },
+	},
+	template: `<KtForm v-bind="formProps" @input="$event => $emit('input', $event)"><TestControllerObject v-bind="controllerProps"/></KtForm>`,
+}
+
+const getField = (
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	wrapper: Wrapper<any>,
+	index: number,
+): KottiField.Hook.Returns<string | null> =>
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	(wrapper.findAllComponents({ name: 'KtField' }).at(index).vm as any).field
+
+describe('KtFormControllerObject', () => {
+	it('provides context with nested data, and passes-down the other properties of the KtFormContext', () => {
+		const wrapper = mount(TestControllerObjectForm, {
+			localVue,
+			propsData: {
+				controllerProps: { formKey: 'parentKey' },
+				formProps: {
+					hideValidation: true,
+					validators: { testKey: () => ({ type: 'empty' }) },
+					value: { parentKey: { testKey: 'something' } },
+				},
+			},
+		})
+
+		const field = getField(wrapper, 0)
+
+		expect(field.currentValue).toBe('something')
+		expect(field.hideValidation).toBe(true)
+		expect(field.validation).toEqual({ type: 'empty' })
+	})
+
+	it('implements setValue properly', async () => {
+		const wrapper = mount(TestControllerObjectForm, {
+			localVue,
+			propsData: {
+				controllerProps: { formKey: 'parentKey' },
+				formProps: {
+					hideValidation: true,
+					validators: {
+						testKey: () => ({ type: 'empty' }),
+					},
+					value: { parentKey: { testKey: 'something' } },
+				},
+			},
+		})
+		const field = getField(wrapper, 0)
+
+		field.setValue('setSomething')
+
+		await wrapper.vm.$nextTick()
+
+		expect(wrapper.emitted('input')).toEqual([
+			[{ parentKey: { testKey: 'setSomething' } }],
+		])
+	})
+
+	describe('reactivity', () => {
+		it('hideValidation', async () => {
+			const FORM_PROPS = {
+				hideValidation: false,
+				value: {
+					parentKey: { testKey: 'something' },
+				},
+			}
+
+			const wrapper = mount(TestControllerObjectForm, {
+				localVue,
+				propsData: {
+					controllerProps: { formKey: 'parentKey' },
+					formProps: FORM_PROPS,
+				},
+			})
+
+			const field = getField(wrapper, 0)
+
+			expect(field.hideValidation).toBe(false)
+
+			wrapper.setProps({ formProps: { ...FORM_PROPS, hideValidation: true } })
+
+			await wrapper.vm.$nextTick()
+
+			expect(field.hideValidation).toBe(true)
+		})
+	})
+})
diff --git a/packages/kotti-ui/source/kotti-form-controller-object/types.ts b/packages/kotti-ui/source/kotti-form-controller-object/types.ts
new file mode 100644
index 0000000000..bfeb2a5d86
--- /dev/null
+++ b/packages/kotti-ui/source/kotti-form-controller-object/types.ts
@@ -0,0 +1,5 @@
+export namespace KottiFormControllerObject {
+	export type Props = {
+		formKey: string
+	}
+}
diff --git a/packages/kotti-ui/source/kotti-form/KtFormSubmit.vue b/packages/kotti-ui/source/kotti-form-submit/KtFormSubmit.vue
similarity index 87%
rename from packages/kotti-ui/source/kotti-form/KtFormSubmit.vue
rename to packages/kotti-ui/source/kotti-form-submit/KtFormSubmit.vue
index ad79cd6796..99ec13a0ef 100644
--- a/packages/kotti-ui/source/kotti-form/KtFormSubmit.vue
+++ b/packages/kotti-ui/source/kotti-form-submit/KtFormSubmit.vue
@@ -46,13 +46,14 @@
 import { Yoco } from '@3yourmind/yoco'
 import { defineComponent, inject, computed } from '@vue/composition-api'
 
+import { KT_FORM_SUBMIT_CONTEXT } from '../kotti-form/constants'
+import { KottiForm } from '../kotti-form/types'
 import { useTranslationNamespace } from '../kotti-translation/hooks'
 
-import { KT_FORM_SUBMIT_CONTEXT } from './constants'
-import { KtFormErrors } from './errors'
-import { KottiForm } from './types'
+import { KtFormSubmitErrors } from './errors'
+import { KottiFormSubmit } from './types'
 
-export default defineComponent({
+export default defineComponent<KottiFormSubmit.PropsInternal>({
 	name: 'KtFormSubmit',
 	props: {
 		label: { default: 'Submit', type: String },
@@ -63,7 +64,8 @@ export default defineComponent({
 			null,
 		)
 
-		if (context === null) throw new KtFormErrors.InvalidSubmitOutsideContext()
+		if (context === null)
+			throw new KtFormSubmitErrors.InvalidSubmitOutsideContext()
 
 		const { isLoading, isValid, validationSummary } = context
 		const errors = computed(() => validationSummary.value.errors)
@@ -85,6 +87,8 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
+/* FIXME: why isn’t this scoped? */
+
 .kt-form-submit {
 	&__button {
 		display: flex;
diff --git a/packages/kotti-ui/source/kotti-form-submit/errors.ts b/packages/kotti-ui/source/kotti-form-submit/errors.ts
new file mode 100644
index 0000000000..cc55f4829f
--- /dev/null
+++ b/packages/kotti-ui/source/kotti-form-submit/errors.ts
@@ -0,0 +1,14 @@
+import { CustomError } from 'ts-custom-error'
+
+class InvalidSubmitOutsideContext extends CustomError {
+	public constructor() {
+		const messages = [
+			'Encountered a “<KtFormSubmit />” outside of a “<KtForm/>”',
+		]
+		super(`KtFormSubmit: ${messages.join('\n')}`)
+	}
+}
+
+export const KtFormSubmitErrors = {
+	InvalidSubmitOutsideContext,
+}
diff --git a/packages/kotti-ui/source/kotti-form-submit/index.ts b/packages/kotti-ui/source/kotti-form-submit/index.ts
new file mode 100644
index 0000000000..4b46982065
--- /dev/null
+++ b/packages/kotti-ui/source/kotti-form-submit/index.ts
@@ -0,0 +1,13 @@
+import { attachMeta, makeInstallable } from '../utilities'
+
+import KtFormSubmitVue from './KtFormSubmit.vue'
+
+export const KtFormSubmit = attachMeta(makeInstallable(KtFormSubmitVue), {
+	addedVersion: '2.0.0',
+	deprecated: null,
+	designs: null,
+	slots: {},
+	typeScript: {
+		namespace: 'Kotti.FormSubmit',
+	},
+})
diff --git a/packages/kotti-ui/source/kotti-form-submit/types.ts b/packages/kotti-ui/source/kotti-form-submit/types.ts
new file mode 100644
index 0000000000..12518d322d
--- /dev/null
+++ b/packages/kotti-ui/source/kotti-form-submit/types.ts
@@ -0,0 +1,15 @@
+import { SpecifyRequiredProps } from '../types/utilities'
+
+export namespace KottiFormSubmit {
+	export type PropsInternal = {
+		label: string
+	}
+
+	export type Props = SpecifyRequiredProps<PropsInternal, never>
+
+	export type Translations = {
+		errorsSectionTitle: string
+		title: string
+		warningsSectionTitle: string
+	}
+}
diff --git a/packages/kotti-ui/source/kotti-form/errors.ts b/packages/kotti-ui/source/kotti-form/errors.ts
index 99e4fe043e..0839be4024 100644
--- a/packages/kotti-ui/source/kotti-form/errors.ts
+++ b/packages/kotti-ui/source/kotti-form/errors.ts
@@ -32,16 +32,7 @@ class ValidationError extends CustomError {
 	}
 }
 
-class InvalidSubmitOutsideContext extends CustomError {
-	public constructor() {
-		const messages = [
-			'Encountered a “<KtFormSubmit />” outside of a “<KtForm/>”',
-		]
-		super(`KtFormSubmit: ${messages.join('\n')}`)
-	}
-}
 export const KtFormErrors = {
-	InvalidSubmitOutsideContext,
 	UnexpectedValidationState,
 	ValidationError,
 }
diff --git a/packages/kotti-ui/source/kotti-form/index.ts b/packages/kotti-ui/source/kotti-form/index.ts
index dfbd5e217b..d95bdda765 100644
--- a/packages/kotti-ui/source/kotti-form/index.ts
+++ b/packages/kotti-ui/source/kotti-form/index.ts
@@ -1,121 +1,6 @@
-import { Kotti } from '../types'
 import { attachMeta, makeInstallable } from '../utilities'
 
-import KtFormControllerListVue from './controllers/KtFormControllerList.vue'
-import KtFormControllerObjectVue from './controllers/KtFormControllerObject.vue'
 import KtFormVue from './KtForm.vue'
-import KtFormSubmitVue from './KtFormSubmit.vue'
-
-const headerFooterScope: Kotti.Meta['slots'][string]['scope'] = {
-	addAfter: {
-		description: 'append an item to the list',
-		type: 'function',
-	},
-	addBefore: {
-		description: 'prepend an item to the list',
-		type: 'function',
-	},
-	setValues: {
-		description: 'replace the list',
-		type: 'function',
-	},
-	values: {
-		description: 'all items in the list',
-		type: 'object',
-	},
-}
-
-export const KtFormControllerList = attachMeta(
-	makeInstallable(KtFormControllerListVue),
-	{
-		addedVersion: '2.0.0',
-		deprecated: null,
-		designs: null,
-		slots: {
-			default: {
-				description: null,
-				scope: {
-					addAfter: {
-						description: null,
-						type: 'function',
-					},
-					addBefore: {
-						description: null,
-						type: 'function',
-					},
-					deleteSelf: {
-						description: null,
-						type: 'function',
-					},
-					index: {
-						description: null,
-						type: 'integer',
-					},
-					setValues: {
-						description: null,
-						type: 'function',
-					},
-					values: {
-						description: null,
-						type: 'object',
-					},
-				},
-			},
-			footer: {
-				description: 'inserted below the list, exposes list utilities',
-				scope: headerFooterScope,
-			},
-			header: {
-				description: 'inserted above the list, exposes list utilities',
-				scope: headerFooterScope,
-			},
-		},
-		typeScript: {
-			namespace: 'Kotti.FormControllerList',
-		},
-	},
-)
-
-export const KtFormControllerObject = attachMeta(
-	makeInstallable(KtFormControllerObjectVue),
-	{
-		addedVersion: '2.0.0',
-		deprecated: null,
-		designs: null,
-		slots: {
-			default: {
-				description: null,
-				scope: {
-					setValue: {
-						description: 'sets a key on the controller object',
-						type: 'function',
-					},
-					setValues: {
-						description: 'sets value of the controller object',
-						type: 'function',
-					},
-					values: {
-						description: 'current value of the controller object',
-						type: 'object',
-					},
-				},
-			},
-		},
-		typeScript: {
-			namespace: 'Kotti.FormControllerObject',
-		},
-	},
-)
-
-export const KtFormSubmit = attachMeta(makeInstallable(KtFormSubmitVue), {
-	addedVersion: '2.0.0',
-	deprecated: null,
-	designs: null,
-	slots: {},
-	typeScript: {
-		namespace: 'Kotti.FormSubmit',
-	},
-})
 
 export const KtForm = attachMeta(makeInstallable(KtFormVue), {
 	addedVersion: '2.0.0',
diff --git a/packages/kotti-ui/source/kotti-form/types.ts b/packages/kotti-ui/source/kotti-form/types.ts
index 527c867c4b..d9ec507449 100644
--- a/packages/kotti-ui/source/kotti-form/types.ts
+++ b/packages/kotti-ui/source/kotti-form/types.ts
@@ -70,11 +70,3 @@ export namespace KottiForm {
 		}
 	}
 }
-
-export namespace KottiFormSubmit {
-	export type Translations = {
-		errorsSectionTitle: string
-		title: string
-		warningsSectionTitle: string
-	}
-}
diff --git a/packages/kotti-ui/source/kotti-table/src/KtTable.vue b/packages/kotti-ui/source/kotti-table/KtTable.vue
similarity index 98%
rename from packages/kotti-ui/source/kotti-table/src/KtTable.vue
rename to packages/kotti-ui/source/kotti-table/KtTable.vue
index 0f566bcc54..8eb869cccb 100644
--- a/packages/kotti-ui/source/kotti-table/src/KtTable.vue
+++ b/packages/kotti-ui/source/kotti-table/KtTable.vue
@@ -24,6 +24,8 @@
 import deepEql from 'deep-eql'
 import pick from 'lodash/pick'
 
+import { TableBody } from './components/TableBody'
+import TableHeader from './components/TableHeader.vue'
 import {
 	KT_TABLE,
 	KT_STORE,
@@ -31,11 +33,9 @@ import {
 	KT_TABLE_STATE_PROVIDER,
 	DEFAULT_DISABLE_ROW,
 } from './constants'
+import { KtTableColumn } from './KtTableColumn'
 import { TableStore } from './logic/store'
 import { TableLayout } from './table-layout'
-import { TableBody } from './TableBody'
-import { KtTableColumn } from './TableColumn'
-import TableHeader from './TableHeader.vue'
 
 let tableIdSeed = 1
 
diff --git a/packages/kotti-ui/source/kotti-table/src/TableColumn.ts b/packages/kotti-ui/source/kotti-table/KtTableColumn.d.ts
similarity index 100%
rename from packages/kotti-ui/source/kotti-table/src/TableColumn.ts
rename to packages/kotti-ui/source/kotti-table/KtTableColumn.d.ts
diff --git a/packages/kotti-ui/source/kotti-table/src/TableColumn.js b/packages/kotti-ui/source/kotti-table/KtTableColumn.js
similarity index 100%
rename from packages/kotti-ui/source/kotti-table/src/TableColumn.js
rename to packages/kotti-ui/source/kotti-table/KtTableColumn.js
diff --git a/packages/kotti-ui/source/kotti-table/src/TableConsumer.ts b/packages/kotti-ui/source/kotti-table/KtTableConsumer.d.ts
similarity index 100%
rename from packages/kotti-ui/source/kotti-table/src/TableConsumer.ts
rename to packages/kotti-ui/source/kotti-table/KtTableConsumer.d.ts
diff --git a/packages/kotti-ui/source/kotti-table/src/TableConsumer.js b/packages/kotti-ui/source/kotti-table/KtTableConsumer.js
similarity index 100%
rename from packages/kotti-ui/source/kotti-table/src/TableConsumer.js
rename to packages/kotti-ui/source/kotti-table/KtTableConsumer.js
diff --git a/packages/kotti-ui/source/kotti-table/src/TableProvider.ts b/packages/kotti-ui/source/kotti-table/KtTableProvider.d.ts
similarity index 100%
rename from packages/kotti-ui/source/kotti-table/src/TableProvider.ts
rename to packages/kotti-ui/source/kotti-table/KtTableProvider.d.ts
diff --git a/packages/kotti-ui/source/kotti-table/src/TableProvider.js b/packages/kotti-ui/source/kotti-table/KtTableProvider.js
similarity index 99%
rename from packages/kotti-ui/source/kotti-table/src/TableProvider.js
rename to packages/kotti-ui/source/kotti-table/KtTableProvider.js
index 4132637810..a81361b512 100644
--- a/packages/kotti-ui/source/kotti-table/src/TableProvider.js
+++ b/packages/kotti-ui/source/kotti-table/KtTableProvider.js
@@ -3,6 +3,7 @@ import pick from 'lodash/pick'
 import { KT_TABLE_STATE_PROVIDER } from './constants'
 import KtTable, { INITIAL_TABLE_STORE_PROPS } from './KtTable.vue'
 import { TableStore } from './logic/store'
+
 let tableProviderIdSeed = 1
 
 export const KtTableProvider = {
diff --git a/packages/kotti-ui/source/kotti-table/src/TableBody.jsx b/packages/kotti-ui/source/kotti-table/components/TableBody.jsx
similarity index 95%
rename from packages/kotti-ui/source/kotti-table/src/TableBody.jsx
rename to packages/kotti-ui/source/kotti-table/components/TableBody.jsx
index 0afba76eea..13eb4e56c0 100644
--- a/packages/kotti-ui/source/kotti-table/src/TableBody.jsx
+++ b/packages/kotti-ui/source/kotti-table/components/TableBody.jsx
@@ -1,4 +1,5 @@
-import { KT_TABLE, KT_STORE, KT_LAYOUT } from './constants'
+import { KT_TABLE, KT_STORE, KT_LAYOUT } from '../constants'
+
 import { TableBodyEmptyRow } from './TableBodyEmptyRow'
 import { TableBodyExpandRow } from './TableBodyExpandRow'
 import { TableBodyLoadingRow } from './TableBodyLoadingRow'
diff --git a/packages/kotti-ui/source/kotti-table/src/TableBodyEmptyRow.jsx b/packages/kotti-ui/source/kotti-table/components/TableBodyEmptyRow.jsx
similarity index 87%
rename from packages/kotti-ui/source/kotti-table/src/TableBodyEmptyRow.jsx
rename to packages/kotti-ui/source/kotti-table/components/TableBodyEmptyRow.jsx
index 40dbc555a7..ff6a5bd3b3 100644
--- a/packages/kotti-ui/source/kotti-table/src/TableBodyEmptyRow.jsx
+++ b/packages/kotti-ui/source/kotti-table/components/TableBodyEmptyRow.jsx
@@ -1,4 +1,4 @@
-import { KT_TABLE, KT_STORE, KT_LAYOUT } from './constants'
+import { KT_TABLE, KT_STORE, KT_LAYOUT } from '../constants'
 
 export const TableBodyEmptyRow = {
 	name: 'TableBodyEmptyRow',
diff --git a/packages/kotti-ui/source/kotti-table/src/TableBodyExpandRow.jsx b/packages/kotti-ui/source/kotti-table/components/TableBodyExpandRow.jsx
similarity index 91%
rename from packages/kotti-ui/source/kotti-table/src/TableBodyExpandRow.jsx
rename to packages/kotti-ui/source/kotti-table/components/TableBodyExpandRow.jsx
index db6faee876..e8372cb152 100644
--- a/packages/kotti-ui/source/kotti-table/src/TableBodyExpandRow.jsx
+++ b/packages/kotti-ui/source/kotti-table/components/TableBodyExpandRow.jsx
@@ -1,4 +1,4 @@
-import { KT_TABLE, KT_STORE, KT_LAYOUT } from './constants'
+import { KT_TABLE, KT_STORE, KT_LAYOUT } from '../constants'
 
 export const TableBodyExpandRow = {
 	name: 'TableBodyExpandRow',
diff --git a/packages/kotti-ui/source/kotti-table/src/TableBodyLoadingRow.jsx b/packages/kotti-ui/source/kotti-table/components/TableBodyLoadingRow.jsx
similarity index 86%
rename from packages/kotti-ui/source/kotti-table/src/TableBodyLoadingRow.jsx
rename to packages/kotti-ui/source/kotti-table/components/TableBodyLoadingRow.jsx
index 673fd243a8..b0028efddc 100644
--- a/packages/kotti-ui/source/kotti-table/src/TableBodyLoadingRow.jsx
+++ b/packages/kotti-ui/source/kotti-table/components/TableBodyLoadingRow.jsx
@@ -1,4 +1,4 @@
-import { KT_TABLE, KT_STORE, KT_LAYOUT } from './constants'
+import { KT_TABLE, KT_STORE, KT_LAYOUT } from '../constants'
 
 export const TableBodyLoadingRow = {
 	name: 'TableBodyLoadingRow',
diff --git a/packages/kotti-ui/source/kotti-table/src/TableHeader.vue b/packages/kotti-ui/source/kotti-table/components/TableHeader.vue
similarity index 98%
rename from packages/kotti-ui/source/kotti-table/src/TableHeader.vue
rename to packages/kotti-ui/source/kotti-table/components/TableHeader.vue
index 7119f7b6b2..7add8795d3 100644
--- a/packages/kotti-ui/source/kotti-table/src/TableHeader.vue
+++ b/packages/kotti-ui/source/kotti-table/components/TableHeader.vue
@@ -60,7 +60,8 @@
 </template>
 
 <script>
-import { KT_TABLE, KT_STORE, KT_LAYOUT } from './constants'
+import { KT_TABLE, KT_STORE, KT_LAYOUT } from '../constants'
+
 import { TableHeaderCell } from './TableHeaderCell'
 
 export default {
diff --git a/packages/kotti-ui/source/kotti-table/src/TableHeaderCell.js b/packages/kotti-ui/source/kotti-table/components/TableHeaderCell.js
similarity index 100%
rename from packages/kotti-ui/source/kotti-table/src/TableHeaderCell.js
rename to packages/kotti-ui/source/kotti-table/components/TableHeaderCell.js
diff --git a/packages/kotti-ui/source/kotti-table/src/TableRow.jsx b/packages/kotti-ui/source/kotti-table/components/TableRow.jsx
similarity index 98%
rename from packages/kotti-ui/source/kotti-table/src/TableRow.jsx
rename to packages/kotti-ui/source/kotti-table/components/TableRow.jsx
index 0981117cc6..ab59496f64 100644
--- a/packages/kotti-ui/source/kotti-table/src/TableRow.jsx
+++ b/packages/kotti-ui/source/kotti-table/components/TableRow.jsx
@@ -1,4 +1,5 @@
-import { KT_TABLE, KT_STORE, KT_LAYOUT } from './constants'
+import { KT_TABLE, KT_STORE, KT_LAYOUT } from '../constants'
+
 import { TableRowCell } from './TableRowCell'
 
 export const TableRow = {
diff --git a/packages/kotti-ui/source/kotti-table/src/TableRowCell.jsx b/packages/kotti-ui/source/kotti-table/components/TableRowCell.jsx
similarity index 96%
rename from packages/kotti-ui/source/kotti-table/src/TableRowCell.jsx
rename to packages/kotti-ui/source/kotti-table/components/TableRowCell.jsx
index bb919aa731..523b35af23 100644
--- a/packages/kotti-ui/source/kotti-table/src/TableRowCell.jsx
+++ b/packages/kotti-ui/source/kotti-table/components/TableRowCell.jsx
@@ -1,6 +1,6 @@
 import property from 'lodash/property'
 
-import { KT_TABLE, KT_STORE, KT_LAYOUT } from './constants'
+import { KT_TABLE, KT_STORE, KT_LAYOUT } from '../constants'
 
 export const TableRowCell = {
 	name: 'TableRowCell',
diff --git a/packages/kotti-ui/source/kotti-table/src/constants.js b/packages/kotti-ui/source/kotti-table/constants.js
similarity index 100%
rename from packages/kotti-ui/source/kotti-table/src/constants.js
rename to packages/kotti-ui/source/kotti-table/constants.js
diff --git a/packages/kotti-ui/source/kotti-table/index.ts b/packages/kotti-ui/source/kotti-table/index.ts
index a9f31d2141..37a54a7085 100644
--- a/packages/kotti-ui/source/kotti-table/index.ts
+++ b/packages/kotti-ui/source/kotti-table/index.ts
@@ -2,11 +2,10 @@ import { Kotti } from '../types'
 import { MetaDesignType } from '../types/kotti'
 import { attachMeta, makeInstallable } from '../utilities'
 
-import KtTableVue from './src/KtTable.vue'
-import { TableColumnsStateMixin } from './src/mixins'
-import { KtTableColumn as KtTableColumnVue } from './src/TableColumn'
-import { KtTableConsumer as KtTableConsumerVue } from './src/TableConsumer'
-import { KtTableProvider as KtTableProviderVue } from './src/TableProvider'
+import KtTableVue from './KtTable.vue'
+import { KtTableColumn as KtTableColumnVue } from './KtTableColumn'
+import { KtTableConsumer as KtTableConsumerVue } from './KtTableConsumer'
+import { KtTableProvider as KtTableProviderVue } from './KtTableProvider'
 
 const META: Kotti.Meta = {
 	addedVersion: '0.0.1',
@@ -57,5 +56,3 @@ export const KtTableConsumer = attachMeta(
 	makeInstallable(KtTableConsumerVue),
 	META,
 )
-
-export const KtTableColumnsStateMixin = TableColumnsStateMixin
diff --git a/packages/kotti-ui/source/kotti-table/src/logic/column.js b/packages/kotti-ui/source/kotti-table/logic/column.js
similarity index 100%
rename from packages/kotti-ui/source/kotti-table/src/logic/column.js
rename to packages/kotti-ui/source/kotti-table/logic/column.js
diff --git a/packages/kotti-ui/source/kotti-table/src/logic/disable.js b/packages/kotti-ui/source/kotti-table/logic/disable.js
similarity index 100%
rename from packages/kotti-ui/source/kotti-table/src/logic/disable.js
rename to packages/kotti-ui/source/kotti-table/logic/disable.js
diff --git a/packages/kotti-ui/source/kotti-table/src/logic/expand.js b/packages/kotti-ui/source/kotti-table/logic/expand.js
similarity index 100%
rename from packages/kotti-ui/source/kotti-table/src/logic/expand.js
rename to packages/kotti-ui/source/kotti-table/logic/expand.js
diff --git a/packages/kotti-ui/source/kotti-table/src/logic/filter.js b/packages/kotti-ui/source/kotti-table/logic/filter.js
similarity index 99%
rename from packages/kotti-ui/source/kotti-table/src/logic/filter.js
rename to packages/kotti-ui/source/kotti-table/logic/filter.js
index 895d68b7b1..00312a2a3e 100644
--- a/packages/kotti-ui/source/kotti-table/src/logic/filter.js
+++ b/packages/kotti-ui/source/kotti-table/logic/filter.js
@@ -1,4 +1,5 @@
 import { setColumnsArray } from './column'
+
 function getFilteredColumnIndex(state, column) {
 	return state.filteredColumns.findIndex(({ prop }) => prop === column.prop)
 }
diff --git a/packages/kotti-ui/source/kotti-table/src/logic/hide.js b/packages/kotti-ui/source/kotti-table/logic/hide.js
similarity index 100%
rename from packages/kotti-ui/source/kotti-table/src/logic/hide.js
rename to packages/kotti-ui/source/kotti-table/logic/hide.js
diff --git a/packages/kotti-ui/source/kotti-table/src/logic/order.js b/packages/kotti-ui/source/kotti-table/logic/order.js
similarity index 100%
rename from packages/kotti-ui/source/kotti-table/src/logic/order.js
rename to packages/kotti-ui/source/kotti-table/logic/order.js
diff --git a/packages/kotti-ui/source/kotti-table/src/logic/row.js b/packages/kotti-ui/source/kotti-table/logic/row.js
similarity index 100%
rename from packages/kotti-ui/source/kotti-table/src/logic/row.js
rename to packages/kotti-ui/source/kotti-table/logic/row.js
diff --git a/packages/kotti-ui/source/kotti-table/src/logic/select.js b/packages/kotti-ui/source/kotti-table/logic/select.js
similarity index 100%
rename from packages/kotti-ui/source/kotti-table/src/logic/select.js
rename to packages/kotti-ui/source/kotti-table/logic/select.js
diff --git a/packages/kotti-ui/source/kotti-table/src/logic/sort.js b/packages/kotti-ui/source/kotti-table/logic/sort.js
similarity index 100%
rename from packages/kotti-ui/source/kotti-table/src/logic/sort.js
rename to packages/kotti-ui/source/kotti-table/logic/sort.js
diff --git a/packages/kotti-ui/source/kotti-table/src/logic/store.js b/packages/kotti-ui/source/kotti-table/logic/store.js
similarity index 100%
rename from packages/kotti-ui/source/kotti-table/src/logic/store.js
rename to packages/kotti-ui/source/kotti-table/logic/store.js
diff --git a/packages/kotti-ui/source/kotti-table/src/mixins.ts b/packages/kotti-ui/source/kotti-table/mixins.d.ts
similarity index 100%
rename from packages/kotti-ui/source/kotti-table/src/mixins.ts
rename to packages/kotti-ui/source/kotti-table/mixins.d.ts
diff --git a/packages/kotti-ui/source/kotti-table/src/mixins.js b/packages/kotti-ui/source/kotti-table/mixins.js
similarity index 100%
rename from packages/kotti-ui/source/kotti-table/src/mixins.js
rename to packages/kotti-ui/source/kotti-table/mixins.js
diff --git a/packages/kotti-ui/source/kotti-table/src/table-layout.js b/packages/kotti-ui/source/kotti-table/table-layout.js
similarity index 100%
rename from packages/kotti-ui/source/kotti-table/src/table-layout.js
rename to packages/kotti-ui/source/kotti-table/table-layout.js
diff --git a/packages/kotti-ui/source/kotti-translation/types.ts b/packages/kotti-ui/source/kotti-translation/types.ts
index 9fd3a327c2..da0aa825ad 100644
--- a/packages/kotti-ui/source/kotti-translation/types.ts
+++ b/packages/kotti-ui/source/kotti-translation/types.ts
@@ -2,8 +2,8 @@ import { Ref } from '@vue/composition-api'
 
 import { Shared as KottiFieldSelectShared } from '../kotti-field-select/types'
 import { KottiField } from '../kotti-field/types'
-import { KottiFilters } from '../kotti-filter/types'
-import { KottiFormSubmit } from '../kotti-form/types'
+import { KottiFilters } from '../kotti-filters/types'
+import { KottiFormSubmit } from '../kotti-form-submit/types'
 import { KottiNavbar } from '../kotti-navbar/types'
 
 export type DeepPartial<T> = T extends object
diff --git a/packages/kotti-ui/source/types/kotti.ts b/packages/kotti-ui/source/types/kotti.ts
index 6dfd858b21..3729fb2745 100644
--- a/packages/kotti-ui/source/types/kotti.ts
+++ b/packages/kotti-ui/source/types/kotti.ts
@@ -21,15 +21,11 @@ export {
 	KottiFieldSingleSelect as FieldSingleSelect,
 	KottiFieldMultiSelect as FieldMultiSelect,
 } from '../kotti-field-select/types'
-export { KottiFilters as Filters } from '../kotti-filter/types'
-export {
-	KottiForm as Form,
-	KottiFormSubmit as FormSubmit,
-} from '../kotti-form/types'
-export {
-	KottiFormControllerObject as FormControllerObject,
-	KottiFormControllerList as FormControllerList,
-} from '../kotti-form/controllers/types'
+export { KottiFilters as Filters } from '../kotti-filters/types'
+export { KottiForm as Form } from '../kotti-form/types'
+export { KottiFormControllerList as FormControllerList } from '../kotti-form-controller-list/types'
+export { KottiFormControllerObject as FormControllerObject } from '../kotti-form-controller-object/types'
+export { KottiFormSubmit as FormSubmit } from '../kotti-form-submit/types'
 export { KottiModal as Modal } from '../kotti-modal/types'
 export { KottiNavbar as Navbar } from '../kotti-navbar/types'
 export { KottiRow as Row } from '../kotti-row/types'