diff --git a/src/ctypes/ctypes.module.spec.ts b/src/ctypes/ctypes.module.spec.ts
index 656ecb3..0b13576 100644
--- a/src/ctypes/ctypes.module.spec.ts
+++ b/src/ctypes/ctypes.module.spec.ts
@@ -1,6 +1,6 @@
 import { CType, CTypeService, CTypeDB } from './interfaces/ctype.interfaces'
 import Optional from 'typescript-optional'
-import * as SDK from '@kiltprotocol/sdk-js'
+import { Blockchain, CType as SDKCType, CTypeMetadata, Identity} from '@kiltprotocol/sdk-js'
 import { Test } from '@nestjs/testing'
 import { CTypesController } from './ctypes.controller'
 import { AuthGuard } from '../auth/auth.guard'
@@ -18,7 +18,7 @@ jest.mock('@kiltprotocol/sdk-js/build/ctype/CType.chain', () => {
 })
 
 describe('CType Module', () => {
-  const SDKCTypeA: SDK.CType = SDK.CType.fromSchema({
+  const SDKCTypeA: SDKCType = SDKCType.fromSchema({
     $schema: 'http://kilt-protocol.org/draft-01/ctype#',
     properties: {
       name: {
@@ -32,7 +32,7 @@ describe('CType Module', () => {
     title: 'test_ctype',
   })
 
-  const metaDataA: SDK.CTypeMetadata = {
+  const metaDataA: CTypeMetadata = {
     ctypeHash: SDKCTypeA.hash,
     metadata: {
       title: { default: 'Test Ctype' },
@@ -43,7 +43,7 @@ describe('CType Module', () => {
     },
   }
 
-  const SDKCTypeB = SDK.CType.fromSchema({
+  const SDKCTypeB = SDKCType.fromSchema({
     $schema: 'http://kilt-protocol.org/draft-01/ctype#',
     properties: {
       name: {
@@ -57,7 +57,7 @@ describe('CType Module', () => {
     title: 'another_ctype',
   })
 
-  const metaDataB: SDK.CTypeMetadata = {
+  const metaDataB: CTypeMetadata = {
     ctypeHash: SDKCTypeB.hash,
     metadata: {
       title: { default: 'Test Ctype' },
@@ -92,7 +92,7 @@ describe('CType Module', () => {
 
     beforeAll(
       async () =>
-        (aliceAddress = (await SDK.Identity.buildFromURI('//Alice')).address)
+        (aliceAddress = (await Identity.buildFromURI('//Alice')).address)
     )
 
     beforeEach(async () => {
@@ -106,7 +106,7 @@ describe('CType Module', () => {
           {
             provide: 'BlockchainService',
             useValue: {
-              connect: () => new SDK.Blockchain(blockchainApi.__mocked_api),
+              connect: () => new Blockchain(blockchainApi.__mocked_api),
             },
           },
         ],
@@ -246,7 +246,7 @@ describe('CType Module', () => {
 
     beforeAll(
       async () =>
-        (aliceAddress = (await SDK.Identity.buildFromURI('//Alice')).address)
+        (aliceAddress = (await Identity.buildFromURI('//Alice')).address)
     )
 
     beforeEach(async () => {
diff --git a/src/faucet/faucet.controller.ts b/src/faucet/faucet.controller.ts
index 409486d..cd80a11 100644
--- a/src/faucet/faucet.controller.ts
+++ b/src/faucet/faucet.controller.ts
@@ -1,4 +1,4 @@
-import { Balance, Identity } from '@kiltprotocol/sdk-js'
+import { Balance, Identity, BlockchainUtils } from '@kiltprotocol/sdk-js'
 import {
   Controller,
   Inject,
@@ -21,10 +21,6 @@ import {
   FaucetDropInvalidAddressException,
 } from './exceptions'
 import { AuthGuard } from '../auth/auth.guard'
-import {
-  IS_IN_BLOCK,
-  submitSignedTx,
-} from '@kiltprotocol/sdk-js/build/blockchain/Blockchain'
 
 const DEFAULT_TOKEN_AMOUNT = 500
 
@@ -79,10 +75,9 @@ export class FaucetController {
         new BN(DEFAULT_TOKEN_AMOUNT),
         0
       )
-      const status = await submitSignedTx(tx, {
-        resolveOn: IS_IN_BLOCK,
+      const status = await BlockchainUtils.submitSignedTx(tx, {
+        resolveOn: BlockchainUtils.IS_IN_BLOCK,
       })
-      console.log(`Status: ${status.isInBlock}`)
 
       return Promise.resolve(status.isInBlock)
     } catch (e) {
diff --git a/src/faucet/faucet.module.spec.ts b/src/faucet/faucet.module.spec.ts
index 8f92229..a49d6ee 100644
--- a/src/faucet/faucet.module.spec.ts
+++ b/src/faucet/faucet.module.spec.ts
@@ -33,7 +33,7 @@ jest.mock('@kiltprotocol/sdk-js/build/balance/Balance.chain', () => {
   }
 })
 
-jest.mock('@kiltprotocol/sdk-js/build/blockchain/Blockchain', () => {
+jest.mock('@kiltprotocol/sdk-js/build/blockchain/Blockchain.utils', () => {
   return {
     __esModule: true,
     submitSignedTx: jest.fn().mockImplementation(
@@ -71,7 +71,7 @@ describe('Faucet Module', () => {
     const mockedMakeTransfer = require('@kiltprotocol/sdk-js/build/balance/Balance.chain')
       .makeTransfer
 
-    const mockedsubmitSignedTx = require('@kiltprotocol/sdk-js/build/blockchain/Blockchain')
+    const mockedsubmitSignedTx = require('@kiltprotocol/sdk-js/build/blockchain/Blockchain.utils')
       .submitSignedTx
 
     const fakeFaucetService: FaucetService = {
diff --git a/test/contacts.e2e-spec.ts b/test/contacts.e2e-spec.ts
index 19fdbbe..4327b50 100644
--- a/test/contacts.e2e-spec.ts
+++ b/test/contacts.e2e-spec.ts
@@ -1,19 +1,19 @@
 import { INestApplication } from '@nestjs/common'
 import { Test } from '@nestjs/testing'
 import request from 'supertest'
-import * as sdk from '@kiltprotocol/sdk-js'
 import { MockMongooseModule, mongodbInstance } from './MockMongooseModule'
 import {
   ContactsService,
   Contact,
 } from '../src/contacts/interfaces/contacts.interfaces'
 import { ContactsModule } from '../src/contacts/contacts.module'
-import { IDidDocumentSigned } from '@kiltprotocol/sdk-js/build/did/Did'
+import Did, { IDidDocumentSigned } from '@kiltprotocol/sdk-js/build/did/Did'
+import { Identity } from '@kiltprotocol/sdk-js'
 
 describe('contacts endpoint (e2e)', () => {
   let app: INestApplication
-  let idAlice: sdk.Identity
-  let idBob: sdk.Identity
+  let idAlice: Identity
+  let idBob: Identity
   let contactsService: ContactsService
   let contactA: Contact
   let contactB: Contact
@@ -27,8 +27,8 @@ describe('contacts endpoint (e2e)', () => {
     await app.init()
 
     contactsService = app.get('ContactsService')
-    idAlice = await sdk.Identity.buildFromURI('//Alice')
-    idBob = await sdk.Identity.buildFromURI('//Bob')
+    idAlice = await Identity.buildFromURI('//Alice')
+    idBob = await Identity.buildFromURI('//Bob')
 
     contactA = {
       publicIdentity: idAlice.getPublicIdentity(),
@@ -91,8 +91,8 @@ describe('contacts endpoint (e2e)', () => {
       })
 
       it('gets did by contact address', async () => {
-        const didAlice = sdk.Did.signDidDocument(
-          sdk.Did.fromIdentity(idAlice).createDefaultDidDocument(),
+        const didAlice = Did.signDidDocument(
+          Did.fromIdentity(idAlice).createDefaultDidDocument(),
           idAlice
         )
         await contactsService.add({ ...contactA, did: didAlice })
@@ -198,8 +198,8 @@ describe('contacts endpoint (e2e)', () => {
       let didAlice: IDidDocumentSigned
 
       beforeAll(() => {
-        didAlice = sdk.Did.signDidDocument(
-          sdk.Did.fromIdentity(idAlice).createDefaultDidDocument(),
+        didAlice = Did.signDidDocument(
+          Did.fromIdentity(idAlice).createDefaultDidDocument(),
           idAlice
         )
       })
diff --git a/test/ctypes.e2e-spec.ts b/test/ctypes.e2e-spec.ts
index bf246ff..2cbf551 100644
--- a/test/ctypes.e2e-spec.ts
+++ b/test/ctypes.e2e-spec.ts
@@ -1,11 +1,11 @@
 import { INestApplication } from '@nestjs/common'
 import { Test } from '@nestjs/testing'
 import request from 'supertest'
-import * as sdk from '@kiltprotocol/sdk-js'
 import { MockMongooseModule, mongodbInstance } from './MockMongooseModule'
 import { CTypesModule } from '../src/ctypes/ctypes.module'
 import { CType, CTypeService } from '../src/ctypes/interfaces/ctype.interfaces'
 import { BlockchainModule } from '../src/blockchain/blockchain.module'
+import { CType as SDKCType, Identity } from '@kiltprotocol/sdk-js'
 
 jest.mock('@kiltprotocol/sdk-js/build/ctype/CType.chain', () => {
   return {
@@ -18,10 +18,10 @@ jest.mock(
 
 describe('ctypes endpoint (e2e)', () => {
   let app: INestApplication
-  let idAlice: sdk.Identity
+  let idAlice: Identity
   let ctypeService: CTypeService
 
-  const kiltCTypeA = sdk.CType.fromSchema({
+  const kiltCTypeA = SDKCType.fromSchema({
     $schema: 'http://kilt-protocol.org/draft-01/ctype#',
     properties: {
       name: {
@@ -48,7 +48,7 @@ describe('ctypes endpoint (e2e)', () => {
     },
   }
 
-  const kiltCTypeB = sdk.CType.fromSchema({
+  const kiltCTypeB = SDKCType.fromSchema({
     $schema: 'http://kilt-protocol.org/draft-01/ctype#',
     properties: {
       name: {
@@ -84,7 +84,7 @@ describe('ctypes endpoint (e2e)', () => {
     await app.init()
 
     ctypeService = app.get('CTypeService')
-    idAlice = await sdk.Identity.buildFromURI('//Alice')
+    idAlice = await Identity.buildFromURI('//Alice')
   }, 30000)
 
   beforeEach(async () => {
@@ -161,7 +161,7 @@ describe('ctypes endpoint (e2e)', () => {
       mockedGetOwner.mockResolvedValue('new-owner')
       const cTypeRecordWithOwner = {
         ...cTypeRecordA,
-        cType: sdk.CType.fromSchema(kiltCTypeA.schema, idAlice.address),
+        cType: SDKCType.fromSchema(kiltCTypeA.schema, idAlice.address),
       }
       await request(app.getHttpServer())
         .post(`/ctype`)
diff --git a/test/faucet.e2e-spec.ts b/test/faucet.e2e-spec.ts
index 332513a..bc0e632 100644
--- a/test/faucet.e2e-spec.ts
+++ b/test/faucet.e2e-spec.ts
@@ -13,7 +13,7 @@ jest.mock('@kiltprotocol/sdk-js/build/balance/Balance.chain', () => {
   }
 })
 
-jest.mock('@kiltprotocol/sdk-js/build/blockchain/Blockchain', () => {
+jest.mock('@kiltprotocol/sdk-js/build/blockchain/Blockchain.utils', () => {
   return {
     __esModules: true,
 
@@ -45,7 +45,7 @@ describe('faucet endpoint (e2e)', () => {
 
   beforeEach(async () => {
     await faucetService.reset()
-    require('@kiltprotocol/sdk-js/build/blockchain/Blockchain').submitSignedTx.mockResolvedValue(
+    require('@kiltprotocol/sdk-js/build/blockchain/Blockchain.utils').submitSignedTx.mockResolvedValue(
       { isInBlock: true }
     )
     require('@kiltprotocol/sdk-js/build/balance/Balance.chain').makeTransfer.mockResolvedValue(