diff --git a/dlt-connector/src/client/GradidoNode/GradidoNodeClient.ts b/dlt-connector/src/client/GradidoNode/GradidoNodeClient.ts
index 9f43b95ef..efbfc6d22 100644
--- a/dlt-connector/src/client/GradidoNode/GradidoNodeClient.ts
+++ b/dlt-connector/src/client/GradidoNode/GradidoNodeClient.ts
@@ -5,12 +5,12 @@ import { getLogger, Logger } from 'log4js'
 import * as v from 'valibot'
 import { CONFIG } from '../../config'
 import { LOG4JS_BASE_CATEGORY } from '../../config/const'
+import { AddressType } from '../../data/AddressType.enum'
 import { Uuidv4Hash } from '../../data/Uuidv4Hash'
-import { AddressType } from '../../enum/AddressType'
-import { GradidoNodeErrorCodes } from '../../enum/GradidoNodeErrorCodes'
 import { addressTypeSchema, confirmedTransactionSchema } from '../../schemas/typeConverter.schema'
 import { Hex32, Hex32Input, HieroId, hex32Schema } from '../../schemas/typeGuard.schema'
 import { isPortOpenRetry } from '../../utils/network'
+import { GradidoNodeErrorCodes } from './GradidoNodeErrorCodes'
 import {
   TransactionIdentifierInput,
   TransactionsRangeInput,
diff --git a/dlt-connector/src/enum/GradidoNodeErrorCodes.ts b/dlt-connector/src/client/GradidoNode/GradidoNodeErrorCodes.ts
similarity index 100%
rename from dlt-connector/src/enum/GradidoNodeErrorCodes.ts
rename to dlt-connector/src/client/GradidoNode/GradidoNodeErrorCodes.ts
diff --git a/dlt-connector/src/enum/AccountType.ts b/dlt-connector/src/data/AccountType.enum.ts
similarity index 100%
rename from dlt-connector/src/enum/AccountType.ts
rename to dlt-connector/src/data/AccountType.enum.ts
diff --git a/dlt-connector/src/enum/AddressType.ts b/dlt-connector/src/data/AddressType.enum.ts
similarity index 100%
rename from dlt-connector/src/enum/AddressType.ts
rename to dlt-connector/src/data/AddressType.enum.ts
diff --git a/dlt-connector/src/enum/InputTransactionType.ts b/dlt-connector/src/data/InputTransactionType.enum.ts
similarity index 100%
rename from dlt-connector/src/enum/InputTransactionType.ts
rename to dlt-connector/src/data/InputTransactionType.enum.ts
diff --git a/dlt-connector/src/enum/TransactionErrorType.ts b/dlt-connector/src/enum/TransactionErrorType.ts
deleted file mode 100644
index 0da6ebb53..000000000
--- a/dlt-connector/src/enum/TransactionErrorType.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// enum for graphql
-// error groups for resolver answers
-export enum TransactionErrorType {
-  NOT_IMPLEMENTED_YET = 'Not Implemented yet',
-  MISSING_PARAMETER = 'Missing parameter',
-  INVALID_PARAMETER = 'Invalid parameter',
-  ALREADY_EXIST = 'Already exist',
-  DB_ERROR = 'DB Error',
-  PROTO_DECODE_ERROR = 'Proto Decode Error',
-  PROTO_ENCODE_ERROR = 'Proto Encode Error',
-  INVALID_SIGNATURE = 'Invalid Signature',
-  LOGIC_ERROR = 'Logic Error',
-  NOT_FOUND = 'Not found',
-  VALIDATION_ERROR = 'Validation Error',
-}
diff --git a/dlt-connector/src/interactions/sendToHiero/SendToHiero.context.ts b/dlt-connector/src/interactions/sendToHiero/SendToHiero.context.ts
index e3ab0b7ed..1dd74976c 100644
--- a/dlt-connector/src/interactions/sendToHiero/SendToHiero.context.ts
+++ b/dlt-connector/src/interactions/sendToHiero/SendToHiero.context.ts
@@ -9,7 +9,7 @@ import { getLogger } from 'log4js'
 import * as v from 'valibot'
 import { HieroClient } from '../../client/hiero/HieroClient'
 import { LOG4JS_BASE_CATEGORY } from '../../config/const'
-import { InputTransactionType } from '../../enum/InputTransactionType'
+import { InputTransactionType } from '../../data/InputTransactionType.enum'
 import {
   CommunityInput,
   communitySchema,
diff --git a/dlt-connector/src/schemas/transaction.schema.test.ts b/dlt-connector/src/schemas/transaction.schema.test.ts
index 533cd35b9..de22e98ba 100644
--- a/dlt-connector/src/schemas/transaction.schema.test.ts
+++ b/dlt-connector/src/schemas/transaction.schema.test.ts
@@ -5,8 +5,8 @@ import { randomBytes } from 'crypto'
 import { AddressType_COMMUNITY_HUMAN } from 'gradido-blockchain-js'
 import { v4 as uuidv4 } from 'uuid'
 import * as v from 'valibot'
-import { AccountType } from '../enum/AccountType'
-import { InputTransactionType } from '../enum/InputTransactionType'
+import { AccountType } from '../data/AccountType.enum'
+import { InputTransactionType } from '../data/InputTransactionType.enum'
 import {
   gradidoAmountSchema,
   HieroId,
diff --git a/dlt-connector/src/schemas/transaction.schema.ts b/dlt-connector/src/schemas/transaction.schema.ts
index dea8c48dc..b018a8e86 100644
--- a/dlt-connector/src/schemas/transaction.schema.ts
+++ b/dlt-connector/src/schemas/transaction.schema.ts
@@ -1,6 +1,6 @@
 import * as v from 'valibot'
-import { AccountType } from '../enum/AccountType'
-import { InputTransactionType } from '../enum/InputTransactionType'
+import { AccountType } from '../data/AccountType.enum'
+import { InputTransactionType } from '../data/InputTransactionType.enum'
 import { identifierAccountSchema, identifierCommunityAccountSchema } from './account.schema'
 import { addressTypeSchema, dateSchema } from './typeConverter.schema'
 import {
diff --git a/dlt-connector/src/schemas/typeConverter.schema.test.ts b/dlt-connector/src/schemas/typeConverter.schema.test.ts
index 2caa499b5..5420de106 100644
--- a/dlt-connector/src/schemas/typeConverter.schema.test.ts
+++ b/dlt-connector/src/schemas/typeConverter.schema.test.ts
@@ -4,7 +4,7 @@ import { TypeCompiler } from '@sinclair/typebox/compiler'
 import { Static, TypeBoxFromValibot } from '@sinclair/typemap'
 import { AddressType_COMMUNITY_AUF } from 'gradido-blockchain-js'
 import * as v from 'valibot'
-import { AccountType } from '../enum/AccountType'
+import { AccountType } from '../data/AccountType.enum'
 import {
   accountTypeSchema,
   addressTypeSchema,
diff --git a/dlt-connector/src/schemas/typeConverter.schema.ts b/dlt-connector/src/schemas/typeConverter.schema.ts
index 2e4811c11..3d68cfe24 100644
--- a/dlt-connector/src/schemas/typeConverter.schema.ts
+++ b/dlt-connector/src/schemas/typeConverter.schema.ts
@@ -1,7 +1,7 @@
 import { ConfirmedTransaction } from 'gradido-blockchain-js'
 import * as v from 'valibot'
-import { AccountType } from '../enum/AccountType'
-import { AddressType } from '../enum/AddressType'
+import { AccountType } from '../data/AccountType.enum'
+import { AddressType } from '../data/AddressType.enum'
 import {
   confirmedTransactionFromBase64,
   isAddressType,
diff --git a/dlt-connector/src/utils/typeConverter.ts b/dlt-connector/src/utils/typeConverter.ts
index 5b1279beb..148efebd6 100644
--- a/dlt-connector/src/utils/typeConverter.ts
+++ b/dlt-connector/src/utils/typeConverter.ts
@@ -4,8 +4,8 @@ import {
   InteractionDeserialize,
   MemoryBlock,
 } from 'gradido-blockchain-js'
-import { AccountType } from '../enum/AccountType'
-import { AddressType } from '../enum/AddressType'
+import { AccountType } from '../data/AccountType.enum'
+import { AddressType } from '../data/AddressType.enum'
 
 export const confirmedTransactionFromBase64 = (base64: string): ConfirmedTransaction => {
   const confirmedTransactionBinaryPtr = MemoryBlock.createPtr(MemoryBlock.fromBase64(base64))