diff --git a/NodeTypes/Abstract/FormBuilder.yaml b/NodeTypes/Abstract/FormBuilder.yaml
new file mode 100644
index 0000000..a6b1090
--- /dev/null
+++ b/NodeTypes/Abstract/FormBuilder.yaml
@@ -0,0 +1,8 @@
+# Add the extended nodetypes of the Neos.Form.Builder
+# to prevent errors if the new Neos Form-Builder is
+# not in the requirements.
+'Neos.Form.Builder:AbstractFinisher':
+  abstract: true
+
+'Neos.Form.Builder:IdentifierMixin':
+  abstract: true
diff --git a/Configuration/NodeTypes.yaml b/NodeTypes/FormBuilder/DatabaseStorageFinisher.yaml
similarity index 65%
rename from Configuration/NodeTypes.yaml
rename to NodeTypes/FormBuilder/DatabaseStorageFinisher.yaml
index 208d1d1..4b77f8c 100644
--- a/Configuration/NodeTypes.yaml
+++ b/NodeTypes/FormBuilder/DatabaseStorageFinisher.yaml
@@ -1,13 +1,3 @@
-# Add the extended nodetypes of the Neos.Form.Builder
-# to prevent errors if the new Neos Form-Builder is
-# not in the requirements.
-'Neos.Form.Builder:AbstractFinisher':
-  abstract: true
-
-'Neos.Form.Builder:IdentifierMixin':
-  abstract: true
-
-
 'Wegmeister.DatabaseStorage:DatabaseStorageFinisher':
   superTypes:
     'Neos.Form.Builder:AbstractFinisher': true
diff --git a/Resources/Private/Fusion/FormBuilder/FinisherDefinition.fusion b/Resources/Private/Fusion/FormBuilder/FinisherDefinition.fusion
new file mode 100644
index 0000000..68fc271
--- /dev/null
+++ b/Resources/Private/Fusion/FormBuilder/FinisherDefinition.fusion
@@ -0,0 +1,7 @@
+prototype(Wegmeister.DatabaseStorage:DatabaseStorageFinisher.Definition) < prototype(Neos.Form.Builder:Finisher.Definition) {
+    formElementType = 'Wegmeister.DatabaseStorage:DatabaseStorageFinisher'
+
+    options {
+        identifier = ${null}
+    }
+}
diff --git a/Resources/Private/Fusion/Root.fusion b/Resources/Private/Fusion/Root.fusion
index 68fc271..fe1d560 100644
--- a/Resources/Private/Fusion/Root.fusion
+++ b/Resources/Private/Fusion/Root.fusion
@@ -1,7 +1 @@
-prototype(Wegmeister.DatabaseStorage:DatabaseStorageFinisher.Definition) < prototype(Neos.Form.Builder:Finisher.Definition) {
-    formElementType = 'Wegmeister.DatabaseStorage:DatabaseStorageFinisher'
-
-    options {
-        identifier = ${null}
-    }
-}
+include: **/*.fusion