diff --git a/packages/effect-fc/src/hooks/ScopeOptions.ts b/packages/effect-fc/src/hooks/Hooks/ScopeOptions.ts
similarity index 100%
rename from packages/effect-fc/src/hooks/ScopeOptions.ts
rename to packages/effect-fc/src/hooks/Hooks/ScopeOptions.ts
diff --git a/packages/effect-fc/src/hooks/Hooks.ts b/packages/effect-fc/src/hooks/Hooks/index.ts
similarity index 100%
rename from packages/effect-fc/src/hooks/Hooks.ts
rename to packages/effect-fc/src/hooks/Hooks/index.ts
diff --git a/packages/effect-fc/src/hooks/internal.ts b/packages/effect-fc/src/hooks/Hooks/internal.ts
similarity index 100%
rename from packages/effect-fc/src/hooks/internal.ts
rename to packages/effect-fc/src/hooks/Hooks/internal.ts
diff --git a/packages/effect-fc/src/hooks/useCallbackPromise.ts b/packages/effect-fc/src/hooks/Hooks/useCallbackPromise.ts
similarity index 100%
rename from packages/effect-fc/src/hooks/useCallbackPromise.ts
rename to packages/effect-fc/src/hooks/Hooks/useCallbackPromise.ts
diff --git a/packages/effect-fc/src/hooks/useCallbackSync.ts b/packages/effect-fc/src/hooks/Hooks/useCallbackSync.ts
similarity index 100%
rename from packages/effect-fc/src/hooks/useCallbackSync.ts
rename to packages/effect-fc/src/hooks/Hooks/useCallbackSync.ts
diff --git a/packages/effect-fc/src/hooks/useContext.ts b/packages/effect-fc/src/hooks/Hooks/useContext.ts
similarity index 100%
rename from packages/effect-fc/src/hooks/useContext.ts
rename to packages/effect-fc/src/hooks/Hooks/useContext.ts
diff --git a/packages/effect-fc/src/hooks/useEffect.ts b/packages/effect-fc/src/hooks/Hooks/useEffect.ts
similarity index 100%
rename from packages/effect-fc/src/hooks/useEffect.ts
rename to packages/effect-fc/src/hooks/Hooks/useEffect.ts
diff --git a/packages/effect-fc/src/hooks/useFork.ts b/packages/effect-fc/src/hooks/Hooks/useFork.ts
similarity index 100%
rename from packages/effect-fc/src/hooks/useFork.ts
rename to packages/effect-fc/src/hooks/Hooks/useFork.ts
diff --git a/packages/effect-fc/src/hooks/useLayoutEffect.ts b/packages/effect-fc/src/hooks/Hooks/useLayoutEffect.ts
similarity index 100%
rename from packages/effect-fc/src/hooks/useLayoutEffect.ts
rename to packages/effect-fc/src/hooks/Hooks/useLayoutEffect.ts
diff --git a/packages/effect-fc/src/hooks/useMemo.ts b/packages/effect-fc/src/hooks/Hooks/useMemo.ts
similarity index 100%
rename from packages/effect-fc/src/hooks/useMemo.ts
rename to packages/effect-fc/src/hooks/Hooks/useMemo.ts
diff --git a/packages/effect-fc/src/hooks/useOnce.ts b/packages/effect-fc/src/hooks/Hooks/useOnce.ts
similarity index 100%
rename from packages/effect-fc/src/hooks/useOnce.ts
rename to packages/effect-fc/src/hooks/Hooks/useOnce.ts
diff --git a/packages/effect-fc/src/hooks/useRefFromReactiveValue.ts b/packages/effect-fc/src/hooks/Hooks/useRefFromReactiveValue.ts
similarity index 100%
rename from packages/effect-fc/src/hooks/useRefFromReactiveValue.ts
rename to packages/effect-fc/src/hooks/Hooks/useRefFromReactiveValue.ts
diff --git a/packages/effect-fc/src/hooks/useRefState.ts b/packages/effect-fc/src/hooks/Hooks/useRefState.ts
similarity index 94%
rename from packages/effect-fc/src/hooks/useRefState.ts
rename to packages/effect-fc/src/hooks/Hooks/useRefState.ts
index d1fa07f..9698a73 100644
--- a/packages/effect-fc/src/hooks/useRefState.ts
+++ b/packages/effect-fc/src/hooks/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 { SetStateAction } from "../../types/index.js"
 import { useCallbackSync } from "./useCallbackSync.js"
 import { useFork } from "./useFork.js"
 import { useOnce } from "./useOnce.js"
diff --git a/packages/effect-fc/src/hooks/useScope.ts b/packages/effect-fc/src/hooks/Hooks/useScope.ts
similarity index 100%
rename from packages/effect-fc/src/hooks/useScope.ts
rename to packages/effect-fc/src/hooks/Hooks/useScope.ts
diff --git a/packages/effect-fc/src/hooks/useStreamFromReactiveValues.ts b/packages/effect-fc/src/hooks/Hooks/useStreamFromReactiveValues.ts
similarity index 100%
rename from packages/effect-fc/src/hooks/useStreamFromReactiveValues.ts
rename to packages/effect-fc/src/hooks/Hooks/useStreamFromReactiveValues.ts
diff --git a/packages/effect-fc/src/hooks/useSubscribeRefs.ts b/packages/effect-fc/src/hooks/Hooks/useSubscribeRefs.ts
similarity index 100%
rename from packages/effect-fc/src/hooks/useSubscribeRefs.ts
rename to packages/effect-fc/src/hooks/Hooks/useSubscribeRefs.ts
diff --git a/packages/effect-fc/src/hooks/useSubscribeStream.ts b/packages/effect-fc/src/hooks/Hooks/useSubscribeStream.ts
similarity index 100%
rename from packages/effect-fc/src/hooks/useSubscribeStream.ts
rename to packages/effect-fc/src/hooks/Hooks/useSubscribeStream.ts
diff --git a/packages/effect-fc/src/hooks/index.ts b/packages/effect-fc/src/hooks/index.ts
index e1811a5..6192316 100644
--- a/packages/effect-fc/src/hooks/index.ts
+++ b/packages/effect-fc/src/hooks/index.ts
@@ -1,2 +1,2 @@
-export * from "./Hooks.js"
-export * as Hooks from "./Hooks.js"
+export * from "./Hooks/index.js"
+export * as Hooks from "./Hooks/index.js"