diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 0000000..51c08d3
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,86 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## プロジェクト概要
+
+RenlinはHTML UIを型安全なDSLアプローチで構築するためのKotlinマルチプラットフォームライブラリです。主にJavaScript/ブラウザターゲット向けのWeb開発用に設計されていますが、JVMもサポートしています。HakateステートマネジメントシステムとCSS-in-JS機能を統合しています。
+
+## 主要アーキテクチャ
+
+### モジュール構造
+- **renlin/**: マルチプラットフォームソースセット（commonMain、jsMain、jvmMain）を持つメインライブラリモジュール
+- **sample/**: ライブラリの使用パターンを示すサンプル実装
+- **generate/**: HTML タグDSL作成用のコード生成ツール
+- **convention-plugins/**: 一貫したビルド設定のためのGradle規約プラグイン
+
+### 主要概念
+- **コンポーネントシステム**: レンダー関数を持つ`Component<TAG>`インターフェースを使用した型安全なコンポーネント
+- **DSLアーキテクチャ**: `@Html`マーカーアノテーションと型安全なコンテンツカテゴリを使用したHTML DSL構築
+- **ステート管理**: `StateDispatcher`を介したリアクティブステートハンドリングのためのHakateライブラリとの統合
+- **CSS管理**: 自動クラス生成と疑似クラスサポートを持つプラットフォーム固有のCSSマネージャー
+- **コンテンツカテゴリ**: W3C準拠のコンテンツモデル強制（FlowContent、PhrasingContentなど）
+
+### プラットフォームターゲット
+- **JavaScript**: DOM操作によるブラウザベースレンダリング
+- **JVM**: サーバーサイドHTML生成機能
+
+## 開発コマンド
+
+### ビルド
+```bash
+./gradlew build                    # 全モジュールをビルド
+./gradlew :renlin:build           # メインライブラリのみをビルド
+./gradlew :sample:build           # サンプルアプリケーションをビルド
+```
+
+### テスト
+```bash
+./gradlew test                    # 全テストを実行
+./gradlew :renlin:test           # メインライブラリをテスト
+./gradlew :renlin:jsTest         # JS固有のテストを実行
+./gradlew :renlin:jvmTest        # JVM固有のテストを実行
+```
+
+### サンプル開発
+```bash
+./gradlew :sample:jsBrowserRun   # ブラウザでサンプルを実行（開発用）
+./gradlew :sample:jsBrowserDevelopmentExecutableDistribution  # サンプル配布版をビルド
+```
+
+### コード生成
+```bash
+./gradlew :generate:run          # HTML タグDSLコードを生成
+```
+
+### パブリッシング
+```bash
+./gradlew publishToMavenLocal    # ローカルMavenリポジトリに公開
+./gradlew publish               # 設定されたリポジトリに公開
+```
+
+## 主要実装パターン
+
+### コンポーネント作成
+コンポーネントは`Component<TAG>`を継承し、`.component {}`DSLビルダーパターンを使用します。ステート統合は`StateDispatcher`を通じて行われ、`useValue()`によるリアクティブレンダリングが可能です。
+
+### エントリーポイントパターン
+JSアプリケーションは`Entrypoint(domElement).render(component, dispatcher)`を使用してコンポーネントをDOM要素にマウントします。
+
+### CSS統合
+自動クラス生成のために`cssManager`プロパティを使用してスタイリングを行います。CSSプロパティは型安全で疑似クラスをサポートしています。
+
+### コンテンツ型安全性
+DSLはW3Cコンテンツカテゴリをコンパイル時に強制します - FlowContentはPhrasingContentを含むことができますが、その逆はできません。
+
+## 理解するための重要ファイル
+
+- `renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Component.kt` - コアコンポーネントインターフェース
+- `renlin/src/commonMain/kotlin/net/kigawa/renlin/dsl/Dsl.kt` - DSL基盤
+- `renlin/src/commonMain/kotlin/net/kigawa/renlin/css/CssManager.kt` - CSS管理システム
+- `renlin/src/jsMain/kotlin/net/kigawa/renlin/Entrypoint.kt` - ブラウザエントリーポイント
+- `sample/src/jsMain/kotlin/net/kigawa/renlin/sample/Main.kt` - 使用例
+
+## ステート管理統合
+
+ライブラリはステート管理にHakateが必要です。コンポーネントは`MutableState<T>`を通じてリアクティブステートにアクセスし、`useValue()`を介して再レンダリングをトリガーします。ステートの変更は自動的にコンポーネントツリー全体に伝播されます。
\ No newline at end of file
diff --git a/generate/src/jvmMain/kotlin/generator/TagGenerator.kt b/generate/src/jvmMain/kotlin/generator/TagGenerator.kt
index 24295df..459b718 100644
--- a/generate/src/jvmMain/kotlin/generator/TagGenerator.kt
+++ b/generate/src/jvmMain/kotlin/generator/TagGenerator.kt
@@ -30,7 +30,7 @@ class TagGenerator(
             }
             import net.kigawa.renlin.dsl.DslBase
             import net.kigawa.renlin.dsl.StatedDsl
-            import net.kigawa.renlin.tag.component.TagComponent1
+            import net.kigawa.renlin.component.TagComponent1
             import net.kigawa.renlin.w3c.element.TagNode
             import net.kigawa.renlin.state.DslState
             ${
@@ -56,7 +56,7 @@ class TagGenerator(
                 }
             }
 
-            val ${tagInfo.escapement} = TagComponent1<${tagInfo.className}, ${tagInfo.className}Dsl>(${tagInfo.className}, ::${tagInfo.className}Dsl)
+            val ${tagInfo.escapement} = TagComponent1(${tagInfo.className}, ::${tagInfo.className}Dsl)
 
             object ${tagInfo.className} : Tag<${tagInfo.tagCategories.connectedStr("Union")}> {
                 override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Component.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Component.kt
new file mode 100644
index 0000000..ad0e314
--- /dev/null
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Component.kt
@@ -0,0 +1,8 @@
+package net.kigawa.renlin.component
+
+import net.kigawa.renlin.Html
+import net.kigawa.renlin.tag.Tag
+
+@Html
+interface Component<out TAG: Tag<*>> {
+}
\ No newline at end of file
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Component0.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Component0.kt
new file mode 100644
index 0000000..0a03c5b
--- /dev/null
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Component0.kt
@@ -0,0 +1,10 @@
+package net.kigawa.renlin.component
+
+import net.kigawa.renlin.dsl.StatedDsl
+import net.kigawa.renlin.tag.Tag
+import net.kigawa.renlin.w3c.category.ContentCategory
+
+interface Component0<out TAG: Tag<in CONTENT_CATEGORY>, CONTENT_CATEGORY: ContentCategory>: Component<TAG> {
+  fun render(parentDsl: StatedDsl<out CONTENT_CATEGORY>, key: String?)
+
+}
\ No newline at end of file
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Component1.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Component1.kt
new file mode 100644
index 0000000..3c31089
--- /dev/null
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Component1.kt
@@ -0,0 +1,9 @@
+package net.kigawa.renlin.component
+
+import net.kigawa.renlin.dsl.StatedDsl
+import net.kigawa.renlin.tag.Tag
+import net.kigawa.renlin.w3c.category.ContentCategory
+
+interface Component1<out TAG: Tag<in CONTENT_CATEGORY>, CONTENT_CATEGORY: ContentCategory, ARG1>: Component<TAG> {
+  fun render(parentDsl: StatedDsl<out CONTENT_CATEGORY>, arg1: ARG1, key: String?)
+}
\ No newline at end of file
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Component2.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Component2.kt
new file mode 100644
index 0000000..7f994ae
--- /dev/null
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Component2.kt
@@ -0,0 +1,9 @@
+package net.kigawa.renlin.component
+
+import net.kigawa.renlin.dsl.StatedDsl
+import net.kigawa.renlin.tag.Tag
+import net.kigawa.renlin.w3c.category.ContentCategory
+
+interface Component2<out TAG: Tag<in CONTENT_CATEGORY>, CONTENT_CATEGORY: ContentCategory, ARG1, ARG2>: Component<TAG> {
+  fun render(parentDsl: StatedDsl<out CONTENT_CATEGORY>, arg1: ARG1, arg2: ARG2, key: String?)
+}
\ No newline at end of file
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Component3.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Component3.kt
new file mode 100644
index 0000000..2c722c5
--- /dev/null
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Component3.kt
@@ -0,0 +1,9 @@
+package net.kigawa.renlin.component
+
+import net.kigawa.renlin.dsl.StatedDsl
+import net.kigawa.renlin.tag.Tag
+import net.kigawa.renlin.w3c.category.ContentCategory
+
+interface Component3<out TAG: Tag<in CONTENT_CATEGORY>, CONTENT_CATEGORY: ContentCategory, ARG1, ARG2, ARG3>: Component<TAG> {
+  fun render(parentDsl: StatedDsl<out CONTENT_CATEGORY>, arg1: ARG1, arg2: ARG2, arg3: ARG3, key: String?)
+}
\ No newline at end of file
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Component4.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Component4.kt
new file mode 100644
index 0000000..1b5a620
--- /dev/null
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Component4.kt
@@ -0,0 +1,9 @@
+package net.kigawa.renlin.component
+
+import net.kigawa.renlin.dsl.StatedDsl
+import net.kigawa.renlin.tag.Tag
+import net.kigawa.renlin.w3c.category.ContentCategory
+
+interface Component4<out TAG: Tag<in CONTENT_CATEGORY>, CONTENT_CATEGORY: ContentCategory, ARG1, ARG2, ARG3, ARG4>: Component<TAG> {
+  fun render(parentDsl: StatedDsl<out CONTENT_CATEGORY>, arg1: ARG1, arg2: ARG2, arg3: ARG3, arg4: ARG4, key: String?)
+}
\ No newline at end of file
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Func.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Func.kt
new file mode 100644
index 0000000..61a960f
--- /dev/null
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Func.kt
@@ -0,0 +1,163 @@
+package net.kigawa.renlin.component
+
+import net.kigawa.renlin.dsl.DslBase
+import net.kigawa.renlin.dsl.RegisteredDslData
+import net.kigawa.renlin.dsl.StatedDsl
+import net.kigawa.renlin.tag.Tag
+import net.kigawa.renlin.w3c.category.ContentCategory
+import net.kigawa.renlin.w3c.element.TagNode
+import kotlin.reflect.KClass
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
+
+fun <CONTENT_CATEGORY: ContentCategory> KClass<CONTENT_CATEGORY>.component(
+  block: StatedDsl<CONTENT_CATEGORY>.() -> Unit,
+) = net.kigawa.renlin.component.component(block)
+
+fun <CONTENT_CATEGORY: ContentCategory, TAG: Tag<CONTENT_CATEGORY>> Component<TAG>.component(
+  block: StatedDsl<CONTENT_CATEGORY>.() -> Unit,
+) = net.kigawa.renlin.component.component(block)
+
+fun <CONTENT_CATEGORY: ContentCategory> component(
+  block: StatedDsl<CONTENT_CATEGORY>.() -> Unit,
+): Component0<Tag<in CONTENT_CATEGORY>, in CONTENT_CATEGORY> {
+  println("component start $block")
+  return object: Component0<Tag<CONTENT_CATEGORY>, CONTENT_CATEGORY> {
+    override fun render(
+      parentDsl: StatedDsl<out
+      CONTENT_CATEGORY>,
+      key: String?,
+    ) {
+      println("component")
+      @OptIn(ExperimentalUuidApi::class)
+      val nonNullKey = key ?: Uuid.random().toString()
+      val state = parentDsl.dslState.getOrCreateSubDslState(nonNullKey, this)
+      // Create a concrete implementation of DslBase instead of using delegation
+      val newDsl = object: DslBase<CONTENT_CATEGORY>(state) {
+        override fun applyElement(element: TagNode): () -> Unit {
+          return parentDsl.applyElement(element)
+        }
+      }
+      println("component newDsl")
+      newDsl.block()
+      println("component end")
+      parentDsl.registerSubDsl(
+        RegisteredDslData(
+          newDsl,
+          this,
+          { render(parentDsl, key) },
+          nonNullKey
+        )
+      )
+    }
+  }
+}
+
+
+fun <CONTENT_CATEGORY: ContentCategory, ARG1> component(
+  block: StatedDsl<CONTENT_CATEGORY>.(ARG1) -> Unit,
+): Component1<Tag<CONTENT_CATEGORY>, CONTENT_CATEGORY, ARG1> {
+  return object: Component1<Tag<CONTENT_CATEGORY>, CONTENT_CATEGORY, ARG1> {
+    override fun render(parentDsl: StatedDsl<out CONTENT_CATEGORY>, arg1: ARG1, key: String?) {
+      @OptIn(ExperimentalUuidApi::class)
+      val nonNullKey = key ?: Uuid.random().toString()
+      val state = parentDsl.dslState.getOrCreateSubDslState(nonNullKey, this)
+      // Create a concrete implementation of DslBase instead of using delegation
+      val newDsl = object: DslBase<CONTENT_CATEGORY>(state) {
+        override fun applyElement(element: TagNode): () -> Unit {
+          return parentDsl.applyElement(element)
+        }
+      }
+      newDsl.block(arg1)
+      parentDsl.registerSubDsl(
+        RegisteredDslData(
+          newDsl,
+          this,
+          { render(parentDsl, arg1, key) },
+          nonNullKey
+        )
+      )
+    }
+  }
+}
+
+fun <CONTENT_CATEGORY: ContentCategory, ARG1, ARG2> component(
+  block: StatedDsl<CONTENT_CATEGORY>.(ARG1, ARG2) -> Unit,
+): Component2<Tag<CONTENT_CATEGORY>, CONTENT_CATEGORY, ARG1, ARG2> {
+  return object: Component2<Tag<CONTENT_CATEGORY>, CONTENT_CATEGORY, ARG1, ARG2> {
+    override fun render(parentDsl: StatedDsl<out CONTENT_CATEGORY>, arg1: ARG1, arg2: ARG2, key: String?) {
+      @OptIn(ExperimentalUuidApi::class)
+      val nonNullKey = key ?: Uuid.random().toString()
+      val state = parentDsl.dslState.getOrCreateSubDslState(nonNullKey, this)
+      // Create a concrete implementation of DslBase instead of using delegation
+      val newDsl = object: DslBase<CONTENT_CATEGORY>(state) {
+        override fun applyElement(element: TagNode): () -> Unit {
+          return parentDsl.applyElement(element)
+        }
+      }
+      newDsl.block(arg1, arg2)
+      parentDsl.registerSubDsl(
+        RegisteredDslData(
+          newDsl,
+          this,
+          { render(parentDsl, arg1, arg2, key) },
+          nonNullKey
+        )
+      )
+    }
+  }
+}
+
+fun <CONTENT_CATEGORY: ContentCategory, ARG1, ARG2, ARG3> component(
+  block: StatedDsl<CONTENT_CATEGORY>.(ARG1, ARG2, ARG3) -> Unit,
+): Component3<Tag<CONTENT_CATEGORY>, CONTENT_CATEGORY, ARG1, ARG2, ARG3> {
+  return object: Component3<Tag<CONTENT_CATEGORY>, CONTENT_CATEGORY, ARG1, ARG2, ARG3> {
+    override fun render(parentDsl: StatedDsl<out CONTENT_CATEGORY>, arg1: ARG1, arg2: ARG2, arg3: ARG3, key: String?) {
+      @OptIn(ExperimentalUuidApi::class)
+      val nonNullKey = key ?: Uuid.random().toString()
+      val state = parentDsl.dslState.getOrCreateSubDslState(nonNullKey, this)
+      // Create a concrete implementation of DslBase instead of using delegation
+      val newDsl = object: DslBase<CONTENT_CATEGORY>(state) {
+        override fun applyElement(element: TagNode): () -> Unit {
+          return parentDsl.applyElement(element)
+        }
+      }
+      newDsl.block(arg1, arg2, arg3)
+      parentDsl.registerSubDsl(
+        RegisteredDslData(
+          newDsl,
+          this,
+          { render(parentDsl, arg1, arg2, arg3, key) },
+          nonNullKey
+        )
+      )
+    }
+  }
+}
+
+fun <CONTENT_CATEGORY: ContentCategory, ARG1, ARG2, ARG3, ARG4> component(
+  block: StatedDsl<CONTENT_CATEGORY>.(ARG1, ARG2, ARG3, ARG4) -> Unit,
+): Component4<Tag<CONTENT_CATEGORY>, CONTENT_CATEGORY, ARG1, ARG2, ARG3, ARG4> {
+  return object: Component4<Tag<CONTENT_CATEGORY>, CONTENT_CATEGORY, ARG1, ARG2, ARG3, ARG4> {
+    override fun render(parentDsl: StatedDsl<out CONTENT_CATEGORY>, arg1: ARG1, arg2: ARG2, arg3: ARG3, arg4: ARG4, key: String?) {
+      @OptIn(ExperimentalUuidApi::class)
+      val nonNullKey = key ?: Uuid.random().toString()
+      val state = parentDsl.dslState.getOrCreateSubDslState(nonNullKey, this)
+      // Create a concrete implementation of DslBase instead of using delegation
+      val newDsl = object: DslBase<CONTENT_CATEGORY>(state) {
+        override fun applyElement(element: TagNode): () -> Unit {
+          return parentDsl.applyElement(element)
+        }
+      }
+      newDsl.block(arg1, arg2, arg3, arg4)
+      parentDsl.registerSubDsl(
+        RegisteredDslData(
+          newDsl,
+          this,
+          { render(parentDsl, arg1, arg2, arg3, arg4, key) },
+          nonNullKey
+        )
+      )
+    }
+  }
+}
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/StructuredComponent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/StructuredComponent.kt
new file mode 100644
index 0000000..75df720
--- /dev/null
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/StructuredComponent.kt
@@ -0,0 +1,32 @@
+package net.kigawa.renlin.component
+
+import net.kigawa.renlin.dsl.RegisteredDslData
+import net.kigawa.renlin.dsl.StatedDsl
+import net.kigawa.renlin.state.DslState
+import net.kigawa.renlin.tag.Tag
+import net.kigawa.renlin.w3c.category.ContentCategory
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
+
+interface StructuredComponent<
+    TAG: Tag<CONTENT_CATEGORY>, CONTENT_CATEGORY: ContentCategory,
+    DSL: StatedDsl<*>,
+    >: Component1<TAG, CONTENT_CATEGORY, DSL.() -> Unit> {
+  fun newDsl(dslState: DslState): DSL
+  @OptIn(ExperimentalUuidApi::class)
+  override fun render(parentDsl: StatedDsl<out CONTENT_CATEGORY>, arg1: DSL.() -> Unit, key: String?) {
+    println("render start $arg1")
+    val nonNullKey = key ?: Uuid.random().toString()
+    val dslState = parentDsl.dslState.getOrCreateSubDslState(nonNullKey, this)
+    val dsl = newDsl(dslState)
+    dsl.arg1()
+    parentDsl.registerSubDsl(
+      RegisteredDslData(
+        dsl,
+        this,
+        { render(parentDsl, arg1, key) },
+        nonNullKey
+      )
+    )
+  }
+}
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/TagComponent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/TagComponent.kt
new file mode 100644
index 0000000..8242a10
--- /dev/null
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/TagComponent.kt
@@ -0,0 +1,7 @@
+package net.kigawa.renlin.component
+
+import net.kigawa.renlin.tag.Tag
+
+interface TagComponent<TAG : Tag<*>> : Component<TAG> {
+    val tag: TAG
+}
\ No newline at end of file
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/TagComponent1.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/TagComponent1.kt
new file mode 100644
index 0000000..877e7ad
--- /dev/null
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/TagComponent1.kt
@@ -0,0 +1,16 @@
+package net.kigawa.renlin.component
+
+import net.kigawa.renlin.dsl.StatedDsl
+import net.kigawa.renlin.state.DslState
+import net.kigawa.renlin.tag.Tag
+import net.kigawa.renlin.w3c.category.ContentCategory
+
+class TagComponent1<TAG: Tag<CONTENT_CATEGORY>, CONTENT_CATEGORY: ContentCategory, DSL: StatedDsl<*>>(
+  override val tag: TAG,
+  private val newDslFunc: (DslState) -> DSL,
+): TagComponent<TAG>, StructuredComponent<TAG, CONTENT_CATEGORY, DSL> {
+  override fun newDsl(dslState: DslState): DSL {
+    return newDslFunc(dslState)
+  }
+
+}
\ No newline at end of file
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/dsl/RegisteredDslData.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/dsl/RegisteredDslData.kt
index 8400b4b..264a7a8 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/dsl/RegisteredDslData.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/dsl/RegisteredDslData.kt
@@ -1,6 +1,6 @@
 package net.kigawa.renlin.dsl
 
-import net.kigawa.renlin.tag.component.Component
+import net.kigawa.renlin.component.Component
 
 /**
  * `RegisteredDslData` は、DSLの登録情報を保持するデータクラスです。
@@ -20,7 +20,7 @@ data class RegisteredDslData(
     /**
      * DSLに関連付けられたコンポーネント
      */
