diff --git a/packages/effect-fc/src/types/Form.ts b/packages/effect-fc/src/Form.ts
similarity index 91%
rename from packages/effect-fc/src/types/Form.ts
rename to packages/effect-fc/src/Form.ts
index e3af1d8..9111990 100644
--- a/packages/effect-fc/src/types/Form.ts
+++ b/packages/effect-fc/src/Form.ts
@@ -1,8 +1,6 @@
 import { Array, Effect, Option, ParseResult, Pipeable, Schema, Stream, Subscribable, SubscriptionRef } from "effect"
 import * as React from "react"
-import { SubscriptionSubRef } from "./index.js"
-import * as PropertyPath from "./PropertyPath.js"
-import * as InternalSubscribable from "./Subscribable.js"
+import { PropertyPath, Subscribable as SubscribableInternal, SubscriptionSubRef } from "./types/index.js"
 
 
 export const TypeId: unique symbol = Symbol.for("effect-fc/Form")
@@ -45,7 +43,7 @@ extends Pipeable.Class() implements Form<A, I, R> {
             })
 
             const errorSubscribable = this.errorSubscribable
-            return InternalSubscribable.make({
+            return SubscribableInternal.make({
                 get: Effect.andThen(errorSubscribable.get, filter),
                 get changes() { return Stream.flatMap(errorSubscribable.changes, filter) },
             })
diff --git a/packages/effect-fc/src/index.ts b/packages/effect-fc/src/index.ts
index 2545011..1595021 100644
--- a/packages/effect-fc/src/index.ts
+++ b/packages/effect-fc/src/index.ts
@@ -1,4 +1,5 @@
 export * as Component from "./Component.js"
+export * as Form from "./Form.js"
 export * as Memo from "./Memo.js"
 export * as ReactRuntime from "./ReactRuntime.js"
 export * as Suspense from "./Suspense.js"