diff --git a/kotlin-code-generation/src/main/kotlin/_builder.kt b/kotlin-code-generation/src/main/kotlin/_builder.kt
new file mode 100644
index 0000000..8e29d11
--- /dev/null
+++ b/kotlin-code-generation/src/main/kotlin/_builder.kt
@@ -0,0 +1,9 @@
+package io.toolisticon.kotlin.generation
+
+import java.util.function.Supplier
+
+fun interface Builder<P : Any> {
+  fun build(): P
+}
+
+interface BuilderSupplier<P : Any, B : Any> : Builder<P>, Supplier<B>
diff --git a/kotlin-code-generation/src/main/kotlin/builder/KotlinConstructorPropertyBuilder.kt b/kotlin-code-generation/src/main/kotlin/builder/KotlinConstructorPropertyBuilder.kt
index 5c9db4e..3078c7c 100644
--- a/kotlin-code-generation/src/main/kotlin/builder/KotlinConstructorPropertyBuilder.kt
+++ b/kotlin-code-generation/src/main/kotlin/builder/KotlinConstructorPropertyBuilder.kt
@@ -3,6 +3,7 @@ package io.toolisticon.kotlin.generation.builder
 import com.squareup.kotlinpoet.AnnotationSpec
 import com.squareup.kotlinpoet.TypeName
 import com.squareup.kotlinpoet.asClassName
+import io.toolisticon.kotlin.generation.Builder
 import io.toolisticon.kotlin.generation.KotlinCodeGeneration.Supressions.CLASS_NAME
 import io.toolisticon.kotlin.generation.KotlinCodeGeneration.parameterBuilder
 import io.toolisticon.kotlin.generation.KotlinCodeGeneration.propertyBuilder
diff --git a/kotlin-code-generation/src/main/kotlin/builder/_builder.kt b/kotlin-code-generation/src/main/kotlin/builder/_builder.kt
index cc1c4e1..3fee175 100644
--- a/kotlin-code-generation/src/main/kotlin/builder/_builder.kt
+++ b/kotlin-code-generation/src/main/kotlin/builder/_builder.kt
@@ -3,13 +3,11 @@ package io.toolisticon.kotlin.generation.builder
 import com.squareup.kotlinpoet.*
 import com.squareup.kotlinpoet.AnnotationSpec.UseSiteTarget
 import com.squareup.kotlinpoet.AnnotationSpec.UseSiteTarget.FILE
+import io.toolisticon.kotlin.generation.Builder
 import io.toolisticon.kotlin.generation.spec.*
 import kotlin.reflect.KClass
 
 
-fun interface Builder<T> {
-  fun build(): T
-}
 
 sealed interface SpecBuilder<SELF : SpecBuilder<SELF, PRODUCT, SPEC, SPEC_BUILDER>, PRODUCT : SpecSupplier<SPEC>, SPEC, SPEC_BUILDER> : Builder<PRODUCT>
 