-    val component: Component,
+    val component: Component<*>,
 
     /**
      * DSLを再読み込みするための関数
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/dsl/StatedDsl.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/dsl/StatedDsl.kt
index bfd56d4..0b881f0 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/dsl/StatedDsl.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/dsl/StatedDsl.kt
@@ -1,11 +1,15 @@
 package net.kigawa.renlin.dsl
 
 import net.kigawa.hakate.api.state.State
+import net.kigawa.renlin.component.Component0
+import net.kigawa.renlin.component.Component1
+import net.kigawa.renlin.component.Component2
+import net.kigawa.renlin.component.Component3
+import net.kigawa.renlin.component.Component4
+import net.kigawa.renlin.component.StructuredComponent
 import net.kigawa.renlin.state.DslState
-import net.kigawa.renlin.state.DslStateData
 import net.kigawa.renlin.tag.Fragment
 import net.kigawa.renlin.tag.Tag
-import net.kigawa.renlin.tag.component.Component1
 import net.kigawa.renlin.w3c.category.ContentCategory
 import net.kigawa.renlin.w3c.element.TagNode
 
@@ -26,60 +30,113 @@ import net.kigawa.renlin.w3c.element.TagNode
  *
  * @param CONTENT_CATEGORY このDSLが生成できるHTMLコンテンツのカテゴリ
  */
