diff --git a/libs/geography/src/public_api.ts b/libs/geography/src/public_api.ts
index c078c9d2b0..42372f42ce 100644
--- a/libs/geography/src/public_api.ts
+++ b/libs/geography/src/public_api.ts
@@ -3,4 +3,3 @@
  */
 export * from './models/public_api';
 export * from './comparators/public_api';
-export * from './injection-tokens/public_api';
diff --git a/libs/geography/state/src/effects/geography.effects.ts b/libs/geography/state/src/effects/geography.effects.ts
index 3593964a37..c5ac3785c2 100644
--- a/libs/geography/state/src/effects/geography.effects.ts
+++ b/libs/geography/state/src/effects/geography.effects.ts
@@ -16,10 +16,7 @@ import {
 
 import { DaffError } from '@daffodil/core';
 import { ErrorTransformer } from '@daffodil/core/state';
-import {
-  DaffCountry,
-  DAFF_GEOGRAPHY_ERROR_MATCHER,
-} from '@daffodil/geography';
+import { DaffCountry } from '@daffodil/geography';
 import {
   DaffGeographyServiceInterface,
   DaffGeographyDriver,
@@ -34,6 +31,7 @@ import {
   DaffCountryListSuccess,
   DaffCountryListFailure,
 } from '../actions/public_api';
+import { DAFF_GEOGRAPHY_ERROR_MATCHER } from '../injection-tokens/public_api';
 
 @Injectable()
 export class DaffGeographyEffects<T extends DaffCountry> {
diff --git a/libs/geography/state/src/index.ts b/libs/geography/state/src/index.ts
index 60621ea210..4aaf8f92ed 100644
--- a/libs/geography/state/src/index.ts
+++ b/libs/geography/state/src/index.ts
@@ -1,7 +1 @@
-export * from './selectors/public_api';
-export * from './reducers/public_api';
-export * from './actions/public_api';
-
-export { DaffGeographyFacade } from './facades/geography/geography.facade';
-export { DaffGeographyFacadeInterface } from './facades/geography/geography-facade.interface';
-export { DaffGeographyStateModule } from './geography-state.module';
+export * from './public_api';
diff --git a/libs/geography/src/injection-tokens/error-matcher.token.ts b/libs/geography/state/src/injection-tokens/error-matcher.token.ts
similarity index 100%
rename from libs/geography/src/injection-tokens/error-matcher.token.ts
rename to libs/geography/state/src/injection-tokens/error-matcher.token.ts
diff --git a/libs/geography/src/injection-tokens/public_api.ts b/libs/geography/state/src/injection-tokens/public_api.ts
similarity index 100%
rename from libs/geography/src/injection-tokens/public_api.ts
rename to libs/geography/state/src/injection-tokens/public_api.ts
diff --git a/libs/geography/state/src/public_api.ts b/libs/geography/state/src/public_api.ts
new file mode 100644
index 0000000000..4f2b3cd058
--- /dev/null
+++ b/libs/geography/state/src/public_api.ts
@@ -0,0 +1,8 @@
+export * from './selectors/public_api';
+export * from './reducers/public_api';
+export * from './actions/public_api';
+export * from './injection-tokens/public_api';
+
+export { DaffGeographyFacade } from './facades/geography/geography.facade';
+export { DaffGeographyFacadeInterface } from './facades/geography/geography-facade.interface';
+export { DaffGeographyStateModule } from './geography-state.module';