diff --git a/kotlin-code-generation/src/main/kotlin/builder/poet/_adapter.kt b/kotlin-code-generation/src/main/kotlin/builder/poet/_adapter.kt
deleted file mode 100644
index b53207e..0000000
--- a/kotlin-code-generation/src/main/kotlin/builder/poet/_adapter.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-package io.toolisticon.kotlin.generation.builder.poet
-
-import com.squareup.kotlinpoet.*
-import io.toolisticon.kotlin.generation.builder.Builder
-import java.util.function.Supplier
-import javax.lang.model.element.Element
-import kotlin.reflect.KClass
-
-/**
- * @param S - kotlin poet spec (TypeSpec, FunSpec, ...)
- * @param B - kotlin poet spec specific builder (TypeSpec.Builder, ...)
- */
-sealed interface KotlinPoetBuilderSupplier<S : Any, B : Any> : Builder<S>, Supplier<B>
-
-sealed interface AnnotatableBuilder<SELF : AnnotatableBuilder<SELF, S, B>, S : Annotatable, B : Annotatable.Builder<B>>
-  : KotlinPoetBuilderSupplier<S, B>, Annotatable.Builder<SELF> {
-  override val annotations: MutableList<AnnotationSpec> get() = get().annotations
-
-  fun addAnnotation(builder: AnnotationSpecBuilder): SELF = addAnnotation(builder.build())
-}
-
-@ExperimentalKotlinPoetApi
-sealed interface ContextReceivableBuilder<SELF : ContextReceivableBuilder<SELF, S, B>, S : ContextReceivable, B : ContextReceivable.Builder<B>>
-  : KotlinPoetBuilderSupplier<S, B>, ContextReceivable.Builder<SELF> {
-  override val contextReceiverTypes: MutableList<TypeName> get() = get().contextReceiverTypes
-}
-
-sealed interface DocumentableBuilder<SELF : DocumentableBuilder<SELF, S, B>, S : Documentable, B : Documentable.Builder<B>>
-  : KotlinPoetBuilderSupplier<S, B>, Documentable.Builder<SELF> {
-  override val kdoc: CodeBlock.Builder get() = get().kdoc
-
-  fun addKdoc(builder: CodeBlockBuilder) : SELF = addKdoc(builder.build())
-}
-
-sealed interface MemberSpecHolderBuilder<SELF : MemberSpecHolderBuilder<SELF, S, B>, S : MemberSpecHolder, B : MemberSpecHolder.Builder<B>>
-  : KotlinPoetBuilderSupplier<S, B>, MemberSpecHolder.Builder<SELF> {
-  override fun addProperty(propertySpec: PropertySpec): SELF
-
-  @OptIn(ExperimentalKotlinPoetApi::class)
-  fun addProperty(builder: PropertySpecBuilder): SELF = addProperty(builder.build())
-
-  override fun addFunction(funSpec: FunSpec): SELF
-
-  @OptIn(ExperimentalKotlinPoetApi::class)
-  fun addFunction(builder: FunSpecBuilder): SELF = addFunction(builder.build())
-}
-
-sealed interface OriginatingElementsHolderBuilder<SELF : OriginatingElementsHolderBuilder<SELF, S, B>, S : OriginatingElementsHolder, B : OriginatingElementsHolder.Builder<B>>
-  : KotlinPoetBuilderSupplier<S, B>, OriginatingElementsHolder.Builder<SELF> {
-  override val originatingElements: MutableList<Element> get() = get().originatingElements
-}
-
-sealed interface TaggableBuilder<SELF : TaggableBuilder<SELF, S, B>, S : Taggable, B : Taggable.Builder<B>>
-  : KotlinPoetBuilderSupplier<S, B>, Taggable.Builder<SELF> {
-  override val tags: MutableMap<KClass<*>, Any> get() = get().tags
-}
-
-sealed interface TypeSpecHolderBuilder<SELF : TypeSpecHolderBuilder<SELF, S, B>, S : TypeSpecHolder, B : TypeSpecHolder.Builder<B>>
-  : KotlinPoetBuilderSupplier<S, B>, TypeSpecHolder.Builder<SELF> {
-  override fun addType(typeSpec: TypeSpec): SELF
-
-  @OptIn(ExperimentalKotlinPoetApi::class)
-  fun addType(builder: TypeSpecBuilder): SELF = addType(builder.build())
-}
diff --git a/kotlin-code-generation/src/main/kotlin/poet/AnnotatableBuilder.kt b/kotlin-code-generation/src/main/kotlin/poet/AnnotatableBuilder.kt
new file mode 100644
index 0000000..0f405be
--- /dev/null
+++ b/kotlin-code-generation/src/main/kotlin/poet/AnnotatableBuilder.kt
@@ -0,0 +1,12 @@
+package io.toolisticon.kotlin.generation.poet
+
+import com.squareup.kotlinpoet.Annotatable
+import com.squareup.kotlinpoet.AnnotationSpec
+import io.toolisticon.kotlin.generation.BuilderSupplier
+
+sealed interface AnnotatableBuilder<SELF : AnnotatableBuilder<SELF, S, B>, S : Annotatable, B : Annotatable.Builder<B>>
+  : BuilderSupplier<S, B>, Annotatable.Builder<SELF> {
+  override val annotations: MutableList<AnnotationSpec> get() = get().annotations
+
+  fun addAnnotation(builder: AnnotationSpecBuilder): SELF = addAnnotation(builder.build())
+}
diff --git a/kotlin-code-generation/src/main/kotlin/builder/poet/AnnotationSpecBuilder.kt b/kotlin-code-generation/src/main/kotlin/poet/AnnotationSpecBuilder.kt
similarity index 84%
rename from kotlin-code-generation/src/main/kotlin/builder/poet/AnnotationSpecBuilder.kt
rename to kotlin-code-generation/src/main/kotlin/poet/AnnotationSpecBuilder.kt
index 60f0082..deab669 100644
--- a/kotlin-code-generation/src/main/kotlin/builder/poet/AnnotationSpecBuilder.kt
+++ b/kotlin-code-generation/src/main/kotlin/poet/AnnotationSpecBuilder.kt
@@ -1,11 +1,12 @@
-package io.toolisticon.kotlin.generation.builder.poet
+package io.toolisticon.kotlin.generation.poet
 
 import com.squareup.kotlinpoet.AnnotationSpec
 import com.squareup.kotlinpoet.AnnotationSpec.UseSiteTarget
 import com.squareup.kotlinpoet.CodeBlock