-interface StatedDsl<CONTENT_CATEGORY : ContentCategory> : Dsl {
-    /**
-     * 現在のDSLに関連付けられた状態。
-     * この状態はDSLの動作と描画を制御します。
-     */
-    val dslState: DslState
+interface StatedDsl<CONTENT_CATEGORY: ContentCategory>: Dsl {
+  /**
+   * 現在のDSLに関連付けられた状態。
+   * この状態はDSLの動作と描画を制御します。
+   */
+  val dslState: DslState
 
-    /**
-     * サブDSLを現在のDSLに登録します。
-     *
-     * @param registeredDslData 登録するDSLのデータ
-     */
-    fun registerSubDsl(registeredDslData: RegisteredDslData)
+  /**
+   * サブDSLを現在のDSLに登録します。
+   *
+   * @param registeredDslData 登録するDSLのデータ
+   */
+  fun registerSubDsl(registeredDslData: RegisteredDslData)
 
-    /**
-     * 指定された状態をDSLにマウントします。
-     * これにより、DSLの状態が更新され、関連するサブDSLも更新されます。
-     *
-     * @param state マウントする状態
-     * @param registeredDslData 関連するDSLデータ
-     */
-    fun applyToDslState(state: DslState, registeredDslData: RegisteredDslData)
+  /**
+   * 指定された状態をDSLにマウントします。
+   * これにより、DSLの状態が更新され、関連するサブDSLも更新されます。
+   *
+   * @param state マウントする状態
+   * @param registeredDslData 関連するDSLデータ
+   */
+  fun applyToDslState(state: DslState, registeredDslData: RegisteredDslData)
 
-    /**
-     * 指定された要素をDSLに適用します。
-     *
-     * @param element 適用するHTML要素
-     * @return 要素の適用を取り消すための関数
-     */
-    fun applyElement(element: TagNode): () -> Unit
+  /**
+   * 指定された要素をDSLに適用します。
+   *
+   * @param element 適用するHTML要素
+   * @return 要素の適用を取り消すための関数
+   */
+  fun applyElement(element: TagNode): () -> Unit
 
 
-    /**
-     * コンポーネントを呼び出し、レンダリングするための演算子オーバーロード。
-     *
-     * @param key コンポーネントの一意のキー（オプション）
-     * @param block コンポーネントの内容を定義するブロック
-     * @return コンポーネントのレンダリング結果
-     */
-    operator fun <TAG : Tag<in CONTENT_CATEGORY>, DSL : Dsl> Component1<TAG, DSL>.invoke(
-        key: String? = null, block: DSL.() -> Unit,
-    ) = this.render(this@StatedDsl, block, key)
+  operator fun <TAG: Tag<in CONTENT_CATEGORY>> Component0<TAG, in CONTENT_CATEGORY>.invoke(
+    key: String? = null,
+  ) = this.render(this@StatedDsl, key)
 
-    /**
-     * フラグメントコンポーネント。
-     * これは、複数の要素をグループ化するためのコンテナとして機能します。
-     */
-    val fragment: Component1<Tag<CONTENT_CATEGORY>, out StatedDsl<CONTENT_CATEGORY>>
-        get() = Fragment.create<CONTENT_CATEGORY>()
+  /**
+   * コンポーネントを呼び出し、レンダリングするための演算子オーバーロード。
+   *
+   * @param key コンポーネントの一意のキー（オプション）
+   * @param block コンポーネントの内容を定義するブロック
+   * @return コンポーネントのレンダリング結果
+   */
+  operator fun <TAG: Tag<in CONTENT_CATEGORY>, DSL> Component1<TAG, in CONTENT_CATEGORY, DSL>.invoke(
+    key: String? = null, block: DSL,
+  ) {
+    println("invoke")
+    return this@invoke.render(this@StatedDsl, block, key)
+  }
 
-    /**
-     * 状態の現在の値を取得し、この状態をDSLの状態セットに追加します。
-     *
-     * @return 状態の現在の値
-     */
-    fun <T> State<T>.useValue(): T
+  /**
+   * Component2を呼び出し、レンダリングするための演算子オーバーロード。
+   *
+   * @param key コンポーネントの一意のキー（オプション）
+   * @param arg1 第1引数
+   * @param arg2 第2引数
+   * @return コンポーネントのレンダリング結果
+   */
+  operator fun <TAG: Tag<in CONTENT_CATEGORY>, ARG1, ARG2> Component2<TAG, in CONTENT_CATEGORY, ARG1, ARG2>.invoke(
+    arg1: ARG1, arg2: ARG2, key: String? = null,
+  ) {
+    return this@invoke.render(this@StatedDsl, arg1, arg2, key)
+  }
+
+  /**
+   * Component3を呼び出し、レンダリングするための演算子オーバーロード。
+   *
+   * @param key コンポーネントの一意のキー（オプション）
+   * @param arg1 第1引数
+   * @param arg2 第2引数
+   * @param arg3 第3引数
+   * @return コンポーネントのレンダリング結果
+   */
+  operator fun <TAG: Tag<in CONTENT_CATEGORY>, ARG1, ARG2, ARG3> Component3<TAG, in CONTENT_CATEGORY, ARG1, ARG2, ARG3>.invoke(
+    arg1: ARG1, arg2: ARG2, arg3: ARG3, key: String? = null,
+  ) {
+    return this@invoke.render(this@StatedDsl, arg1, arg2, arg3, key)
+  }
+
+  /**
+   * Component4を呼び出し、レンダリングするための演算子オーバーロード。
+   *
+   * @param key コンポーネントの一意のキー（オプション）
+   * @param arg1 第1引数
+   * @param arg2 第2引数
+   * @param arg3 第3引数
+   * @param arg4 第4引数
+   * @return コンポーネントのレンダリング結果
+   */
+  operator fun <TAG: Tag<in CONTENT_CATEGORY>, ARG1, ARG2, ARG3, ARG4> Component4<TAG, in CONTENT_CATEGORY, ARG1, ARG2, ARG3, ARG4>.invoke(
+    arg1: ARG1, arg2: ARG2, arg3: ARG3, arg4: ARG4, key: String? = null,
+  ) {
+    return this@invoke.render(this@StatedDsl, arg1, arg2, arg3, arg4, key)
+  }
+
+
+  /**
+   * フラグメントコンポーネント。
+   * これは、複数の要素をグループ化するためのコンテナとして機能します。
+   */
+  val fragment: StructuredComponent<Tag<CONTENT_CATEGORY>, CONTENT_CATEGORY, out StatedDsl<CONTENT_CATEGORY>>
+    get() = Fragment.create<CONTENT_CATEGORY>()
+
+  /**
+   * 状態の現在の値を取得し、この状態をDSLの状態セットに追加します。
+   *
+   * @return 状態の現在の値
+   */
+  fun <T> State<T>.useValue(): T
 }
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/state/BasicDslStateBase.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/state/BasicDslStateBase.kt
index aa2163d..cf9dc6e 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/state/BasicDslStateBase.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/state/BasicDslStateBase.kt
@@ -7,7 +7,7 @@ import net.kigawa.renlin.css.createCssManager
 import net.kigawa.renlin.dsl.RegisteredDslData
 import net.kigawa.renlin.dsl.StatedDsl
 import net.kigawa.renlin.tag.Tag
-import net.kigawa.renlin.tag.component.Component
+import net.kigawa.renlin.component.Component
 import net.kigawa.renlin.w3c.element.TagNode
 
 /**
@@ -44,7 +44,7 @@ abstract class BasicDslStateBase(
      *
      *
      */
-    override fun getOrCreateSubDslState(key: String, second: Component): DslState {
+    override fun getOrCreateSubDslState(key: String, second: Component<*>): DslState {
         return subStates.firstOrNull { it.key == key } ?: SubBasicDslState(
             key, this, second, stateContext.newStateContext()
         ).also {
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/state/DslState.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/state/DslState.kt
index b3ba2e1..d47819f 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/state/DslState.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/state/DslState.kt
@@ -3,7 +3,7 @@ package net.kigawa.renlin.state
 import net.kigawa.renlin.css.CssManager
 import net.kigawa.renlin.dsl.RegisteredDslData
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.Component
+import net.kigawa.renlin.component.Component
 import net.kigawa.renlin.w3c.element.TagNode
 
 /**
@@ -37,7 +37,7 @@ interface DslState {
      * @param second 関連するコンポーネント
      * @return サブDSLの状態
      */
-    fun getOrCreateSubDslState(key: String, second: Component): DslState
+    fun getOrCreateSubDslState(key: String, second: Component<*>): DslState
 
     /**
      * このDSL状態に関連するサブDSLのリストを設定します
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/state/SubBasicDslState.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/state/SubBasicDslState.kt
index a0817aa..61c5293 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/state/SubBasicDslState.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/state/SubBasicDslState.kt
@@ -8,8 +8,8 @@ import net.kigawa.renlin.css.CssManager
 import net.kigawa.renlin.dsl.RegisteredDslData
 import net.kigawa.renlin.dsl.StatedDsl
 import net.kigawa.renlin.tag.Tag
-import net.kigawa.renlin.tag.component.Component
-import net.kigawa.renlin.tag.component.TagComponent
+import net.kigawa.renlin.component.Component
+import net.kigawa.renlin.component.TagComponent
 import net.kigawa.renlin.w3c.element.TagNode
 
 /**
@@ -30,7 +30,7 @@ class SubBasicDslState(
     /** 親のDSL状態 */
     private val parent: BasicDslStateBase,
     /** 子DSLのコンポーネント情報 */
-    component: Component,
+    component: Component<*>,
     /** 状態管理のコンテキスト */
     stateContext: StateContext,
 ) : BasicDslStateBase(stateContext), DslState {
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/A.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/A.kt
index 32deb5c..68a50e8 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/A.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/A.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowInteractivePalpablePhrasingUnio
 import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpablePhrasingIntegration
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowInteractivePalpablePhrasingDsl
@@ -24,7 +24,7 @@ class ADsl(dslState: DslState):
     }
 }
 
-val a = TagComponent1<A, ADsl>(A, ::ADsl)
+val a = TagComponent1(A, ::ADsl)
 
 object A : Tag<FlowInteractivePalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Abbr.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Abbr.kt
index 2f00fe1..4aec318 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Abbr.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Abbr.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class AbbrDsl(dslState: DslState):
     }
 }
 
-val abbr = TagComponent1<Abbr, AbbrDsl>(Abbr, ::AbbrDsl)
+val abbr = TagComponent1(Abbr, ::AbbrDsl)
 
 object Abbr : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Address.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Address.kt
index 774ca6d..ee36f25 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Address.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Address.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion
 import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowPalpableDsl
@@ -24,7 +24,7 @@ class AddressDsl(dslState: DslState):
     }
 }
 
-val address = TagComponent1<Address, AddressDsl>(Address, ::AddressDsl)
+val address = TagComponent1(Address, ::AddressDsl)
 
 object Address : Tag<FlowPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Area.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Area.kt
index 2f07b1d..2add4ab 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Area.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Area.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class AreaDsl(dslState: DslState):
     }
 }
 
-val area = TagComponent1<Area, AreaDsl>(Area, ::AreaDsl)
+val area = TagComponent1(Area, ::AreaDsl)
 
 object Area : Tag<FlowPhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Article.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Article.kt
index 52a6d53..df9a081 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Article.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Article.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpableSectioningUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class ArticleDsl(dslState: DslState):
     }
 }
 
-val article = TagComponent1<Article, ArticleDsl>(Article, ::ArticleDsl)
+val article = TagComponent1(Article, ::ArticleDsl)
 
 object Article : Tag<FlowPalpableSectioningUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Aside.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Aside.kt
index 0dce848..008993c 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Aside.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Aside.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpableSectioningUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class AsideDsl(dslState: DslState):
     }
 }
 
-val aside = TagComponent1<Aside, AsideDsl>(Aside, ::AsideDsl)
+val aside = TagComponent1(Aside, ::AsideDsl)
 
 object Aside : Tag<FlowPalpableSectioningUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Audio.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Audio.kt
index 9e84472..00e3bf8 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Audio.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Audio.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.EmbeddedFlowInteractivePalpablePhra
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class AudioDsl(dslState: DslState):
     }
 }
 
-val audio = TagComponent1<Audio, AudioDsl>(Audio, ::AudioDsl)
+val audio = TagComponent1(Audio, ::AudioDsl)
 
 object Audio : Tag<EmbeddedFlowInteractivePalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/B.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/B.kt
index efc92bd..d1ba020 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/B.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/B.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class BDsl(dslState: DslState):
     }
 }
 
-val b = TagComponent1<B, BDsl>(B, ::BDsl)
+val b = TagComponent1(B, ::BDsl)
 
 object B : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Base.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Base.kt
index d6289bb..79a371c 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Base.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Base.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.MetadataContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.MetadataContentDsl
@@ -24,7 +24,7 @@ class BaseDsl(dslState: DslState):
     }
 }
 
-val base = TagComponent1<Base, BaseDsl>(Base, ::BaseDsl)
+val base = TagComponent1(Base, ::BaseDsl)
 
 object Base : Tag<MetadataContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Bdi.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Bdi.kt
index 466ae60..ced490d 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Bdi.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Bdi.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class BdiDsl(dslState: DslState):
     }
 }
 
-val bdi = TagComponent1<Bdi, BdiDsl>(Bdi, ::BdiDsl)
+val bdi = TagComponent1(Bdi, ::BdiDsl)
 
 object Bdi : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Bdo.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Bdo.kt
index 1ebb6e7..6a6002f 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Bdo.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Bdo.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class BdoDsl(dslState: DslState):
     }
 }
 
-val bdo = TagComponent1<Bdo, BdoDsl>(Bdo, ::BdoDsl)
+val bdo = TagComponent1(Bdo, ::BdoDsl)
 
 object Bdo : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Blockquote.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Blockquote.kt
index 43af487..63be846 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Blockquote.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Blockquote.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class BlockquoteDsl(dslState: DslState):
     }
 }
 
-val blockquote = TagComponent1<Blockquote, BlockquoteDsl>(Blockquote, ::BlockquoteDsl)
+val blockquote = TagComponent1(Blockquote, ::BlockquoteDsl)
 
 object Blockquote : Tag<FlowPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Body.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Body.kt
index bab0ef0..3a48201 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Body.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Body.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl
@@ -24,7 +24,7 @@ class BodyDsl(dslState: DslState):
     }
 }
 
-val body = TagComponent1<Body, BodyDsl>(Body, ::BodyDsl)
+val body = TagComponent1(Body, ::BodyDsl)
 
 object Body : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Br.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Br.kt
