diff --git a/core/src/index.ts b/core/src/index.ts
index 1c7817fb4..3bbfdc578 100644
--- a/core/src/index.ts
+++ b/core/src/index.ts
@@ -28,7 +28,6 @@ export * from './graphql/logic/storeForeignUser'
 export * from './graphql/model/CommandResult'
 export * from './graphql/model/Decay'
 export * from './graphql/model/EncryptedTransferArgs'
-export * from './graphql/resolver/CommandResolver'
 export * from './logic'
 export * from './util/calculateSenderBalance'
 export * from './util/utilities'
diff --git a/core/tsconfig.json b/core/tsconfig.json
index 711c21cc9..9b7d654d2 100644
--- a/core/tsconfig.json
+++ b/core/tsconfig.json
@@ -76,7 +76,6 @@
   },
   "include": [
     "src/**/*.ts",
-    "src/**/*.json",
   ],
   "references": [],                                  /* Any project that is referenced must itself have a `references` array (which may be empty). */
   "exclude": ["**/*.test.ts", "**/*.spec.ts", "test/*", "**/bun.d.ts", "esbuild.config.ts"],
diff --git a/core/src/graphql/resolver/CommandResolver.ts b/federation/src/graphql/api/1_0/resolver/CommandResolver.ts
similarity index 68%
rename from core/src/graphql/resolver/CommandResolver.ts
rename to federation/src/graphql/api/1_0/resolver/CommandResolver.ts
index d5a1de360..1302f62f0 100644
--- a/core/src/graphql/resolver/CommandResolver.ts
+++ b/federation/src/graphql/api/1_0/resolver/CommandResolver.ts
@@ -1,8 +1,7 @@
-// backend/src/graphql/resolver/CommandResolver.ts
 import { Resolver, Mutation, Arg, Ctx } from 'type-graphql';
-import { CommandExecutor } from '../../command/CommandExecutor';
-import { CommandResult } from '../model/CommandResult';
-import { EncryptedTransferArgs } from '../model/EncryptedTransferArgs';
+import { CommandExecutor } from 'core';
+import { CommandResult } from 'core';
+import { EncryptedTransferArgs } from 'core';
 
 @Resolver()
 export class CommandResolver {
diff --git a/federation/src/graphql/api/1_0/schema.ts b/federation/src/graphql/api/1_0/schema.ts
index 9c4741549..ebb885755 100644
--- a/federation/src/graphql/api/1_0/schema.ts
+++ b/federation/src/graphql/api/1_0/schema.ts
@@ -1,6 +1,6 @@
 import { NonEmptyArray } from 'type-graphql'
 import { AuthenticationResolver } from './resolver/AuthenticationResolver'
-import { CommandResolver } from 'core'
+import { CommandResolver } from './resolver/CommandResolver'
 import { DisbursementResolver } from './resolver/DisbursementResolver'
 import { PublicCommunityInfoResolver } from './resolver/PublicCommunityInfoResolver'
 import { PublicKeyResolver } from './resolver/PublicKeyResolver'
diff --git a/federation/src/graphql/api/1_1/schema.ts b/federation/src/graphql/api/1_1/schema.ts
index 07871cefa..891c83dc9 100644
--- a/federation/src/graphql/api/1_1/schema.ts
+++ b/federation/src/graphql/api/1_1/schema.ts
@@ -3,7 +3,8 @@ import { AuthenticationResolver } from '../1_0/resolver/AuthenticationResolver'
 import { PublicCommunityInfoResolver } from '../1_0/resolver/PublicCommunityInfoResolver'
 import { SendCoinsResolver } from '../1_0/resolver/SendCoinsResolver'
 import { PublicKeyResolver } from './resolver/PublicKeyResolver'
+import { CommandResolver } from '../1_0/resolver/CommandResolver'
 
 export const getApiResolvers = (): NonEmptyArray<Function> => {
-  return [AuthenticationResolver, PublicCommunityInfoResolver, PublicKeyResolver, SendCoinsResolver]
+  return [AuthenticationResolver, CommandResolver, PublicCommunityInfoResolver, PublicKeyResolver, SendCoinsResolver]
 }