diff --git a/apps/cic-staff-client/src/app/_services/transaction.service.ts b/apps/cic-staff-client/src/app/_services/transaction.service.ts
index c78642e3..b7326e4b 100644
--- a/apps/cic-staff-client/src/app/_services/transaction.service.ts
+++ b/apps/cic-staff-client/src/app/_services/transaction.service.ts
@@ -6,9 +6,9 @@ import { Envelope, User } from 'cic-client-meta';
 import { UserService } from '@app/_services/user.service';
 import { Keccak } from 'sha3';
 import { utils } from 'ethers';
-import { add0x, fromHex, strip0x, toHex } from '@src/assets/js/ethtx/dist/hex';
-import { Tx } from '@src/assets/js/ethtx/dist';
-import { toValue } from '@src/assets/js/ethtx/dist/tx';
+import { add0x, fromHex, strip0x, toHex } from '@src/assets/js/ethtx/hex';
+import { Tx } from '@src/assets/js/ethtx';
+import { toValue } from '@src/assets/js/ethtx/tx';
 import * as secp256k1 from 'secp256k1';
 import { defaultAccount } from '@app/_models';
 import { LoggingService } from '@app/_services/logging.service';
diff --git a/apps/cic-staff-client/src/app/_services/user.service.ts b/apps/cic-staff-client/src/app/_services/user.service.ts
index cf6a0446..077563cd 100644
--- a/apps/cic-staff-client/src/app/_services/user.service.ts
+++ b/apps/cic-staff-client/src/app/_services/user.service.ts
@@ -11,7 +11,7 @@ import { MutableKeyStore, PGPSigner, Signer } from '@app/_pgp';
 import { RegistryService } from '@app/_services/registry.service';
 import { CICRegistry } from '@cicnet/cic-client';
 import { personValidation, updateSyncable, vcardValidation } from '@app/_helpers';
-import { add0x, strip0x } from '@src/assets/js/ethtx/dist/hex';
+import { add0x, strip0x } from '@src/assets/js/ethtx/hex';
 import { KeystoreService } from '@app/_services/keystore.service';
 import * as Automerge from 'automerge';
 const vCard = require('vcard-parser');
diff --git a/apps/cic-staff-client/src/app/_workers/fetch-accounts.worker.ts b/apps/cic-staff-client/src/app/_workers/fetch-accounts.worker.ts
index ed11dec9..7146832d 100644
--- a/apps/cic-staff-client/src/app/_workers/fetch-accounts.worker.ts
+++ b/apps/cic-staff-client/src/app/_workers/fetch-accounts.worker.ts
@@ -1,7 +1,7 @@
 /// <reference lib="webworker" />
 
 import { Envelope, Syncable, User } from 'cic-client-meta';
-import { add0x } from '@src/assets/js/ethtx/dist/hex';
+import { add0x } from '@src/assets/js/ethtx/hex';
 import { personValidation, vcardValidation } from '@app/_helpers/schema-validation';
 import * as vCard from 'vcard-parser';
 
@@ -29,7 +29,7 @@ addEventListener('message', async ({ data }) => {
 async function getAccountByAddress(
   accountAddress: string,
   metaUrl: string,
-  token: string
+  token: string,
 ): Promise<any> {
   const userKey = await User.toKey(add0x(accountAddress));
 
diff --git a/apps/cic-staff-client/src/app/pages/accounts/account-details/account-details.component.ts b/apps/cic-staff-client/src/app/pages/accounts/account-details/account-details.component.ts
index 85e44e7e..00a588cb 100644
--- a/apps/cic-staff-client/src/app/pages/accounts/account-details/account-details.component.ts
+++ b/apps/cic-staff-client/src/app/pages/accounts/account-details/account-details.component.ts
@@ -22,7 +22,7 @@ import { first } from 'rxjs/operators';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { copyToClipboard, CustomErrorStateMatcher, exportCsv } from '@app/_helpers';
 import { MatSnackBar } from '@angular/material/snack-bar';
-import { add0x, strip0x } from '@src/assets/js/ethtx/dist/hex';
+import { add0x, strip0x } from '@src/assets/js/ethtx/hex';
 import { environment } from '@src/environments/environment';
 import { AccountDetails, Transaction } from '@app/_models';
 
diff --git a/apps/cic-staff-client/src/app/pages/accounts/account-search/account-search.component.ts b/apps/cic-staff-client/src/app/pages/accounts/account-search/account-search.component.ts
index a24708ab..58b321ff 100644
--- a/apps/cic-staff-client/src/app/pages/accounts/account-search/account-search.component.ts
+++ b/apps/cic-staff-client/src/app/pages/accounts/account-search/account-search.component.ts
@@ -3,7 +3,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { CustomErrorStateMatcher } from '@app/_helpers';
 import { UserService } from '@app/_services';
 import { Router } from '@angular/router';
-import { strip0x } from '@src/assets/js/ethtx/dist/hex';
+import { strip0x } from '@src/assets/js/ethtx/hex';
 import { environment } from '@src/environments/environment';
 
 @Component({
diff --git a/apps/cic-staff-client/src/app/pages/accounts/accounts.component.ts b/apps/cic-staff-client/src/app/pages/accounts/accounts.component.ts
index 77828d49..9a9971be 100644
--- a/apps/cic-staff-client/src/app/pages/accounts/accounts.component.ts
+++ b/apps/cic-staff-client/src/app/pages/accounts/accounts.component.ts
@@ -11,7 +11,7 @@ import { MatSort } from '@angular/material/sort';
 import { LoggingService, TokenService, UserService } from '@app/_services';
 import { Router } from '@angular/router';
 import { exportCsv } from '@app/_helpers';
-import { strip0x } from '@src/assets/js/ethtx/dist/hex';
+import { strip0x } from '@src/assets/js/ethtx/hex';
 import { first } from 'rxjs/operators';
 import { environment } from '@src/environments/environment';
 import { AccountDetails } from '@app/_models';
diff --git a/apps/cic-staff-client/src/app/pages/transactions/transaction-details/transaction-details.component.ts b/apps/cic-staff-client/src/app/pages/transactions/transaction-details/transaction-details.component.ts
index ca324e11..ac5f7282 100644
--- a/apps/cic-staff-client/src/app/pages/transactions/transaction-details/transaction-details.component.ts
+++ b/apps/cic-staff-client/src/app/pages/transactions/transaction-details/transaction-details.component.ts
@@ -10,7 +10,7 @@ import { Router } from '@angular/router';
 import { TokenService, TransactionService } from '@app/_services';
 import { copyToClipboard } from '@app/_helpers';
 import { MatSnackBar } from '@angular/material/snack-bar';
-import { strip0x } from '@src/assets/js/ethtx/dist/hex';
+import { strip0x } from '@src/assets/js/ethtx/hex';
 
 @Component({
   selector: 'app-transaction-details',