diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index 34560604..386a98f8 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -44,7 +44,7 @@ jobs:
         run: |
           cat release-plan.json
           if [ $(jq '.releases | length' release-plan.json) -eq 0 ]; then
-            echo "No new releases available :("
+            printf "\nNo new releases available :("
           else
             echo "upgrade_ui_deps=yes" >> $GITHUB_OUTPUT
           fi
@@ -103,7 +103,7 @@ jobs:
         uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.TARGET_REPO_PAT }}
-          title: '🧚 SDK Preview >> ${{ env.PR_TITLE }}'
+          title: '🧚 SDK Preview: [${{ env.PR_TITLE }}]'
           body: |
             This PR was triggered by SDK upgrade no. ${{ env.PR }}
 
diff --git a/packages/xcm-cfg/src/clients/base.ts b/packages/xcm-cfg/src/clients/balance.ts
similarity index 96%
rename from packages/xcm-cfg/src/clients/base.ts
rename to packages/xcm-cfg/src/clients/balance.ts
index cf96a80b..812d55a3 100644
--- a/packages/xcm-cfg/src/clients/base.ts
+++ b/packages/xcm-cfg/src/clients/balance.ts
@@ -6,7 +6,7 @@ import {
   PalletBalancesAccountData,
 } from '@polkadot/types/lookup';
 
-export abstract class ParachainClient {
+export abstract class BalanceClient {
   readonly chain: Parachain;
 
   constructor(chain: Parachain) {
diff --git a/packages/xcm-cfg/src/clients/hub.ts b/packages/xcm-cfg/src/clients/chain/hub.ts
similarity index 91%
rename from packages/xcm-cfg/src/clients/hub.ts
rename to packages/xcm-cfg/src/clients/chain/hub.ts
index b987d325..af4aba0e 100644
--- a/packages/xcm-cfg/src/clients/hub.ts
+++ b/packages/xcm-cfg/src/clients/chain/hub.ts
@@ -6,9 +6,9 @@ import type {
 } from '@polkadot/types/lookup';
 import { Option } from '@polkadot/types';
 
-import { ParachainClient } from './base';
+import { BalanceClient } from '../balance';
 
-export class HubClient extends ParachainClient {
+export class HubClient extends BalanceClient {
   constructor(chain: Parachain) {
     super(chain);
   }
diff --git a/packages/xcm-cfg/src/clients/hydration.ts b/packages/xcm-cfg/src/clients/chain/hydration.ts
similarity index 92%
rename from packages/xcm-cfg/src/clients/hydration.ts
rename to packages/xcm-cfg/src/clients/chain/hydration.ts
index 33e7f350..8b13e307 100644
--- a/packages/xcm-cfg/src/clients/hydration.ts
+++ b/packages/xcm-cfg/src/clients/chain/hydration.ts
@@ -3,9 +3,9 @@ import { Asset, Parachain } from '@galacticcouncil/xcm-core';
 import type { PalletAssetRegistryAssetDetails } from '@polkadot/types/lookup';
 import { Option } from '@polkadot/types';
 
-import { ParachainClient } from './base';
+import { BalanceClient } from '../balance';
 
-export class HydrationClient extends ParachainClient {
+export class HydrationClient extends BalanceClient {
   constructor(chain: Parachain) {
     super(chain);
   }
diff --git a/packages/xcm-cfg/src/clients/chain/index.ts b/packages/xcm-cfg/src/clients/chain/index.ts
new file mode 100644
index 00000000..c2c9af11
--- /dev/null
+++ b/packages/xcm-cfg/src/clients/chain/index.ts
@@ -0,0 +1,2 @@
+export * from './hub';
+export * from './hydration';
diff --git a/packages/xcm-cfg/src/clients/index.ts b/packages/xcm-cfg/src/clients/index.ts
index c2c9af11..481a3404 100644
--- a/packages/xcm-cfg/src/clients/index.ts
+++ b/packages/xcm-cfg/src/clients/index.ts
@@ -1,2 +1 @@
-export * from './hub';
-export * from './hydration';
+export * from './chain';