index 7763b45..0d1d430 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Br.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Br.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class BrDsl(dslState: DslState):
     }
 }
 
-val br = TagComponent1<Br, BrDsl>(Br, ::BrDsl)
+val br = TagComponent1(Br, ::BrDsl)
 
 object Br : Tag<FlowPhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Button.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Button.kt
index 3035919..6cc9373 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Button.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Button.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowFormAssociatedInteractivePalpab
 import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedInteractivePalpablePhrasingIntegration
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowFormAssociatedInteractivePalpablePhrasingDsl
@@ -24,7 +24,7 @@ class ButtonDsl(dslState: DslState):
     }
 }
 
-val button = TagComponent1<Button, ButtonDsl>(Button, ::ButtonDsl)
+val button = TagComponent1(Button, ::ButtonDsl)
 
 object Button : Tag<FlowFormAssociatedInteractivePalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Canvas.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Canvas.kt
index bf7176d..27e39f6 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Canvas.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Canvas.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.EmbeddedFlowPalpablePhrasingUnion
 import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasingIntegration
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.EmbeddedFlowPalpablePhrasingDsl
@@ -24,7 +24,7 @@ class CanvasDsl(dslState: DslState):
     }
 }
 
-val canvas = TagComponent1<Canvas, CanvasDsl>(Canvas, ::CanvasDsl)
+val canvas = TagComponent1(Canvas, ::CanvasDsl)
 
 object Canvas : Tag<EmbeddedFlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Caption.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Caption.kt
index 8e1505a..a775bc5 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Caption.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Caption.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl
@@ -24,7 +24,7 @@ class CaptionDsl(dslState: DslState):
     }
 }
 
-val caption = TagComponent1<Caption, CaptionDsl>(Caption, ::CaptionDsl)
+val caption = TagComponent1(Caption, ::CaptionDsl)
 
 object Caption : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Cite.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Cite.kt
index 6884322..26d85e2 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Cite.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Cite.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class CiteDsl(dslState: DslState):
     }
 }
 
-val cite = TagComponent1<Cite, CiteDsl>(Cite, ::CiteDsl)
+val cite = TagComponent1(Cite, ::CiteDsl)
 
 object Cite : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Code.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Code.kt
index 99af166..e288862 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Code.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Code.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class CodeDsl(dslState: DslState):
     }
 }
 
-val code = TagComponent1<Code, CodeDsl>(Code, ::CodeDsl)
+val code = TagComponent1(Code, ::CodeDsl)
 
 object Code : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Col.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Col.kt
index 4f21ae1..4cc6e6c 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Col.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Col.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl
@@ -24,7 +24,7 @@ class ColDsl(dslState: DslState):
     }
 }
 
-val col = TagComponent1<Col, ColDsl>(Col, ::ColDsl)
+val col = TagComponent1(Col, ::ColDsl)
 
 object Col : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Colgroup.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Colgroup.kt
index 9ab06c0..fef34f1 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Colgroup.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Colgroup.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl
@@ -24,7 +24,7 @@ class ColgroupDsl(dslState: DslState):
     }
 }
 
-val colgroup = TagComponent1<Colgroup, ColgroupDsl>(Colgroup, ::ColgroupDsl)
+val colgroup = TagComponent1(Colgroup, ::ColgroupDsl)
 
 object Colgroup : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Data.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Data.kt
index 58bf789..4097b37 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Data.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Data.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class DataDsl(dslState: DslState):
     }
 }
 
-val data = TagComponent1<Data, DataDsl>(Data, ::DataDsl)
+val data = TagComponent1(Data, ::DataDsl)
 
 object Data : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Datalist.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Datalist.kt
index 93d1da3..ae7d456 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Datalist.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Datalist.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPhrasingUnion
 import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowPhrasingDsl
@@ -24,7 +24,7 @@ class DatalistDsl(dslState: DslState):
     }
 }
 
-val datalist = TagComponent1<Datalist, DatalistDsl>(Datalist, ::DatalistDsl)
+val datalist = TagComponent1(Datalist, ::DatalistDsl)
 
 object Datalist : Tag<FlowPhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dd.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dd.kt
index ae0a516..c9931be 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dd.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dd.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class DdDsl(dslState: DslState):
     }
 }
 
-val dd = TagComponent1<Dd, DdDsl>(Dd, ::DdDsl)
+val dd = TagComponent1(Dd, ::DdDsl)
 
 object Dd : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Del.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Del.kt
index 45ca83b..fddb61f 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Del.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Del.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowPalpablePhrasingDsl
@@ -24,7 +24,7 @@ class DelDsl(dslState: DslState):
     }
 }
 
-val del = TagComponent1<Del, DelDsl>(Del, ::DelDsl)
+val del = TagComponent1(Del, ::DelDsl)
 
 object Del : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Details.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Details.kt
index 4fec7c6..bf3080f 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Details.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Details.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowInteractivePalpableUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class DetailsDsl(dslState: DslState):
     }
 }
 
-val details = TagComponent1<Details, DetailsDsl>(Details, ::DetailsDsl)
+val details = TagComponent1(Details, ::DetailsDsl)
 
 object Details : Tag<FlowInteractivePalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dfn.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dfn.kt
index 8da6bc4..352545f 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dfn.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dfn.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class DfnDsl(dslState: DslState):
     }
 }
 
-val dfn = TagComponent1<Dfn, DfnDsl>(Dfn, ::DfnDsl)
+val dfn = TagComponent1(Dfn, ::DfnDsl)
 
 object Dfn : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dialog.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dialog.kt
index 2206c5d..8712545 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dialog.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dialog.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class DialogDsl(dslState: DslState):
     }
 }
 
-val dialog = TagComponent1<Dialog, DialogDsl>(Dialog, ::DialogDsl)
+val dialog = TagComponent1(Dialog, ::DialogDsl)
 
 object Dialog : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Div.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Div.kt
index 716a671..cd8bc2f 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Div.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Div.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion
 import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowPalpablePhrasingDsl
@@ -24,7 +24,7 @@ class DivDsl(dslState: DslState):
     }
 }
 
-val div = TagComponent1<Div, DivDsl>(Div, ::DivDsl)
+val div = TagComponent1(Div, ::DivDsl)
 
 object Div : Tag<FlowPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dl.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dl.kt
index 30a12ff..2400c6f 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dl.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dl.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class DlDsl(dslState: DslState):
     }
 }
 
-val dl = TagComponent1<Dl, DlDsl>(Dl, ::DlDsl)
+val dl = TagComponent1(Dl, ::DlDsl)
 
 object Dl : Tag<FlowPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dt.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dt.kt
index 9b0b7d1..d526fee 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dt.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dt.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class DtDsl(dslState: DslState):
     }
 }
 
-val dt = TagComponent1<Dt, DtDsl>(Dt, ::DtDsl)
+val dt = TagComponent1(Dt, ::DtDsl)
 
 object Dt : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Em.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Em.kt
index 79e5412..6158f84 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Em.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Em.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class EmDsl(dslState: DslState):
     }
 }
 
-val em = TagComponent1<Em, EmDsl>(Em, ::EmDsl)
+val em = TagComponent1(Em, ::EmDsl)
 
 object Em : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Embed.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Embed.kt
index 0133da8..d87d905 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Embed.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Embed.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.EmbeddedFlowInteractivePalpablePhra
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class EmbedDsl(dslState: DslState):
     }
 }
 
-val embed = TagComponent1<Embed, EmbedDsl>(Embed, ::EmbedDsl)
+val embed = TagComponent1(Embed, ::EmbedDsl)
 
 object Embed : Tag<EmbeddedFlowInteractivePalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fencedframe.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fencedframe.kt
index cee1be2..05a3549 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fencedframe.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fencedframe.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class FencedframeDsl(dslState: DslState):
     }
 }
 
-val fencedframe = TagComponent1<Fencedframe, FencedframeDsl>(Fencedframe, ::FencedframeDsl)
+val fencedframe = TagComponent1(Fencedframe, ::FencedframeDsl)
 
 object Fencedframe : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fieldset.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fieldset.kt
index 005e96f..af0281b 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fieldset.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fieldset.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.AutocapitalizeInheritingFormFlowFor
 import net.kigawa.renlin.w3c.category.integration.AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.AutocapitalizeInheritingFormFlowFormAssociatedPalpableDsl
@@ -24,7 +24,7 @@ class FieldsetDsl(dslState: DslState):
     }
 }
 
-val fieldset = TagComponent1<Fieldset, FieldsetDsl>(Fieldset, ::FieldsetDsl)
+val fieldset = TagComponent1(Fieldset, ::FieldsetDsl)
 
 object Fieldset : Tag<AutocapitalizeInheritingFormFlowFormAssociatedPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Figcaption.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Figcaption.kt
index 48f1ca0..4adc6c0 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Figcaption.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Figcaption.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class FigcaptionDsl(dslState: DslState):
     }
 }
 
-val figcaption = TagComponent1<Figcaption, FigcaptionDsl>(Figcaption, ::FigcaptionDsl)
+val figcaption = TagComponent1(Figcaption, ::FigcaptionDsl)
 
 object Figcaption : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Figure.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Figure.kt
index 0abaf96..2eadb3a 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Figure.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Figure.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class FigureDsl(dslState: DslState):
     }
 }
 
-val figure = TagComponent1<Figure, FigureDsl>(Figure, ::FigureDsl)
+val figure = TagComponent1(Figure, ::FigureDsl)
 
 object Figure : Tag<FlowPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Footer.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Footer.kt
index 37e9368..512090d 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Footer.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Footer.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class FooterDsl(dslState: DslState):
     }
 }
 
-val footer = TagComponent1<Footer, FooterDsl>(Footer, ::FooterDsl)
+val footer = TagComponent1(Footer, ::FooterDsl)
 
 object Footer : Tag<FlowPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Form.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Form.kt
index 759df63..e15e3d4 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Form.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Form.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion
 import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowPalpableDsl
@@ -24,7 +24,7 @@ class FormDsl(dslState: DslState):
     }
 }
 
-val form = TagComponent1<Form, FormDsl>(Form, ::FormDsl)
+val form = TagComponent1(Form, ::FormDsl)
 
 object Form : Tag<FlowPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fragment.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fragment.kt
index d1242a4..9a443fa 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fragment.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fragment.kt
@@ -1,17 +1,17 @@
 package net.kigawa.renlin.tag
 
+import net.kigawa.renlin.component.Component1
+import net.kigawa.renlin.component.StructuredComponent
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
 import net.kigawa.renlin.state.DslState
-import net.kigawa.renlin.tag.component.Component1
-import net.kigawa.renlin.tag.component.StructuredComponent
 import net.kigawa.renlin.w3c.category.ContentCategory
 import net.kigawa.renlin.w3c.element.TagNode
 
 object Fragment {
 
 
-    //fun <CONTENT_CATEGORY : ContentCategory,NEW_DSL : TagDsl<*>> KClass<CONTENT_CATEGORY>.component(
+  //fun <CONTENT_CATEGORY : ContentCategory,NEW_DSL : TagDsl<*>> KClass<CONTENT_CATEGORY>.component(
 //    newDsl: () -> NEW_DSL,
 //    block: DSL.() -> Unit,
 //): Component1<TAG, NEW_DSL> {
@@ -35,19 +35,20 @@ object Fragment {
 //}
 //
 //fun component(block: DSL.() -> Unit) = component(::EmptyDsl, block)
-    fun <CONTENT_CATEGORY : ContentCategory> create() =
-        object : StructuredComponent<Tag<CONTENT_CATEGORY>, StatedDsl<CONTENT_CATEGORY>> {
-            override fun newDsl(dslState: DslState): StatedDsl<CONTENT_CATEGORY> {
-                return object : DslBase<CONTENT_CATEGORY>(dslState) {
-                    override fun applyElement(element: TagNode): () -> Unit {
-                        return {}
-                    }
-                }
-            }
+  fun <CONTENT_CATEGORY: ContentCategory> create() =
+    object: StructuredComponent<Tag<CONTENT_CATEGORY>, CONTENT_CATEGORY, StatedDsl<CONTENT_CATEGORY>> {
+      override fun newDsl(dslState: DslState): StatedDsl<CONTENT_CATEGORY> {
+        return object: DslBase<CONTENT_CATEGORY>(dslState) {
+          override fun applyElement(element: TagNode): () -> Unit {
+            return {}
+          }
         }
+      }
+    }
 
 }
 
-fun <CONTENT_CATEGORY : ContentCategory> fragment(): Component1<Tag<CONTENT_CATEGORY>, StatedDsl<CONTENT_CATEGORY>> {
-    return Fragment.create<CONTENT_CATEGORY>()
+fun <CONTENT_CATEGORY: ContentCategory> fragment(): StructuredComponent<
+    Tag<CONTENT_CATEGORY>, CONTENT_CATEGORY, StatedDsl<CONTENT_CATEGORY>> {
+  return Fragment.create<CONTENT_CATEGORY>()
 }
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H1.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H1.kt
index 1cd802f..5517eb9 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H1.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H1.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowHeadingPalpableUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class H1Dsl(dslState: DslState):
     }
 }
 
-val h1 = TagComponent1<H1, H1Dsl>(H1, ::H1Dsl)
+val h1 = TagComponent1(H1, ::H1Dsl)
 
 object H1 : Tag<FlowHeadingPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H2.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H2.kt
index 1fb1b80..c478fae 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H2.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H2.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowHeadingPalpableUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class H2Dsl(dslState: DslState):
     }
 }
 
