diff --git a/packages/effect-fc/src/hooks/Hooks/index.ts b/packages/effect-fc/src/hooks/Hooks/index.ts
index a788fb9..cfbc1ce 100644
--- a/packages/effect-fc/src/hooks/Hooks/index.ts
+++ b/packages/effect-fc/src/hooks/Hooks/index.ts
@@ -1,14 +1,13 @@
+export * from "./input/index.js"
 export * from "./ScopeOptions.js"
 export * from "./useCallbackPromise.js"
 export * from "./useCallbackSync.js"
 export * from "./useContext.js"
 export * from "./useEffect.js"
 export * from "./useFork.js"
-export * from "./useInput.js"
 export * from "./useLayoutEffect.js"
 export * from "./useMemo.js"
 export * from "./useOnce.js"
-export * from "./useOptionalInput.js"
 export * from "./useRefFromState.js"
 export * from "./useRefState.js"
 export * from "./useScope.js"
diff --git a/packages/effect-fc/src/hooks/Hooks/input/index.ts b/packages/effect-fc/src/hooks/Hooks/input/index.ts
new file mode 100644
index 0000000..bc1c4dc
--- /dev/null
+++ b/packages/effect-fc/src/hooks/Hooks/input/index.ts
@@ -0,0 +1,2 @@
+export * from "./useInput.js"
+export * from "./useOptionalInput.js"
diff --git a/packages/effect-fc/src/hooks/Hooks/useInput.ts b/packages/effect-fc/src/hooks/Hooks/input/useInput.ts
similarity index 95%
rename from packages/effect-fc/src/hooks/Hooks/useInput.ts
rename to packages/effect-fc/src/hooks/Hooks/input/useInput.ts
index 9d7a483..93cee62 100644
--- a/packages/effect-fc/src/hooks/Hooks/useInput.ts
+++ b/packages/effect-fc/src/hooks/Hooks/input/useInput.ts
@@ -1,8 +1,8 @@
 import { type Duration, Effect, Equal, type Equivalence, flow, identity, Option, type ParseResult, Ref, Schema, Stream, SubscriptionRef } from "effect"
 import * as React from "react"
-import { useFork } from "./useFork.js"
-import { useOnce } from "./useOnce.js"
-import { useRefState } from "./useRefState.js"
+import { useFork } from "../useFork.js"
+import { useOnce } from "../useOnce.js"
+import { useRefState } from "../useRefState.js"
 
 
 export namespace useInput {
diff --git a/packages/effect-fc/src/hooks/Hooks/useOptionalInput.ts b/packages/effect-fc/src/hooks/Hooks/input/useOptionalInput.ts
similarity index 93%
rename from packages/effect-fc/src/hooks/Hooks/useOptionalInput.ts
rename to packages/effect-fc/src/hooks/Hooks/input/useOptionalInput.ts
index 837739b..5b58530 100644
--- a/packages/effect-fc/src/hooks/Hooks/useOptionalInput.ts
+++ b/packages/effect-fc/src/hooks/Hooks/input/useOptionalInput.ts
@@ -1,11 +1,11 @@
 import { type Duration, Effect, Equal, type Equivalence, flow, identity, Option, type ParseResult, Ref, Schema, Stream, SubscriptionRef } from "effect"
 import * as React from "react"
-import { SetStateAction } from "../../types/index.js"
-import { useCallbackSync } from "./useCallbackSync.js"
-import { useFork } from "./useFork.js"
-import { useOnce } from "./useOnce.js"
-import { useRefState } from "./useRefState.js"
-import { useSubscribeRefs } from "./useSubscribeRefs.js"
+import { SetStateAction } from "../../../types/index.js"
+import { useCallbackSync } from "../useCallbackSync.js"
+import { useFork } from "../useFork.js"
+import { useOnce } from "../useOnce.js"
+import { useRefState } from "../useRefState.js"
+import { useSubscribeRefs } from "../useSubscribeRefs.js"
 
 
 export namespace useOptionalInput {