diff --git a/packages/effect-fc/src/Component.ts b/packages/effect-fc/src/Component.ts
index 7383963..061acad 100644
--- a/packages/effect-fc/src/Component.ts
+++ b/packages/effect-fc/src/Component.ts
@@ -1,6 +1,6 @@
 import { Context, Effect, Effectable, ExecutionStrategy, Function, Predicate, Runtime, Scope, Tracer, type Types, type Utils } from "effect"
 import * as React from "react"
-import { Hooks } from "./hooks/index.js"
+import * as Hooks from "./Hooks/index.js"
 import { Memoized } from "./index.js"
 
 
diff --git a/packages/effect-fc/src/Form.ts b/packages/effect-fc/src/Form.ts
index 2ff3909..94d91b4 100644
--- a/packages/effect-fc/src/Form.ts
+++ b/packages/effect-fc/src/Form.ts
@@ -3,7 +3,9 @@ import { Array, Cause, Chunk, Duration, Effect, Equal, Exit, Fiber, flow, identi
 import type { NoSuchElementException } from "effect/Cause"
 import * as React from "react"
 import * as Hooks from "./Hooks/index.js"
-import { PropertyPath, Subscribable as SubscribableInternal, SubscriptionSubRef } from "./types/index.js"
+import * as PropertyPath from "./PropertyPath.js"
+import * as SubscribableInternal from "./Subscribable.js"
+import * as SubscriptionSubRef from "./SubscriptionSubRef.js"
 
 
 export const FormTypeId: unique symbol = Symbol.for("effect-fc/Form")
diff --git a/packages/effect-fc/src/Hooks/input/useOptionalInput.ts b/packages/effect-fc/src/Hooks/input/useOptionalInput.ts
index cae2e23..0f519aa 100644
--- a/packages/effect-fc/src/Hooks/input/useOptionalInput.ts
+++ b/packages/effect-fc/src/Hooks/input/useOptionalInput.ts
@@ -1,6 +1,6 @@
 import { type Duration, Effect, Equal, Equivalence, flow, identity, Option, type ParseResult, Ref, Schema, Stream, SubscriptionRef } from "effect"
 import * as React from "react"
-import { SetStateAction } from "../../../types/index.js"
+import * as SetStateAction from "../../SetStateAction.js"
 import { useCallbackSync } from "../useCallbackSync.js"
 import { useFork } from "../useFork.js"
 import { useOnce } from "../useOnce.js"
diff --git a/packages/effect-fc/src/Hooks/useRefState.ts b/packages/effect-fc/src/Hooks/useRefState.ts
index 6cc3980..e6bae8b 100644
--- a/packages/effect-fc/src/Hooks/useRefState.ts
+++ b/packages/effect-fc/src/Hooks/useRefState.ts
@@ -1,6 +1,6 @@
 import { Effect, Equivalence, Ref, Stream, SubscriptionRef } from "effect"
 import * as React from "react"
-import { SetStateAction } from "../../types/index.js"
+import * as SetStateAction from "../SetStateAction.js"
 import { useCallbackSync } from "./useCallbackSync.js"
 import { useFork } from "./useFork.js"
 import { useOnce } from "./useOnce.js"
diff --git a/packages/effect-fc/src/types/PropertyPath.ts b/packages/effect-fc/src/PropertyPath.ts
similarity index 100%
rename from packages/effect-fc/src/types/PropertyPath.ts
rename to packages/effect-fc/src/PropertyPath.ts
diff --git a/packages/effect-fc/src/types/SetStateAction.ts b/packages/effect-fc/src/SetStateAction.ts
similarity index 100%
rename from packages/effect-fc/src/types/SetStateAction.ts
rename to packages/effect-fc/src/SetStateAction.ts
diff --git a/packages/effect-fc/src/types/Subscribable.ts b/packages/effect-fc/src/Subscribable.ts
similarity index 100%
rename from packages/effect-fc/src/types/Subscribable.ts
rename to packages/effect-fc/src/Subscribable.ts
diff --git a/packages/effect-fc/src/types/SubscriptionSubRef.ts b/packages/effect-fc/src/SubscriptionSubRef.ts
similarity index 99%
rename from packages/effect-fc/src/types/SubscriptionSubRef.ts
rename to packages/effect-fc/src/SubscriptionSubRef.ts
index c007397..8533999 100644
--- a/packages/effect-fc/src/types/SubscriptionSubRef.ts
+++ b/packages/effect-fc/src/SubscriptionSubRef.ts
@@ -2,7 +2,7 @@ import { Chunk, Effect, Effectable, Option, Predicate, Readable, Ref, Stream, Su
 import * as PropertyPath from "./PropertyPath.js"
 
 
-export const SubscriptionSubRefTypeId: unique symbol = Symbol.for("effect-fc/types/SubscriptionSubRef")
+export const SubscriptionSubRefTypeId: unique symbol = Symbol.for("effect-fc/SubscriptionSubRef")
 export type SubscriptionSubRefTypeId = typeof SubscriptionSubRefTypeId
 
 export interface SubscriptionSubRef<in out A, in out B extends SubscriptionRef.SubscriptionRef<any>>
diff --git a/packages/effect-fc/src/index.ts b/packages/effect-fc/src/index.ts
index 0a7e9af..b2227e8 100644
--- a/packages/effect-fc/src/index.ts
+++ b/packages/effect-fc/src/index.ts
@@ -3,4 +3,8 @@ export * as Component from "./Component.js"
 export * as Form from "./Form.js"
 export * as Hooks from "./Hooks/index.js"
 export * as Memoized from "./Memoized.js"
+export * as PropertyPath from "./PropertyPath.js"
 export * as ReactRuntime from "./ReactRuntime.js"
+export * as SetStateAction from "./SetStateAction.js"
+export * as Subscribable from "./Subscribable.js"
+export * as SubscriptionSubRef from "./SubscriptionSubRef.js"
diff --git a/packages/effect-fc/src/types/index.ts b/packages/effect-fc/src/types/index.ts
deleted file mode 100644
index 6273110..0000000
--- a/packages/effect-fc/src/types/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * as PropertyPath from "./PropertyPath.js"
-export * as SetStateAction from "./SetStateAction.js"
-export * as Subscribable from "./Subscribable.js"
-export * as SubscriptionSubRef from "./SubscriptionSubRef.js"