-val h2 = TagComponent1<H2, H2Dsl>(H2, ::H2Dsl)
+val h2 = TagComponent1(H2, ::H2Dsl)
 
 object H2 : Tag<FlowHeadingPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H3.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H3.kt
index 27828cf..c6d5dd8 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H3.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H3.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowHeadingPalpableUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class H3Dsl(dslState: DslState):
     }
 }
 
-val h3 = TagComponent1<H3, H3Dsl>(H3, ::H3Dsl)
+val h3 = TagComponent1(H3, ::H3Dsl)
 
 object H3 : Tag<FlowHeadingPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H4.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H4.kt
index 9754075..262848d 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H4.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H4.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowHeadingPalpableUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class H4Dsl(dslState: DslState):
     }
 }
 
-val h4 = TagComponent1<H4, H4Dsl>(H4, ::H4Dsl)
+val h4 = TagComponent1(H4, ::H4Dsl)
 
 object H4 : Tag<FlowHeadingPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H5.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H5.kt
index 455bb2d..0ef919c 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H5.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H5.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowHeadingPalpableUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class H5Dsl(dslState: DslState):
     }
 }
 
-val h5 = TagComponent1<H5, H5Dsl>(H5, ::H5Dsl)
+val h5 = TagComponent1(H5, ::H5Dsl)
 
 object H5 : Tag<FlowHeadingPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H6.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H6.kt
index 8a4c245..9edf0e9 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H6.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H6.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowHeadingPalpableUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class H6Dsl(dslState: DslState):
     }
 }
 
-val h6 = TagComponent1<H6, H6Dsl>(H6, ::H6Dsl)
+val h6 = TagComponent1(H6, ::H6Dsl)
 
 object H6 : Tag<FlowHeadingPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Head.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Head.kt
index 95bb156..63a307c 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Head.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Head.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl
@@ -24,7 +24,7 @@ class HeadDsl(dslState: DslState):
     }
 }
 
-val head = TagComponent1<Head, HeadDsl>(Head, ::HeadDsl)
+val head = TagComponent1(Head, ::HeadDsl)
 
 object Head : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Header.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Header.kt
index 6185e8f..ef3d9df 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Header.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Header.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class HeaderDsl(dslState: DslState):
     }
 }
 
-val header = TagComponent1<Header, HeaderDsl>(Header, ::HeaderDsl)
+val header = TagComponent1(Header, ::HeaderDsl)
 
 object Header : Tag<FlowPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Hgroup.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Hgroup.kt
index 691e4e9..bafb654 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Hgroup.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Hgroup.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowHeadingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class HgroupDsl(dslState: DslState):
     }
 }
 
-val hgroup = TagComponent1<Hgroup, HgroupDsl>(Hgroup, ::HgroupDsl)
+val hgroup = TagComponent1(Hgroup, ::HgroupDsl)
 
 object Hgroup : Tag<FlowHeadingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Hr.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Hr.kt
index f945892..10e8f76 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Hr.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Hr.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class HrDsl(dslState: DslState):
     }
 }
 
-val hr = TagComponent1<Hr, HrDsl>(Hr, ::HrDsl)
+val hr = TagComponent1(Hr, ::HrDsl)
 
 object Hr : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Html.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Html.kt
index 32e2720..44cae37 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Html.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Html.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl
@@ -24,7 +24,7 @@ class HtmlDsl(dslState: DslState):
     }
 }
 
-val html = TagComponent1<Html, HtmlDsl>(Html, ::HtmlDsl)
+val html = TagComponent1(Html, ::HtmlDsl)
 
 object Html : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/I.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/I.kt
index d068798..92e41c5 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/I.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/I.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class IDsl(dslState: DslState):
     }
 }
 
-val i = TagComponent1<I, IDsl>(I, ::IDsl)
+val i = TagComponent1(I, ::IDsl)
 
 object I : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Iframe.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Iframe.kt
index 246b3ba..f2a4d67 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Iframe.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Iframe.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.EmbeddedFlowInteractivePalpablePhra
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class IframeDsl(dslState: DslState):
     }
 }
 
-val iframe = TagComponent1<Iframe, IframeDsl>(Iframe, ::IframeDsl)
+val iframe = TagComponent1(Iframe, ::IframeDsl)
 
 object Iframe : Tag<EmbeddedFlowInteractivePalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Img.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Img.kt
index b81695e..53d8e19 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Img.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Img.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.EmbeddedFlowFormAssociatedInteracti
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class ImgDsl(dslState: DslState):
     }
 }
 
-val img = TagComponent1<Img, ImgDsl>(Img, ::ImgDsl)
+val img = TagComponent1(Img, ::ImgDsl)
 
 object Img : Tag<EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Input.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Input.kt
index 504f1c0..8a94e06 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Input.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Input.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowFormAssociatedInteractivePalpab
 import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedInteractivePalpablePhrasingIntegration
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowFormAssociatedInteractivePalpablePhrasingDsl
@@ -24,7 +24,7 @@ class InputDsl(dslState: DslState):
     }
 }
 
-val input = TagComponent1<Input, InputDsl>(Input, ::InputDsl)
+val input = TagComponent1(Input, ::InputDsl)
 
 object Input : Tag<FlowFormAssociatedInteractivePalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ins.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ins.kt
index 03dc0c3..0dc35e2 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ins.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ins.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowPalpablePhrasingDsl
@@ -24,7 +24,7 @@ class InsDsl(dslState: DslState):
     }
 }
 
-val ins = TagComponent1<Ins, InsDsl>(Ins, ::InsDsl)
+val ins = TagComponent1(Ins, ::InsDsl)
 
 object Ins : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Kbd.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Kbd.kt
index 1873df7..912595f 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Kbd.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Kbd.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class KbdDsl(dslState: DslState):
     }
 }
 
-val kbd = TagComponent1<Kbd, KbdDsl>(Kbd, ::KbdDsl)
+val kbd = TagComponent1(Kbd, ::KbdDsl)
 
 object Kbd : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Label.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Label.kt
index 9914eb4..3552f92 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Label.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Label.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowInteractivePalpablePhrasingUnio
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class LabelDsl(dslState: DslState):
     }
 }
 
-val label = TagComponent1<Label, LabelDsl>(Label, ::LabelDsl)
+val label = TagComponent1(Label, ::LabelDsl)
 
 object Label : Tag<FlowInteractivePalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Legend.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Legend.kt
index 91dba40..c37362e 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Legend.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Legend.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class LegendDsl(dslState: DslState):
     }
 }
 
-val legend = TagComponent1<Legend, LegendDsl>(Legend, ::LegendDsl)
+val legend = TagComponent1(Legend, ::LegendDsl)
 
 object Legend : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Li.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Li.kt
index a5b611e..0047ab1 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Li.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Li.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class LiDsl(dslState: DslState):
     }
 }
 
-val li = TagComponent1<Li, LiDsl>(Li, ::LiDsl)
+val li = TagComponent1(Li, ::LiDsl)
 
 object Li : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Link.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Link.kt
index a13c410..0bcc7b4 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Link.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Link.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowMetadataPhrasingUnion
 import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasingIntegration
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowMetadataPhrasingDsl
@@ -24,7 +24,7 @@ class LinkDsl(dslState: DslState):
     }
 }
 
-val link = TagComponent1<Link, LinkDsl>(Link, ::LinkDsl)
+val link = TagComponent1(Link, ::LinkDsl)
 
 object Link : Tag<FlowMetadataPhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Main.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Main.kt
index 71c2f16..da853a2 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Main.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Main.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class MainDsl(dslState: DslState):
     }
 }
 
-val main = TagComponent1<Main, MainDsl>(Main, ::MainDsl)
+val main = TagComponent1(Main, ::MainDsl)
 
 object Main : Tag<FlowPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Map.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Map.kt
index c1edd60..cc6fbff 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Map.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Map.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class MapDsl(dslState: DslState):
     }
 }
 
-val map = TagComponent1<Map, MapDsl>(Map, ::MapDsl)
+val map = TagComponent1(Map, ::MapDsl)
 
 object Map : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Mark.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Mark.kt
index 1c60a63..4ec0d05 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Mark.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Mark.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class MarkDsl(dslState: DslState):
     }
 }
 
-val mark = TagComponent1<Mark, MarkDsl>(Mark, ::MarkDsl)
+val mark = TagComponent1(Mark, ::MarkDsl)
 
 object Mark : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Math.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Math.kt
index 83a52f5..b94cefe 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Math.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Math.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.EmbeddedFlowPalpablePhrasingUnion
 import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasingIntegration
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.EmbeddedFlowPalpablePhrasingDsl
@@ -24,7 +24,7 @@ class MathDsl(dslState: DslState):
     }
 }
 
-val math = TagComponent1<Math, MathDsl>(Math, ::MathDsl)
+val math = TagComponent1(Math, ::MathDsl)
 
 object Math : Tag<EmbeddedFlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Menu.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Menu.kt
index 7fa8982..766110c 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Menu.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Menu.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class MenuDsl(dslState: DslState):
     }
 }
 
-val menu = TagComponent1<Menu, MenuDsl>(Menu, ::MenuDsl)
+val menu = TagComponent1(Menu, ::MenuDsl)
 
 object Menu : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Meta.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Meta.kt
index 3d9c0c2..11dd5c8 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Meta.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Meta.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowMetadataPhrasingUnion
 import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasingIntegration
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowMetadataPhrasingDsl
@@ -24,7 +24,7 @@ class MetaDsl(dslState: DslState):
     }
 }
 
-val meta = TagComponent1<Meta, MetaDsl>(Meta, ::MetaDsl)
+val meta = TagComponent1(Meta, ::MetaDsl)
 
 object Meta : Tag<FlowMetadataPhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Meter.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Meter.kt
index d607368..b96a076 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Meter.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Meter.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class MeterDsl(dslState: DslState):
     }
 }
 
-val meter = TagComponent1<Meter, MeterDsl>(Meter, ::MeterDsl)
+val meter = TagComponent1(Meter, ::MeterDsl)
 
 object Meter : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Nav.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Nav.kt
index d991080..76248e7 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Nav.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Nav.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpableSectioningUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class NavDsl(dslState: DslState):
     }
 }
 
-val nav = TagComponent1<Nav, NavDsl>(Nav, ::NavDsl)
+val nav = TagComponent1(Nav, ::NavDsl)
 
 object Nav : Tag<FlowPalpableSectioningUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Noscript.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Noscript.kt
index a7e1969..716f186 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Noscript.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Noscript.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowMetadataPhrasingUnion
 import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasingIntegration
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowMetadataPhrasingDsl
@@ -24,7 +24,7 @@ class NoscriptDsl(dslState: DslState):
     }
 }
 
-val noscript = TagComponent1<Noscript, NoscriptDsl>(Noscript, ::NoscriptDsl)
+val noscript = TagComponent1(Noscript, ::NoscriptDsl)
 
 object Noscript : Tag<FlowMetadataPhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Object.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Object.kt
index ed695a5..8e76925 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Object.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Object.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.EmbeddedFlowFormAssociatedInteracti
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class ObjectDsl(dslState: DslState):
     }
 }
 
-val `object` = TagComponent1<Object, ObjectDsl>(Object, ::ObjectDsl)
+val `object` = TagComponent1(Object, ::ObjectDsl)
 
 object Object : Tag<EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ol.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ol.kt