+import io.toolisticon.kotlin.generation.BuilderSupplier
 
 @JvmInline
-value class AnnotationSpecBuilder(val builder: AnnotationSpec.Builder) : KotlinPoetBuilderSupplier<AnnotationSpec, AnnotationSpec.Builder>,
+value class AnnotationSpecBuilder(val builder: AnnotationSpec.Builder) : BuilderSupplier<AnnotationSpec, AnnotationSpec.Builder>,
   TaggableBuilder<AnnotationSpecBuilder, AnnotationSpec, AnnotationSpec.Builder> {
 
   val members: MutableList<CodeBlock> get() = get().members
diff --git a/kotlin-code-generation/src/main/kotlin/builder/poet/CodeBlockBuilder.kt b/kotlin-code-generation/src/main/kotlin/poet/CodeBlockBuilder.kt
similarity index 90%
rename from kotlin-code-generation/src/main/kotlin/builder/poet/CodeBlockBuilder.kt
rename to kotlin-code-generation/src/main/kotlin/poet/CodeBlockBuilder.kt
index f27bcf3..efbfec6 100644
--- a/kotlin-code-generation/src/main/kotlin/builder/poet/CodeBlockBuilder.kt
+++ b/kotlin-code-generation/src/main/kotlin/poet/CodeBlockBuilder.kt
@@ -1,10 +1,11 @@
-package io.toolisticon.kotlin.generation.builder.poet
+package io.toolisticon.kotlin.generation.poet
 
 import com.squareup.kotlinpoet.CodeBlock
 import com.squareup.kotlinpoet.CodeBlock.Builder
+import io.toolisticon.kotlin.generation.BuilderSupplier
 
 @JvmInline
-value class CodeBlockBuilder(private val builder: CodeBlock.Builder) : KotlinPoetBuilderSupplier<CodeBlock, CodeBlock.Builder> {
+value class CodeBlockBuilder(private val builder: CodeBlock.Builder) : BuilderSupplier<CodeBlock, Builder> {
 
   fun isEmpty(): Boolean = builder.isEmpty()
 
diff --git a/kotlin-code-generation/src/main/kotlin/poet/ContextReceivableBuilder.kt b/kotlin-code-generation/src/main/kotlin/poet/ContextReceivableBuilder.kt
new file mode 100644
index 0000000..c442097
--- /dev/null
+++ b/kotlin-code-generation/src/main/kotlin/poet/ContextReceivableBuilder.kt
@@ -0,0 +1,12 @@
+package io.toolisticon.kotlin.generation.poet
+
+import com.squareup.kotlinpoet.ContextReceivable
+import com.squareup.kotlinpoet.ExperimentalKotlinPoetApi
+import com.squareup.kotlinpoet.TypeName
+import io.toolisticon.kotlin.generation.BuilderSupplier
+
+@ExperimentalKotlinPoetApi
+sealed interface ContextReceivableBuilder<SELF : ContextReceivableBuilder<SELF, S, B>, S : ContextReceivable, B : ContextReceivable.Builder<B>>
+  : BuilderSupplier<S, B>, ContextReceivable.Builder<SELF> {
+  override val contextReceiverTypes: MutableList<TypeName> get() = get().contextReceiverTypes
+}
diff --git a/kotlin-code-generation/src/main/kotlin/poet/DocumentableBuilder.kt b/kotlin-code-generation/src/main/kotlin/poet/DocumentableBuilder.kt
new file mode 100644
index 0000000..d0b1cbb
--- /dev/null
+++ b/kotlin-code-generation/src/main/kotlin/poet/DocumentableBuilder.kt
@@ -0,0 +1,12 @@
+package io.toolisticon.kotlin.generation.poet
+
+import com.squareup.kotlinpoet.CodeBlock
+import com.squareup.kotlinpoet.Documentable
+import io.toolisticon.kotlin.generation.BuilderSupplier
+
+sealed interface DocumentableBuilder<SELF : DocumentableBuilder<SELF, S, B>, S : Documentable, B : Documentable.Builder<B>>
+  : BuilderSupplier<S, B>, Documentable.Builder<SELF> {
+  override val kdoc: CodeBlock.Builder get() = get().kdoc
+
+  fun addKdoc(builder: CodeBlockBuilder): SELF = addKdoc(builder.build())
+}
diff --git a/kotlin-code-generation/src/main/kotlin/builder/poet/FileSpecBuilder.kt b/kotlin-code-generation/src/main/kotlin/poet/FileSpecBuilder.kt
similarity index 96%
rename from kotlin-code-generation/src/main/kotlin/builder/poet/FileSpecBuilder.kt
rename to kotlin-code-generation/src/main/kotlin/poet/FileSpecBuilder.kt
index 653e58d..96232ad 100644
--- a/kotlin-code-generation/src/main/kotlin/builder/poet/FileSpecBuilder.kt
+++ b/kotlin-code-generation/src/main/kotlin/poet/FileSpecBuilder.kt
@@ -1,10 +1,11 @@
-package io.toolisticon.kotlin.generation.builder.poet
+package io.toolisticon.kotlin.generation.poet
 
 import com.squareup.kotlinpoet.*
+import io.toolisticon.kotlin.generation.BuilderSupplier
 import kotlin.reflect.KClass
 
 @JvmInline
-value class FileSpecBuilder(private val builder: FileSpec.Builder) : KotlinPoetBuilderSupplier<FileSpec, FileSpec.Builder>,
+value class FileSpecBuilder(private val builder: FileSpec.Builder) : BuilderSupplier<FileSpec, FileSpec.Builder>,
   AnnotatableBuilder<FileSpecBuilder, FileSpec, FileSpec.Builder>,
   MemberSpecHolderBuilder<FileSpecBuilder, FileSpec, FileSpec.Builder>,
   TaggableBuilder<FileSpecBuilder, FileSpec, FileSpec.Builder>,
diff --git a/kotlin-code-generation/src/main/kotlin/builder/poet/FunSpecBuilder.kt b/kotlin-code-generation/src/main/kotlin/poet/FunSpecBuilder.kt
similarity index 97%
rename from kotlin-code-generation/src/main/kotlin/builder/poet/FunSpecBuilder.kt
rename to kotlin-code-generation/src/main/kotlin/poet/FunSpecBuilder.kt
index 5b8f32a..11354fa 100644
--- a/kotlin-code-generation/src/main/kotlin/builder/poet/FunSpecBuilder.kt
+++ b/kotlin-code-generation/src/main/kotlin/poet/FunSpecBuilder.kt
@@ -1,13 +1,14 @@
-package io.toolisticon.kotlin.generation.builder.poet
+package io.toolisticon.kotlin.generation.poet
 
 import com.squareup.kotlinpoet.*
+import io.toolisticon.kotlin.generation.BuilderSupplier
 import java.lang.reflect.Type
 import javax.lang.model.element.Modifier
 import kotlin.reflect.KClass
 
 @ExperimentalKotlinPoetApi
 @JvmInline
-value class FunSpecBuilder(private val builder: FunSpec.Builder) : KotlinPoetBuilderSupplier<FunSpec, FunSpec.Builder>,
+value class FunSpecBuilder(private val builder: FunSpec.Builder) : BuilderSupplier<FunSpec, FunSpec.Builder>,
   AnnotatableBuilder<FunSpecBuilder, FunSpec, FunSpec.Builder>,
   ContextReceivableBuilder<FunSpecBuilder, FunSpec, FunSpec.Builder>,
   DocumentableBuilder<FunSpecBuilder, FunSpec, FunSpec.Builder>,
diff --git a/kotlin-code-generation/src/main/kotlin/poet/MemberSpecHolderBuilder.kt b/kotlin-code-generation/src/main/kotlin/poet/MemberSpecHolderBuilder.kt
new file mode 100644
index 0000000..653f18a
--- /dev/null
+++ b/kotlin-code-generation/src/main/kotlin/poet/MemberSpecHolderBuilder.kt
@@ -0,0 +1,20 @@
+package io.toolisticon.kotlin.generation.poet
+
+import com.squareup.kotlinpoet.ExperimentalKotlinPoetApi
+import com.squareup.kotlinpoet.FunSpec
+import com.squareup.kotlinpoet.MemberSpecHolder
+import com.squareup.kotlinpoet.PropertySpec
+import io.toolisticon.kotlin.generation.BuilderSupplier
+
+sealed interface MemberSpecHolderBuilder<SELF : MemberSpecHolderBuilder<SELF, S, B>, S : MemberSpecHolder, B : MemberSpecHolder.Builder<B>>
+  : BuilderSupplier<S, B>, MemberSpecHolder.Builder<SELF> {
+  override fun addProperty(propertySpec: PropertySpec): SELF
+
+  @OptIn(ExperimentalKotlinPoetApi::class)
+  fun addProperty(builder: PropertySpecBuilder): SELF = addProperty(builder.build())
+
+  override fun addFunction(funSpec: FunSpec): SELF
+
+  @OptIn(ExperimentalKotlinPoetApi::class)
+  fun addFunction(builder: FunSpecBuilder): SELF = addFunction(builder.build())
+}
diff --git a/kotlin-code-generation/src/main/kotlin/poet/OriginatingElementsHolderBuilder.kt b/kotlin-code-generation/src/main/kotlin/poet/OriginatingElementsHolderBuilder.kt
new file mode 100644
index 0000000..e756478
--- /dev/null
+++ b/kotlin-code-generation/src/main/kotlin/poet/OriginatingElementsHolderBuilder.kt
@@ -0,0 +1,10 @@
+package io.toolisticon.kotlin.generation.poet
+
+import com.squareup.kotlinpoet.OriginatingElementsHolder
+import io.toolisticon.kotlin.generation.BuilderSupplier
+import javax.lang.model.element.Element
+
+sealed interface OriginatingElementsHolderBuilder<SELF : OriginatingElementsHolderBuilder<SELF, S, B>, S : OriginatingElementsHolder, B : OriginatingElementsHolder.Builder<B>>
+  : BuilderSupplier<S, B>, OriginatingElementsHolder.Builder<SELF> {
+  override val originatingElements: MutableList<Element> get() = get().originatingElements
+}
diff --git a/kotlin-code-generation/src/main/kotlin/builder/poet/ParameterSpecBuilder.kt b/kotlin-code-generation/src/main/kotlin/poet/ParameterSpecBuilder.kt
similarity index 86%
rename from kotlin-code-generation/src/main/kotlin/builder/poet/ParameterSpecBuilder.kt
rename to kotlin-code-generation/src/main/kotlin/poet/ParameterSpecBuilder.kt
index 7715df3..5698a49 100644
--- a/kotlin-code-generation/src/main/kotlin/builder/poet/ParameterSpecBuilder.kt
+++ b/kotlin-code-generation/src/main/kotlin/poet/ParameterSpecBuilder.kt
@@ -1,11 +1,12 @@
-package io.toolisticon.kotlin.generation.builder.poet
+package io.toolisticon.kotlin.generation.poet
 
 import com.squareup.kotlinpoet.CodeBlock
 import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.ParameterSpec
+import io.toolisticon.kotlin.generation.BuilderSupplier
 
 @JvmInline
-value class ParameterSpecBuilder(private val builder: ParameterSpec.Builder) : KotlinPoetBuilderSupplier<ParameterSpec, ParameterSpec.Builder>,
+value class ParameterSpecBuilder(private val builder: ParameterSpec.Builder) : BuilderSupplier<ParameterSpec, ParameterSpec.Builder>,
   AnnotatableBuilder<ParameterSpecBuilder, ParameterSpec, ParameterSpec.Builder>,
   DocumentableBuilder<ParameterSpecBuilder, ParameterSpec, ParameterSpec.Builder>,
   TaggableBuilder<ParameterSpecBuilder, ParameterSpec, ParameterSpec.Builder> {
diff --git a/kotlin-code-generation/src/main/kotlin/builder/poet/PropertySpecBuilder.kt b/kotlin-code-generation/src/main/kotlin/poet/PropertySpecBuilder.kt
similarity index 77%
rename from kotlin-code-generation/src/main/kotlin/builder/poet/PropertySpecBuilder.kt
rename to kotlin-code-generation/src/main/kotlin/poet/PropertySpecBuilder.kt
index 17386d7..0ec0d07 100644
--- a/kotlin-code-generation/src/main/kotlin/builder/poet/PropertySpecBuilder.kt
+++ b/kotlin-code-generation/src/main/kotlin/poet/PropertySpecBuilder.kt
@@ -1,16 +1,17 @@
-package io.toolisticon.kotlin.generation.builder.poet
+package io.toolisticon.kotlin.generation.poet
 
 import com.squareup.kotlinpoet.*
+import io.toolisticon.kotlin.generation.BuilderSupplier
 import kotlin.reflect.KClass
 
 @ExperimentalKotlinPoetApi
 @JvmInline
-value class PropertySpecBuilder(private val builder: PropertySpec.Builder) : KotlinPoetBuilderSupplier<PropertySpec, PropertySpec.Builder>,
-  AnnotatableBuilder<PropertySpecBuilder,PropertySpec,PropertySpec.Builder>,
-  ContextReceivableBuilder<PropertySpecBuilder,PropertySpec,PropertySpec.Builder>,
-  DocumentableBuilder<PropertySpecBuilder,PropertySpec,PropertySpec.Builder>,
-  TaggableBuilder<PropertySpecBuilder,PropertySpec,PropertySpec.Builder>,
-  OriginatingElementsHolderBuilder<PropertySpecBuilder,PropertySpec,PropertySpec.Builder> {
+value class PropertySpecBuilder(private val builder: PropertySpec.Builder) : BuilderSupplier<PropertySpec, PropertySpec.Builder>,
+  AnnotatableBuilder<PropertySpecBuilder, PropertySpec, PropertySpec.Builder>,
+  ContextReceivableBuilder<PropertySpecBuilder, PropertySpec, PropertySpec.Builder>,
+  DocumentableBuilder<PropertySpecBuilder, PropertySpec, PropertySpec.Builder>,
+  TaggableBuilder<PropertySpecBuilder, PropertySpec, PropertySpec.Builder>,
+  OriginatingElementsHolderBuilder<PropertySpecBuilder, PropertySpec, PropertySpec.Builder> {
 
   val modifiers: MutableList<KModifier> get() = builder.modifiers
   val typeVariables: MutableList<TypeVariableName> get() = builder.typeVariables
diff --git a/kotlin-code-generation/src/main/kotlin/poet/TaggableBuilder.kt b/kotlin-code-generation/src/main/kotlin/poet/TaggableBuilder.kt
new file mode 100644
index 0000000..354245e
--- /dev/null
+++ b/kotlin-code-generation/src/main/kotlin/poet/TaggableBuilder.kt
@@ -0,0 +1,10 @@
+package io.toolisticon.kotlin.generation.poet
+
+import com.squareup.kotlinpoet.Taggable
+import io.toolisticon.kotlin.generation.BuilderSupplier
+import kotlin.reflect.KClass
+
+sealed interface TaggableBuilder<SELF : TaggableBuilder<SELF, S, B>, S : Taggable, B : Taggable.Builder<B>>
+  : BuilderSupplier<S, B>, Taggable.Builder<SELF> {
+  override val tags: MutableMap<KClass<*>, Any> get() = get().tags
+}
diff --git a/kotlin-code-generation/src/main/kotlin/builder/poet/TypeAliasSpecBuilder.kt b/kotlin-code-generation/src/main/kotlin/poet/TypeAliasSpecBuilder.kt
similarity index 87%
rename from kotlin-code-generation/src/main/kotlin/builder/poet/TypeAliasSpecBuilder.kt
rename to kotlin-code-generation/src/main/kotlin/poet/TypeAliasSpecBuilder.kt
index e57612c..496dd42 100644
--- a/kotlin-code-generation/src/main/kotlin/builder/poet/TypeAliasSpecBuilder.kt
+++ b/kotlin-code-generation/src/main/kotlin/poet/TypeAliasSpecBuilder.kt
@@ -1,11 +1,12 @@
-package io.toolisticon.kotlin.generation.builder.poet
+package io.toolisticon.kotlin.generation.poet
 
 import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.TypeAliasSpec
 import com.squareup.kotlinpoet.TypeVariableName
+import io.toolisticon.kotlin.generation.BuilderSupplier
 
 @JvmInline
-value class TypeAliasSpecBuilder(private val builder: TypeAliasSpec.Builder) : KotlinPoetBuilderSupplier<TypeAliasSpec, TypeAliasSpec.Builder>,
+value class TypeAliasSpecBuilder(private val builder: TypeAliasSpec.Builder) : BuilderSupplier<TypeAliasSpec, TypeAliasSpec.Builder>,
   AnnotatableBuilder<TypeAliasSpecBuilder, TypeAliasSpec, TypeAliasSpec.Builder>,
   DocumentableBuilder<TypeAliasSpecBuilder, TypeAliasSpec, TypeAliasSpec.Builder>,
   TaggableBuilder<TypeAliasSpecBuilder, TypeAliasSpec, TypeAliasSpec.Builder> {
diff --git a/kotlin-code-generation/src/main/kotlin/builder/poet/TypeSpecBuilder.kt b/kotlin-code-generation/src/main/kotlin/poet/TypeSpecBuilder.kt
similarity index 91%
rename from kotlin-code-generation/src/main/kotlin/builder/poet/TypeSpecBuilder.kt
rename to kotlin-code-generation/src/main/kotlin/poet/TypeSpecBuilder.kt
index 01044aa..0830e09 100644
--- a/kotlin-code-generation/src/main/kotlin/builder/poet/TypeSpecBuilder.kt
+++ b/kotlin-code-generation/src/main/kotlin/poet/TypeSpecBuilder.kt
@@ -1,10 +1,11 @@
-package io.toolisticon.kotlin.generation.builder.poet
+package io.toolisticon.kotlin.generation.poet
 
 import com.squareup.kotlinpoet.*
+import io.toolisticon.kotlin.generation.BuilderSupplier
 
 @JvmInline
 @ExperimentalKotlinPoetApi
-value class TypeSpecBuilder(private val builder: TypeSpec.Builder) : KotlinPoetBuilderSupplier<TypeSpec, TypeSpec.Builder>,
+value class TypeSpecBuilder(private val builder: TypeSpec.Builder) : BuilderSupplier<TypeSpec, TypeSpec.Builder>,
   AnnotatableBuilder<TypeSpecBuilder, TypeSpec, TypeSpec.Builder>,
   ContextReceivableBuilder<TypeSpecBuilder, TypeSpec, TypeSpec.Builder>,
   DocumentableBuilder<TypeSpecBuilder, TypeSpec, TypeSpec.Builder>,
diff --git a/kotlin-code-generation/src/main/kotlin/poet/TypeSpecHolderBuilder.kt b/kotlin-code-generation/src/main/kotlin/poet/TypeSpecHolderBuilder.kt
new file mode 100644
index 0000000..91dd897
--- /dev/null
+++ b/kotlin-code-generation/src/main/kotlin/poet/TypeSpecHolderBuilder.kt
@@ -0,0 +1,12 @@
+package io.toolisticon.kotlin.generation.poet
+
+import com.squareup.kotlinpoet.*
+import io.toolisticon.kotlin.generation.BuilderSupplier
+
+sealed interface TypeSpecHolderBuilder<SELF : TypeSpecHolderBuilder<SELF, S, B>, S : TypeSpecHolder, B : TypeSpecHolder.Builder<B>>
+  : BuilderSupplier<S, B>, TypeSpecHolder.Builder<SELF> {
+  override fun addType(typeSpec: TypeSpec): SELF
+
+  @OptIn(ExperimentalKotlinPoetApi::class)
+  fun addType(builder: TypeSpecBuilder): SELF = addType(builder.build())
+}
diff --git a/kotlin-code-generation/src/test/kotlin/builder/poet/AnnotationSpecBuilderTest.kt b/kotlin-code-generation/src/test/kotlin/poet/AnnotationSpecBuilderTest.kt
similarity index 68%
rename from kotlin-code-generation/src/test/kotlin/builder/poet/AnnotationSpecBuilderTest.kt
rename to kotlin-code-generation/src/test/kotlin/poet/AnnotationSpecBuilderTest.kt
index 290f702..c4f7a03 100644
--- a/kotlin-code-generation/src/test/kotlin/builder/poet/AnnotationSpecBuilderTest.kt
+++ b/kotlin-code-generation/src/test/kotlin/poet/AnnotationSpecBuilderTest.kt
@@ -1,6 +1,7 @@
-package io.toolisticon.kotlin.generation.builder.poet
+package io.toolisticon.kotlin.generation.poet
 
 import com.squareup.kotlinpoet.AnnotationSpec
+import io.toolisticon.kotlin.generation.poet.AnnotationSpecBuilder
 import org.junit.jupiter.api.Test
 
 internal class AnnotationSpecBuilderTest {
diff --git a/kotlin-code-generation/src/test/kotlin/builder/poet/TypeSpecBuilderTest.kt b/kotlin-code-generation/src/test/kotlin/poet/TypeSpecBuilderTest.kt
similarity index 90%
rename from kotlin-code-generation/src/test/kotlin/builder/poet/TypeSpecBuilderTest.kt
rename to kotlin-code-generation/src/test/kotlin/poet/TypeSpecBuilderTest.kt
index 17e6fa3..b599f42 100644
--- a/kotlin-code-generation/src/test/kotlin/builder/poet/TypeSpecBuilderTest.kt
+++ b/kotlin-code-generation/src/test/kotlin/poet/TypeSpecBuilderTest.kt
@@ -1,4 +1,4 @@
-package io.toolisticon.kotlin.generation.builder.poet
+package io.toolisticon.kotlin.generation.poet
 
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.ExperimentalKotlinPoetApi