index 4b38a02..6c5f19e 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ol.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ol.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class OlDsl(dslState: DslState):
     }
 }
 
-val ol = TagComponent1<Ol, OlDsl>(Ol, ::OlDsl)
+val ol = TagComponent1(Ol, ::OlDsl)
 
 object Ol : Tag<FlowPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Optgroup.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Optgroup.kt
index 6149b60..e324458 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Optgroup.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Optgroup.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class OptgroupDsl(dslState: DslState):
     }
 }
 
-val optgroup = TagComponent1<Optgroup, OptgroupDsl>(Optgroup, ::OptgroupDsl)
+val optgroup = TagComponent1(Optgroup, ::OptgroupDsl)
 
 object Optgroup : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Option.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Option.kt
index 55e3134..aa1e41b 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Option.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Option.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class OptionDsl(dslState: DslState):
     }
 }
 
-val option = TagComponent1<Option, OptionDsl>(Option, ::OptionDsl)
+val option = TagComponent1(Option, ::OptionDsl)
 
 object Option : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Output.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Output.kt
index 4607fc2..75c9b97 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Output.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Output.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowFormAssociatedPalpablePhrasingU
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class OutputDsl(dslState: DslState):
     }
 }
 
-val output = TagComponent1<Output, OutputDsl>(Output, ::OutputDsl)
+val output = TagComponent1(Output, ::OutputDsl)
 
 object Output : Tag<FlowFormAssociatedPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/P.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/P.kt
index da8d51e..79f7422 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/P.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/P.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion
 import net.kigawa.renlin.w3c.category.native.PhrasingContent
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.PhrasingContentDsl
@@ -24,7 +24,7 @@ class PDsl(dslState: DslState):
     }
 }
 
-val p = TagComponent1<P, PDsl>(P, ::PDsl)
+val p = TagComponent1(P, ::PDsl)
 
 object P : Tag<FlowPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Picture.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Picture.kt
index 6d38df2..0831fdb 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Picture.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Picture.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.EmbeddedFlowPalpablePhrasingUnion
 import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasingIntegration
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.EmbeddedFlowPalpablePhrasingDsl
@@ -24,7 +24,7 @@ class PictureDsl(dslState: DslState):
     }
 }
 
-val picture = TagComponent1<Picture, PictureDsl>(Picture, ::PictureDsl)
+val picture = TagComponent1(Picture, ::PictureDsl)
 
 object Picture : Tag<EmbeddedFlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Pre.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Pre.kt
index 45e087a..1e7c6b6 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Pre.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Pre.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class PreDsl(dslState: DslState):
     }
 }
 
-val pre = TagComponent1<Pre, PreDsl>(Pre, ::PreDsl)
+val pre = TagComponent1(Pre, ::PreDsl)
 
 object Pre : Tag<FlowPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Progress.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Progress.kt
index a24735c..5ffb992 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Progress.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Progress.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class ProgressDsl(dslState: DslState):
     }
 }
 
-val progress = TagComponent1<Progress, ProgressDsl>(Progress, ::ProgressDsl)
+val progress = TagComponent1(Progress, ::ProgressDsl)
 
 object Progress : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Q.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Q.kt
index 2eace6c..2315f45 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Q.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Q.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class QDsl(dslState: DslState):
     }
 }
 
-val q = TagComponent1<Q, QDsl>(Q, ::QDsl)
+val q = TagComponent1(Q, ::QDsl)
 
 object Q : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Rp.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Rp.kt
index 2c9f0a3..29e0895 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Rp.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Rp.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class RpDsl(dslState: DslState):
     }
 }
 
-val rp = TagComponent1<Rp, RpDsl>(Rp, ::RpDsl)
+val rp = TagComponent1(Rp, ::RpDsl)
 
 object Rp : Tag<FlowPhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Rt.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Rt.kt
index 272c424..f8ff6e3 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Rt.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Rt.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class RtDsl(dslState: DslState):
     }
 }
 
-val rt = TagComponent1<Rt, RtDsl>(Rt, ::RtDsl)
+val rt = TagComponent1(Rt, ::RtDsl)
 
 object Rt : Tag<FlowPhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ruby.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ruby.kt
index 3e9a86a..6b61afe 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ruby.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ruby.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class RubyDsl(dslState: DslState):
     }
 }
 
-val ruby = TagComponent1<Ruby, RubyDsl>(Ruby, ::RubyDsl)
+val ruby = TagComponent1(Ruby, ::RubyDsl)
 
 object Ruby : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/S.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/S.kt
index c8c4b5b..0375170 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/S.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/S.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class SDsl(dslState: DslState):
     }
 }
 
-val s = TagComponent1<S, SDsl>(S, ::SDsl)
+val s = TagComponent1(S, ::SDsl)
 
 object S : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Samp.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Samp.kt
index c4f249d..c429aa6 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Samp.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Samp.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class SampDsl(dslState: DslState):
     }
 }
 
-val samp = TagComponent1<Samp, SampDsl>(Samp, ::SampDsl)
+val samp = TagComponent1(Samp, ::SampDsl)
 
 object Samp : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Script.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Script.kt
index e747255..ff5159b 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Script.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Script.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowMetadataPhrasingScriptSupportin
 import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasingScriptSupportingIntegration
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowMetadataPhrasingScriptSupportingDsl
@@ -24,7 +24,7 @@ class ScriptDsl(dslState: DslState):
     }
 }
 
-val script = TagComponent1<Script, ScriptDsl>(Script, ::ScriptDsl)
+val script = TagComponent1(Script, ::ScriptDsl)
 
 object Script : Tag<FlowMetadataPhrasingScriptSupportingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Search.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Search.kt
index 203cfbd..b7fb732 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Search.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Search.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class SearchDsl(dslState: DslState):
     }
 }
 
-val search = TagComponent1<Search, SearchDsl>(Search, ::SearchDsl)
+val search = TagComponent1(Search, ::SearchDsl)
 
 object Search : Tag<FlowPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Section.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Section.kt
index f7ae9e6..2f708b7 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Section.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Section.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpableSectioningUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class SectionDsl(dslState: DslState):
     }
 }
 
-val section = TagComponent1<Section, SectionDsl>(Section, ::SectionDsl)
+val section = TagComponent1(Section, ::SectionDsl)
 
 object Section : Tag<FlowPalpableSectioningUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Select.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Select.kt
index 5dbc3e6..665ec00 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Select.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Select.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowFormAssociatedInteractivePalpab
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class SelectDsl(dslState: DslState):
     }
 }
 
-val select = TagComponent1<Select, SelectDsl>(Select, ::SelectDsl)
+val select = TagComponent1(Select, ::SelectDsl)
 
 object Select : Tag<FlowFormAssociatedInteractivePalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Selectedcontent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Selectedcontent.kt
index e011844..177403e 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Selectedcontent.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Selectedcontent.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class SelectedcontentDsl(dslState: DslState):
     }
 }
 
-val selectedcontent = TagComponent1<Selectedcontent, SelectedcontentDsl>(Selectedcontent, ::SelectedcontentDsl)
+val selectedcontent = TagComponent1(Selectedcontent, ::SelectedcontentDsl)
 
 object Selectedcontent : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Slot.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Slot.kt
index 2e6f9dc..07948d5 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Slot.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Slot.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class SlotDsl(dslState: DslState):
     }
 }
 
-val slot = TagComponent1<Slot, SlotDsl>(Slot, ::SlotDsl)
+val slot = TagComponent1(Slot, ::SlotDsl)
 
 object Slot : Tag<FlowPhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Small.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Small.kt
index 623b6dc..a6b90e7 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Small.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Small.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class SmallDsl(dslState: DslState):
     }
 }
 
-val small = TagComponent1<Small, SmallDsl>(Small, ::SmallDsl)
+val small = TagComponent1(Small, ::SmallDsl)
 
 object Small : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Source.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Source.kt
index 9e4fde6..9f1435e 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Source.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Source.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl
@@ -24,7 +24,7 @@ class SourceDsl(dslState: DslState):
     }
 }
 
-val source = TagComponent1<Source, SourceDsl>(Source, ::SourceDsl)
+val source = TagComponent1(Source, ::SourceDsl)
 
 object Source : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Span.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Span.kt
index ae9466f..b2c5d66 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Span.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Span.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class SpanDsl(dslState: DslState):
     }
 }
 
-val span = TagComponent1<Span, SpanDsl>(Span, ::SpanDsl)
+val span = TagComponent1(Span, ::SpanDsl)
 
 object Span : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Strong.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Strong.kt
index 0cce2f6..6a15a86 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Strong.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Strong.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class StrongDsl(dslState: DslState):
     }
 }
 
-val strong = TagComponent1<Strong, StrongDsl>(Strong, ::StrongDsl)
+val strong = TagComponent1(Strong, ::StrongDsl)
 
 object Strong : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Style.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Style.kt
index df9ff9b..06ef7d8 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Style.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Style.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.MetadataContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.MetadataContentDsl
@@ -24,7 +24,7 @@ class StyleDsl(dslState: DslState):
     }
 }
 
-val style = TagComponent1<Style, StyleDsl>(Style, ::StyleDsl)
+val style = TagComponent1(Style, ::StyleDsl)
 
 object Style : Tag<MetadataContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Sub.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Sub.kt
index 0a4c4ca..fd0f077 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Sub.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Sub.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class SubDsl(dslState: DslState):
     }
 }
 
-val sub = TagComponent1<Sub, SubDsl>(Sub, ::SubDsl)
+val sub = TagComponent1(Sub, ::SubDsl)
 
 object Sub : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Summary.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Summary.kt
index f7dcf24..8c77db2 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Summary.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Summary.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class SummaryDsl(dslState: DslState):
     }
 }
 
-val summary = TagComponent1<Summary, SummaryDsl>(Summary, ::SummaryDsl)
+val summary = TagComponent1(Summary, ::SummaryDsl)
 
 object Summary : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Sup.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Sup.kt
index 3f7444c..d90561c 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Sup.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Sup.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class SupDsl(dslState: DslState):
     }
 }
 
-val sup = TagComponent1<Sup, SupDsl>(Sup, ::SupDsl)
+val sup = TagComponent1(Sup, ::SupDsl)
 
 object Sup : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Svg.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Svg.kt
index 162a9c7..4ce490a 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Svg.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Svg.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.EmbeddedFlowPalpablePhrasingUnion
 import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasingIntegration
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.EmbeddedFlowPalpablePhrasingDsl
@@ -24,7 +24,7 @@ class SvgDsl(dslState: DslState):
     }
 }
 
-val svg = TagComponent1<Svg, SvgDsl>(Svg, ::SvgDsl)
+val svg = TagComponent1(Svg, ::SvgDsl)
 
 object Svg : Tag<EmbeddedFlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Table.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Table.kt
index bb6ae4a..d35e06f 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Table.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Table.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion
 import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowPalpableDsl
@@ -24,7 +24,7 @@ class TableDsl(dslState: DslState):
     }
 }
 
-val table = TagComponent1<Table, TableDsl>(Table, ::TableDsl)
+val table = TagComponent1(Table, ::TableDsl)
 
 object Table : Tag<FlowPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tbody.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tbody.kt
index c813fa6..f10f348 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tbody.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tbody.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl
@@ -24,7 +24,7 @@ class TbodyDsl(dslState: DslState):
     }
 }
 
-val tbody = TagComponent1<Tbody, TbodyDsl>(Tbody, ::TbodyDsl)
+val tbody = TagComponent1(Tbody, ::TbodyDsl)
 
 object Tbody : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Td.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Td.kt
index a4c7cb8..3796a56 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Td.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Td.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl
@@ -24,7 +24,7 @@ class TdDsl(dslState: DslState):
     }
 }
 
-val td = TagComponent1<Td, TdDsl>(Td, ::TdDsl)
+val td = TagComponent1(Td, ::TdDsl)
 
 object Td : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Template.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Template.kt
index de282ba..4760bf2 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Template.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Template.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowMetadataPhrasingScriptSupportin
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class TemplateDsl(dslState: DslState):
     }
 }
 
-val template = TagComponent1<Template, TemplateDsl>(Template, ::TemplateDsl)
+val template = TagComponent1(Template, ::TemplateDsl)
 
 object Template : Tag<FlowMetadataPhrasingScriptSupportingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/TextTag.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/TextTag.kt
index 5271fe9..236c100 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/TextTag.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/TextTag.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.NotingContent
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
 import net.kigawa.renlin.state.DslState
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.category.native.PhrasingContent
 
 import net.kigawa.renlin.w3c.element.TagNode
@@ -23,7 +23,7 @@ class TextDsl(dslState: DslState) : DslBase<NotingContent>(dslState), StatedDsl<
     }
 }
 
-val text = TagComponent1<TextTag, TextDsl>(TextTag, ::TextDsl)
+val text = TagComponent1(TextTag, ::TextDsl)
 
 object TextTag : Tag<PhrasingContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Textarea.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Textarea.kt
index 7c3f07a..5968cb4 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Textarea.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Textarea.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowFormAssociatedInteractivePalpab
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class TextareaDsl(dslState: DslState):
     }
 }
 
-val textarea = TagComponent1<Textarea, TextareaDsl>(Textarea, ::TextareaDsl)
+val textarea = TagComponent1(Textarea, ::TextareaDsl)
 
 object Textarea : Tag<FlowFormAssociatedInteractivePalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tfoot.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tfoot.kt
index 508e21f..f850ea2 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tfoot.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tfoot.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl
@@ -24,7 +24,7 @@ class TfootDsl(dslState: DslState):
     }
 }
 
-val tfoot = TagComponent1<Tfoot, TfootDsl>(Tfoot, ::TfootDsl)
+val tfoot = TagComponent1(Tfoot, ::TfootDsl)
 
 object Tfoot : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Th.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Th.kt
index 5ed1ee2..2aeefcd 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Th.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Th.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl
@@ -24,7 +24,7 @@ class ThDsl(dslState: DslState):
     }
 }
 
-val th = TagComponent1<Th, ThDsl>(Th, ::ThDsl)
+val th = TagComponent1(Th, ::ThDsl)
 
 object Th : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Thead.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Thead.kt
index a850538..b82d135 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Thead.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Thead.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl
@@ -24,7 +24,7 @@ class TheadDsl(dslState: DslState):
     }
 }
 
-val thead = TagComponent1<Thead, TheadDsl>(Thead, ::TheadDsl)
+val thead = TagComponent1(Thead, ::TheadDsl)
 
 object Thead : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Time.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Time.kt
index 70d9ff7..96499cf 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Time.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Time.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class TimeDsl(dslState: DslState):
     }
 }
 
-val time = TagComponent1<Time, TimeDsl>(Time, ::TimeDsl)
+val time = TagComponent1(Time, ::TimeDsl)
 
 object Time : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Title.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Title.kt
index c10ebd3..75f5d79 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Title.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Title.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.MetadataContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.MetadataContentDsl
@@ -24,7 +24,7 @@ class TitleDsl(dslState: DslState):
     }
 }
 
-val title = TagComponent1<Title, TitleDsl>(Title, ::TitleDsl)
+val title = TagComponent1(Title, ::TitleDsl)
 
 object Title : Tag<MetadataContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tr.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tr.kt
index d1a0be1..54dde06 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tr.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tr.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl
@@ -24,7 +24,7 @@ class TrDsl(dslState: DslState):
     }
 }
 
-val tr = TagComponent1<Tr, TrDsl>(Tr, ::TrDsl)
+val tr = TagComponent1(Tr, ::TrDsl)
 
 object Tr : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Track.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Track.kt
index 09ed784..7667c2e 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Track.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Track.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowContent
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class TrackDsl(dslState: DslState):
     }
 }
 
-val track = TagComponent1<Track, TrackDsl>(Track, ::TrackDsl)
+val track = TagComponent1(Track, ::TrackDsl)
 
 object Track : Tag<FlowContent> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/U.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/U.kt
index 3b5e862..2d240f8 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/U.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/U.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class UDsl(dslState: DslState):
     }
 }
 
-val u = TagComponent1<U, UDsl>(U, ::UDsl)
+val u = TagComponent1(U, ::UDsl)
 
 object U : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ul.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ul.kt
index 434113a..7407e25 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ul.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ul.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class UlDsl(dslState: DslState):
     }
 }
 
-val ul = TagComponent1<Ul, UlDsl>(Ul, ::UlDsl)
+val ul = TagComponent1(Ul, ::UlDsl)
 
 object Ul : Tag<FlowPalpableUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Var.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Var.kt
index 8f8a9b7..8dec553 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Var.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Var.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class VarDsl(dslState: DslState):
     }
 }
 
-val `var` = TagComponent1<Var, VarDsl>(Var, ::VarDsl)
+val `var` = TagComponent1(Var, ::VarDsl)
 
 object Var : Tag<FlowPalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Video.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Video.kt
index 5b553d2..914d5e1 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Video.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Video.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.EmbeddedFlowInteractivePalpablePhra
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class VideoDsl(dslState: DslState):
     }
 }
 
-val video = TagComponent1<Video, VideoDsl>(Video, ::VideoDsl)
+val video = TagComponent1(Video, ::VideoDsl)
 
 object Video : Tag<EmbeddedFlowInteractivePalpablePhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Wbr.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Wbr.kt
index aa649fb..4b90e57 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Wbr.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Wbr.kt
@@ -4,7 +4,7 @@ import net.kigawa.renlin.w3c.category.native.FlowPhrasingUnion
 
 import net.kigawa.renlin.dsl.DslBase
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.tag.component.TagComponent1
+import net.kigawa.renlin.component.TagComponent1
 import net.kigawa.renlin.w3c.element.TagNode
 import net.kigawa.renlin.state.DslState
 import net.kigawa.renlin.w3c.category.ContentCategory
@@ -22,7 +22,7 @@ class WbrDsl(dslState: DslState):
     }
 }
 
-val wbr = TagComponent1<Wbr, WbrDsl>(Wbr, ::WbrDsl)
+val wbr = TagComponent1(Wbr, ::WbrDsl)
 
 object Wbr : Tag<FlowPhrasingUnion> {
     override val name: String
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/component/Component.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/component/Component.kt
deleted file mode 100644
index 771d2c5..0000000
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/component/Component.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package net.kigawa.renlin.tag.component
-
-interface Component {
-}
\ No newline at end of file
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/component/Component1.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/component/Component1.kt
deleted file mode 100644
index 63205df..0000000
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/component/Component1.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package net.kigawa.renlin.tag.component
-
-import net.kigawa.hakate.api.state.State
-import net.kigawa.renlin.Html
-import net.kigawa.renlin.dsl.Dsl
-import net.kigawa.renlin.dsl.EmptyDsl
-import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.dsl.RegisteredDslData
-import net.kigawa.renlin.state.DslState
-import net.kigawa.renlin.tag.Tag
-import net.kigawa.renlin.w3c.category.ContentCategory
-import kotlin.uuid.ExperimentalUuidApi
-import kotlin.uuid.Uuid
-
-@Html
-interface Component1<out TAG : Tag<*>, DSL : Dsl> : Component {
-    fun newDsl(dslState: DslState): DSL
-    fun render(parentDsl: StatedDsl<*>, block: DSL.() -> Unit, key: String?)
-
-    @OptIn(ExperimentalUuidApi::class)
-    fun <NEW_DSL : Dsl> component(
-        newDsl: () -> NEW_DSL,
-        block: DSL.() -> Unit,
-    ): Component1<TAG, NEW_DSL> {
-        return object : Component1<TAG, NEW_DSL> {
-
-            override fun newDsl(dslState: DslState): NEW_DSL {
-                return newDsl()
-            }
-
-            override fun render(parentDsl: StatedDsl<*>, block: NEW_DSL.() -> Unit, key: String?) {
-                val nonNullKey = key ?: Uuid.random().toString()
-                val state = parentDsl.dslState.getOrCreateSubDslState(nonNullKey, this@Component1)
-                val newDsl = newDsl()
-                newDsl.block()
-                val baseDsl = this@Component1.newDsl(state)
-                baseDsl.block()
-                parentDsl.registerSubDsl(
-                    RegisteredDslData(
-                        object : StatedDsl<ContentCategory> by baseDsl {
-                            override val states: Set<State<*>>
-                                get() = baseDsl.states + newDsl.states
-                        },
-                        this@Component1,
-                        { render(parentDsl, block = block, key) },
-                        nonNullKey
-                    )
-                )
-            }
-        }
-    }
-
-    fun component(block: DSL.() -> Unit) = component(::EmptyDsl, block)
-}
\ No newline at end of file
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/component/StructuredComponent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/component/StructuredComponent.kt
deleted file mode 100644
index 0fe945e..0000000
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/component/StructuredComponent.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package net.kigawa.renlin.tag.component
-
-import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.dsl.RegisteredDslData
-import net.kigawa.renlin.tag.Tag
-import kotlin.uuid.ExperimentalUuidApi
-import kotlin.uuid.Uuid
-
-interface StructuredComponent<TAG : Tag<*>, DSL : StatedDsl<*>> : Component1<TAG, DSL> {
-    @OptIn(ExperimentalUuidApi::class)
-    override fun render(parentDsl: StatedDsl<*>, block: DSL.() -> Unit, key: String?) {
-        val nonNullKey = key ?: Uuid.random().toString()
-        val dslState = parentDsl.dslState.getOrCreateSubDslState(nonNullKey, this)
-        val dsl = newDsl(dslState)
-        dsl.block()
-        parentDsl.registerSubDsl(
-            RegisteredDslData(
-                dsl,
-                this,
-                { render(parentDsl, block, key) },
-                nonNullKey
-            )
-        )
-    }
-}
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/component/TagComponent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/component/TagComponent.kt
deleted file mode 100644
index c3715c0..0000000
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/component/TagComponent.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package net.kigawa.renlin.tag.component
-
-import net.kigawa.renlin.tag.Tag
-
-interface TagComponent<TAG : Tag<*>> : Component {
-    val tag: TAG
-}
\ No newline at end of file
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/component/TagComponent1.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/component/TagComponent1.kt
deleted file mode 100644
index 2be35af..0000000
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/component/TagComponent1.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package net.kigawa.renlin.tag.component
-
-import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.state.DslState
-import net.kigawa.renlin.tag.Tag
-
-class TagComponent1<TAG : Tag<*>, DSL : StatedDsl<*>>(
-    override val tag: TAG,
-    private val newDslFunc: (DslState) -> DSL,
-) : Component1<TAG, DSL>, TagComponent<TAG>, StructuredComponent<TAG, DSL> {
-    override fun newDsl(dslState: DslState): DSL {
-        return newDslFunc(dslState)
-    }
-
-}
\ No newline at end of file
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/Func.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/Func.kt
index b9daa05..449c3d1 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/Func.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/Func.kt
@@ -5,7 +5,7 @@ import net.kigawa.renlin.tag.text
 import net.kigawa.renlin.w3c.category.native.PhrasingContent
 
 
-fun <CONTENT_CATEGORY : PhrasingContent> StatedDsl<CONTENT_CATEGORY>.t(str: String, key: String? = null) {
+fun <CONTENT_CATEGORY : PhrasingContent> StatedDsl<out CONTENT_CATEGORY>.t(str: String, key: String? = null) {
     text.render(this, {
         this@render.text = str
     }, key)
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AutocapitalizeInheritingFormFlowFormAssociatedPalpableUnionContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AutocapitalizeInheritingFormFlowFormAssociatedPalpableUnionContent.kt
deleted file mode 100644
index 2d24da3..0000000
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AutocapitalizeInheritingFormFlowFormAssociatedPalpableUnionContent.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package net.kigawa.renlin.w3c.category.union
-
-import net.kigawa.renlin.w3c.category.ContentCategory
-
-
-/**
- * Union to 
- */
-interface AutocapitalizeInheritingFormFlowFormAssociatedPalpableUnionContent :  ContentCategory
\ No newline at end of file
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnionContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnionContent.kt
deleted file mode 100644
index 5c87833..0000000
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnionContent.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package net.kigawa.renlin.w3c.category.union
-
-import net.kigawa.renlin.w3c.category.ContentCategory
-
-
-/**
- * Union to 
- */
-interface EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnionContent :  ContentCategory
\ No newline at end of file
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SectioningContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SectioningContent.kt
new file mode 100644
index 0000000..b8c9400
--- /dev/null
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SectioningContent.kt
@@ -0,0 +1,9 @@
+package net.kigawa.renlin.w3c.category.native
+
+import net.kigawa.renlin.w3c.category.ContentCategory
+
+/**
+ * Union to FlowPalpableSectioningUnion
+ * Parent: FlowContent
+ */
+interface SectioningContent : FlowPalpableSectioningUnion, ContentCategory, FlowContent
\ No newline at end of file
diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/event/tag/click.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/event/tag/click.kt
index d620cd5..34eb140 100644
--- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/event/tag/click.kt
+++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/event/tag/click.kt
@@ -1,11 +1,6 @@
 package net.kigawa.renlin.w3c.event.tag
 
-import net.kigawa.renlin.dsl.Dsl
-import net.kigawa.renlin.dsl.EmptyDsl
 import net.kigawa.renlin.dsl.StatedDsl
-import net.kigawa.renlin.state.DslState
-import net.kigawa.renlin.tag.Tag
-import net.kigawa.renlin.tag.component.Component1
 import net.kigawa.renlin.w3c.category.native.EventTarget
 import net.kigawa.renlin.w3c.event.WebPointerEvent
 
diff --git a/renlin/src/jsMain/kotlin/net/kigawa/renlin/Entrypoint.kt b/renlin/src/jsMain/kotlin/net/kigawa/renlin/Entrypoint.kt
index d8033f5..2baf0d5 100644
--- a/renlin/src/jsMain/kotlin/net/kigawa/renlin/Entrypoint.kt
+++ b/renlin/src/jsMain/kotlin/net/kigawa/renlin/Entrypoint.kt
@@ -1,16 +1,19 @@
 package net.kigawa.renlin
 
 import net.kigawa.hakate.api.state.StateDispatcher
+import net.kigawa.renlin.component.Component0
 import net.kigawa.renlin.dsl.DomDsl
-import net.kigawa.renlin.dsl.EmptyStatedDsl
-import net.kigawa.renlin.tag.component.Component1
+import net.kigawa.renlin.w3c.category.ContentCategory
 import org.w3c.dom.Element
 
 class Entrypoint(
-    val element: Element,
+  val element: Element,
 ) {
-    fun render(component: Component1<*, *>, dispatcher: StateDispatcher) {
-        val dsl = DomDsl(element, dispatcher)
-        component.render(dsl, {}, "root")
-    }
+  fun <CONTENT_CATEGORY: ContentCategory> render(
+    component: Component0<*, CONTENT_CATEGORY>, dispatcher: StateDispatcher,
+  ) {
+    println("Entrypoint")
+    val dsl = DomDsl<CONTENT_CATEGORY>(element, dispatcher)
+    component.render(dsl, "root")
+  }
 }
diff --git a/renlin/src/jsMain/kotlin/net/kigawa/renlin/dsl/DomDsl.kt b/renlin/src/jsMain/kotlin/net/kigawa/renlin/dsl/DomDsl.kt
index 638ee65..480fdf1 100644
--- a/renlin/src/jsMain/kotlin/net/kigawa/renlin/dsl/DomDsl.kt
+++ b/renlin/src/jsMain/kotlin/net/kigawa/renlin/dsl/DomDsl.kt
@@ -2,16 +2,18 @@ package net.kigawa.renlin.dsl
 
 import net.kigawa.hakate.api.state.StateDispatcher
 import net.kigawa.renlin.state.RootDslStateBase
-import net.kigawa.renlin.w3c.category.AllContentCategory
+import net.kigawa.renlin.w3c.category.ContentCategory
 import net.kigawa.renlin.w3c.element.DomTagElement
 import net.kigawa.renlin.w3c.element.TagNode
 import org.w3c.dom.Element
 
-class DomDsl(element: Element, dispatcher: StateDispatcher) : DslBase<AllContentCategory>(
-    RootDslStateBase(DomTagElement(element, null), dispatcher.newStateContext())
-), StatedDsl<AllContentCategory> {
+class DomDsl<CONTENT_CATEGORY: ContentCategory>(
+  element: Element, dispatcher: StateDispatcher,
+): DslBase<CONTENT_CATEGORY>(
+  RootDslStateBase(DomTagElement(element, null), dispatcher.newStateContext())
+), StatedDsl<CONTENT_CATEGORY> {
 
-    override fun applyElement(element: TagNode): () -> Unit {
-        return {}
-    }
+  override fun applyElement(element: TagNode): () -> Unit {
+    return {}
+  }
 }
diff --git a/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/SampleComponent.kt b/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/SampleComponent.kt
index 7d076b9..2a01d26 100644
--- a/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/SampleComponent.kt
+++ b/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/SampleComponent.kt
@@ -1,12 +1,7 @@
-@file:Suppress("unused")
-
 package net.kigawa.renlin.sample
 
+import net.kigawa.renlin.component.component
 import net.kigawa.renlin.tag.div
-import net.kigawa.renlin.tag.p
-import net.kigawa.renlin.tag.text
-import net.kigawa.renlin.w3c.category.t
-import net.kigawa.renlin.w3c.event.tag.onClick
 
 class SampleComponent(
     val name: String,
@@ -14,51 +9,11 @@ class SampleComponent(
 ) {
     var update: (Int) -> Unit = {}
 
-    // public final val root: Component1<Div, EmptyDsl>
-    // public val div: TagComponent1<Div, DivDsl> = TagComponent1<Div, DivDsl>
-    val aaaa = div.component {
-        p {
-        }
-    }
-
     val root = div.component {
+        sub.navigation("navigation")
+        // a
+        sub.display("main-display")
 
-        div("uuid 1") {
-            text("uuid 1-1") {
-                +"repeat "
-            }
-        }
-        sub.display("uuid 2") {
-        }
 
-        fragment {
-            div {
-                fragment {
-                    p {
-                        onClick {
-                            println("onClick!")
-                        }
-                        t("onClick")
-                        text {
-                            text = "onClick"
-                        }
-                    }
-                }
-                p {
-//                    +"aaaa"
-                }
-            }
-        }
-//        fragment {
-        sub.display("uuid 3") {
-        }
-//        }
-        sub.controller("uuid 4") {
-        }
-        p {
-//            key = "uuid 5"
-        }
-        sub.test {}
-        sub.test1 {}
     }
-}
+}
\ No newline at end of file
diff --git a/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/Sub.kt b/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/Sub.kt
index 08ed7ad..28e8d25 100644
--- a/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/Sub.kt
+++ b/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/Sub.kt
@@ -2,78 +2,148 @@ package net.kigawa.renlin.sample
 
 import net.kigawa.hakate.api.HakateInitializer
 import net.kigawa.hakate.api.state.MutableState
+import net.kigawa.renlin.component.component
 import net.kigawa.renlin.css.*
 import net.kigawa.renlin.tag.div
 import net.kigawa.renlin.tag.fragment
 import net.kigawa.renlin.tag.p
+import net.kigawa.renlin.tag.style
 import net.kigawa.renlin.tag.text
 import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration
 import net.kigawa.renlin.w3c.category.native.FlowContent
 import net.kigawa.renlin.w3c.category.native.PhrasingContent
 import net.kigawa.renlin.w3c.category.t
+import net.kigawa.renlin.w3c.event.tag.onClick
 
 
 class Sub {
     val state: MutableState<String> = HakateInitializer().newStateDispatcher().newState("state 0")
+    private var isMenuOpen = false
 
     val display = div.component {
-        t("display")
-        div("key display1 div") {
-            val value = state.useValue()
-            t("display1", key = "key display1")
-            div("key display1-1 div") {
-                t("display1-1", key = "key display1-1")
+        div("hero-section") {
+            t("Renlin")
+            css {
+                fontSize = 48.px
+                height = 100.vh
+                width = 100.percent
+                textAlign = TextAlign.CENTER
+                margin = 0.px
+                padding = 0.px
+                paddingBottom = 10.px
+                display = Display.FLEX
+                flexDirection = FlexDirection.COLUMN
+                alignItems = AlignItems.CENTER
+                justifyContent = JustifyContent.CENTER
+            }
+        }
 
-                p("key display1-1-1 p") {
-                    t("display1-1-1 $value", key = "key display1-1-1")
+        div("content-section") {
+            div("welcome-card") {
+                t("Welcome to Renlin Framework")
+                css {
+                    fontSize = 30.px
+                    padding = 40.px
+                    textAlign = TextAlign.CENTER
+                    borderRadius = 12.px
+                    maxWidth = 800.px
+                    width = 100.percent
+                    marginBottom = 40.px
+                    marginLeft = 0.px
+                    marginRight = 0.px
+                }
+            }
 
-                    text {
-                        margin = "asd"
+            div("feature-grid") {
+                div("feature-card") {
+                    t("⚡ Fast Performance")
+                    p {
+                        t("Built for speed and efficiency with modern web technologies.")
                     }
                     css {
-                        color = if (value.last().digitToInt() % 2 == 0) Color.RED else Color.BLUE
-                        backgroundColor = if (value.last().digitToInt() % 2 == 0) Color.BLUE else Color.RED
-                        hover {
-                            cursor = Cursor.GRABBING
-                        }
+                        padding = 30.px
+                        margin = 20.px
+                        borderRadius = 8.px
+                        textAlign = TextAlign.CENTER
+                        width = 280.px
                     }
                 }
-            }
-        }
-        div("uuid aawaaaaaaaad") {
-            t("display2")
 
-            div("uuid aadaaaaaaa") {
-                t("display2-1")
+                div("feature-card") {
+                    t("🎨 Beautiful Design")
+                    p {
+                        t("Clean and modern interface that adapts to your needs.")
+                    }
+                    css {
+                        padding = 30.px
+                        margin = 20.px
+                        borderRadius = 8.px
+                        textAlign = TextAlign.CENTER
+                        width = 280.px
+                    }
+                }
 
-                css {
-                    userSelect = UserSelect.NONE
-                    hover {
-                        cursor = Cursor.POINTER
-                        backgroundColor = Color.rgba(0, 255, 255, 0.3)
+                div("feature-card") {
+                    t("Easy to Use")
+                    p {
+                        t("Simple and intuitive API for building amazing applications.")
                     }
-                    active {
-                        color = Color.RED
-                        fontWeight = FontWeight.BOLD
+                    css {
+                        padding = 30.px
+                        margin = 20.px
+                        borderRadius = 8.px
+                        textAlign = TextAlign.CENTER
+                        width = 280.px
                     }
                 }
+
+                css {
+                    display = Display.FLEX
+                    flexWrap = FlexWrap.WRAP
+                    maxWidth = 1200.px
+                    width = 100.percent
+                    padding = 40.px
+                    justifyContent = JustifyContent.CENTER
+                    marginLeft = 0.px
+                    marginRight = 0.px
+                }
             }
-        }
-        div("uuid aawaaaaaaaa") {
-            t("display3")
+
             css {
-                color = Color.YELLOW
-                backgroundColor = Color.BLUE
-                fontSize = 24.px
-                height = 100.px
-                padding = 1.percent
+                width = 100.percent
+                display = Display.FLEX
+                flexDirection = FlexDirection.COLUMN
+                alignItems = AlignItems.CENTER
             }
-
         }
+
+
     }
-    val controller = div.component {
-        t("controller")
+
+    val navigation = div.component {
+        div("nav-bar") {
+            div("nav-brand") {
+                t("=")
+                css {
+                    fontSize = 34.px
+                }
+            }
+            css {
+                position = Position.FIXED
+                top = 0.px
+                left = 0.px
+                width = 100.percent
+                height = 60.px
+                display = Display.FLEX
+                justifyContent = JustifyContent.SPACE_BETWEEN
+                alignItems = AlignItems.CENTER
+                padding = 20.px
+            }
+        }
     }
+
+    val footer = div.component { }
+
     val test = fragment<FlowContent>().component { }
     val test1 = fragment<PhrasingContent>().component { }
     val test2 = fragment<FlowPhrasingIntegration>().component { }
diff --git a/sample/src/jsMain/kotlin/net/kigawa/renlin/sample/Main.kt b/sample/src/jsMain/kotlin/net/kigawa/renlin/sample/Main.kt
index 217e30d..0223295 100644
--- a/sample/src/jsMain/kotlin/net/kigawa/renlin/sample/Main.kt
+++ b/sample/src/jsMain/kotlin/net/kigawa/renlin/sample/Main.kt
@@ -10,7 +10,9 @@ fun main() {
     val sub = Sub()
     val sample = SampleComponent("sample", sub)
     val dispatcher = HakateInitializer().newStateDispatcher()
+    println("Hello, world!")
     Entrypoint(root).render(sample.root, dispatcher)
+    println("Hello, world! 2")
     var i = 0
     window.setInterval(
         {