diff --git a/package.json b/package.json
index b52b5ccf95..156a85d342 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,8 @@
   "scripts": {
     "build": "polkadot-dev-build-ts && yarn run build:methodsdoc && polkadot-dev-build-docs",
     "build:htmldoc": "yarn clean && typedoc --theme default --out docs/html",
+    "build:interfaces": "node packages/types/src/scripts/interfacesTsWrapper.js",
     "build:methodsdoc": "node packages/types/src/scripts/MetadataMdWrapper.js",
-    "build:srmlTs": "node packages/types/src/scripts/srmlTSWrapper.js",
     "check": "yarn lint",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx . && tsc --noEmit --pretty",
     "clean": "polkadot-dev-clean-build",
diff --git a/packages/api-contract/src/RxBlueprint.ts b/packages/api-contract/src/RxBlueprint.ts
index e1fe71c9d1..f606c8387a 100644
--- a/packages/api-contract/src/RxBlueprint.ts
+++ b/packages/api-contract/src/RxBlueprint.ts
@@ -3,7 +3,7 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { ISubmittableResult, SubmittableResult } from '@polkadot/api/SubmittableExtrinsic';
-import { Hash } from '@polkadot/types/srml/types';
+import { Hash } from '@polkadot/types/interfaces';
 import { IKeyringPair } from '@polkadot/types/types';
 import { ContractABI } from './types';
 
diff --git a/packages/api-contract/src/RxCode.ts b/packages/api-contract/src/RxCode.ts
index ca2c99c39e..9dc6c310e4 100644
--- a/packages/api-contract/src/RxCode.ts
+++ b/packages/api-contract/src/RxCode.ts
@@ -3,7 +3,7 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { ISubmittableResult, SubmittableResult } from '@polkadot/api/SubmittableExtrinsic';
-import { Hash } from '@polkadot/types/srml/types';
+import { Hash } from '@polkadot/types/interfaces';
 import { IKeyringPair } from '@polkadot/types/types';
 import { ContractABI } from './types';
 
diff --git a/packages/api-derive/src/balances/all.ts b/packages/api-derive/src/balances/all.ts
index 748e712f3e..5e0e3a8746 100644
--- a/packages/api-derive/src/balances/all.ts
+++ b/packages/api-derive/src/balances/all.ts
@@ -2,8 +2,8 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { BalanceLock, VestingSchedule } from '@polkadot/types/srml/balances/types';
-import { Balance, BlockNumber, Index } from '@polkadot/types/srml/runtime/types';
+import { BalanceLock, VestingSchedule } from '@polkadot/types/interfaces/balances';
+import { Balance, BlockNumber, Index } from '@polkadot/types/interfaces/runtime';
 
 import BN from 'bn.js';
 import { combineLatest, of, Observable } from 'rxjs';
diff --git a/packages/api-derive/src/chain/bestNumber.ts b/packages/api-derive/src/chain/bestNumber.ts
index d17580409c..bd90c4b74c 100644
--- a/packages/api-derive/src/chain/bestNumber.ts
+++ b/packages/api-derive/src/chain/bestNumber.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { BlockNumber } from '@polkadot/types/srml/types';
+import { BlockNumber } from '@polkadot/types/interfaces';
 
 import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
diff --git a/packages/api-derive/src/chain/bestNumberFinalized.ts b/packages/api-derive/src/chain/bestNumberFinalized.ts
index e7a13e0c98..72babee6b4 100644
--- a/packages/api-derive/src/chain/bestNumberFinalized.ts
+++ b/packages/api-derive/src/chain/bestNumberFinalized.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { BlockNumber } from '@polkadot/types/srml/types';
+import { BlockNumber } from '@polkadot/types/interfaces';
 
 import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
diff --git a/packages/api-derive/src/chain/bestNumberLag.ts b/packages/api-derive/src/chain/bestNumberLag.ts
index 2220ebaf6e..c36f66d32d 100644
--- a/packages/api-derive/src/chain/bestNumberLag.ts
+++ b/packages/api-derive/src/chain/bestNumberLag.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { BlockNumber } from '@polkadot/types/srml/types';
+import { BlockNumber } from '@polkadot/types/interfaces';
 
 import { Observable, combineLatest } from 'rxjs';
 import { map } from 'rxjs/operators';
diff --git a/packages/api-derive/src/democracy/referendumInfo.ts b/packages/api-derive/src/democracy/referendumInfo.ts
index 8c3e7be882..bde0547d1d 100644
--- a/packages/api-derive/src/democracy/referendumInfo.ts
+++ b/packages/api-derive/src/democracy/referendumInfo.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { ReferendumInfo } from '@polkadot/types/srml/democracy/types';
+import { ReferendumInfo } from '@polkadot/types/interfaces/democracy';
 
 import BN from 'bn.js';
 import { Observable } from 'rxjs';
diff --git a/packages/api-derive/src/democracy/referendumInfos.ts b/packages/api-derive/src/democracy/referendumInfos.ts
index 9becd9b2b2..ee13d96bab 100644
--- a/packages/api-derive/src/democracy/referendumInfos.ts
+++ b/packages/api-derive/src/democracy/referendumInfos.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { ReferendumInfo } from '@polkadot/types/srml/democracy/types';
+import { ReferendumInfo } from '@polkadot/types/interfaces/democracy';
 
 import BN from 'bn.js';
 import { Observable, of } from 'rxjs';
diff --git a/packages/api-derive/src/democracy/referendumVotesFor.ts b/packages/api-derive/src/democracy/referendumVotesFor.ts
index 17083c81ba..99374d2408 100644
--- a/packages/api-derive/src/democracy/referendumVotesFor.ts
+++ b/packages/api-derive/src/democracy/referendumVotesFor.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Balance } from '@polkadot/types/srml/types';
+import { Balance } from '@polkadot/types/interfaces';
 
 import BN from 'bn.js';
 import { combineLatest, Observable, of } from 'rxjs';
diff --git a/packages/api-derive/src/democracy/referendums.ts b/packages/api-derive/src/democracy/referendums.ts
index 108fd258c3..a8a03f1367 100644
--- a/packages/api-derive/src/democracy/referendums.ts
+++ b/packages/api-derive/src/democracy/referendums.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { ReferendumIndex } from '@polkadot/types/srml/democracy/types';
+import { ReferendumIndex } from '@polkadot/types/interfaces/democracy';
 
 import BN from 'bn.js';
 import { Observable, of } from 'rxjs';
diff --git a/packages/api-derive/src/elections/approvalsOf.ts b/packages/api-derive/src/elections/approvalsOf.ts
index 71a40a2951..f8109dc747 100644
--- a/packages/api-derive/src/elections/approvalsOf.ts
+++ b/packages/api-derive/src/elections/approvalsOf.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { ApprovalFlag, SetIndex } from '@polkadot/types/srml/elections/types';
+import { ApprovalFlag, SetIndex } from '@polkadot/types/interfaces/elections';
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { Observable } from 'rxjs';
diff --git a/packages/api-derive/src/elections/approvalsOfAt.ts b/packages/api-derive/src/elections/approvalsOfAt.ts
index d422cf98c2..ecdbb0abb9 100644
--- a/packages/api-derive/src/elections/approvalsOfAt.ts
+++ b/packages/api-derive/src/elections/approvalsOfAt.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { ApprovalFlag, SetIndex } from '@polkadot/types/srml/elections/types';
+import { ApprovalFlag, SetIndex } from '@polkadot/types/interfaces/elections';
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { Observable } from 'rxjs';
diff --git a/packages/api-derive/src/elections/info.ts b/packages/api-derive/src/elections/info.ts
index 92ba6a6ee9..c89838b3e3 100644
--- a/packages/api-derive/src/elections/info.ts
+++ b/packages/api-derive/src/elections/info.ts
@@ -2,8 +2,8 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { SetIndex, VoteIndex } from '@polkadot/types/srml/elections/types';
-import { BlockNumber } from '@polkadot/types/srml/types';
+import { SetIndex, VoteIndex } from '@polkadot/types/interfaces/elections';
+import { BlockNumber } from '@polkadot/types/interfaces';
 
 import BN from 'bn.js';
 import { Observable } from 'rxjs';
diff --git a/packages/api-derive/src/elections/voterPositions.ts b/packages/api-derive/src/elections/voterPositions.ts
index 56a72e6a60..530a259b26 100644
--- a/packages/api-derive/src/elections/voterPositions.ts
+++ b/packages/api-derive/src/elections/voterPositions.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { SetIndex } from '@polkadot/types/srml/elections/types';
+import { SetIndex } from '@polkadot/types/interfaces/elections';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { AccountId, Vec, Option, createType } from '@polkadot/types';
 import { DerivedVoterPositions } from '../types';
diff --git a/packages/api-derive/src/session/info.ts b/packages/api-derive/src/session/info.ts
index 3295665879..14f26e6bc8 100644
--- a/packages/api-derive/src/session/info.ts
+++ b/packages/api-derive/src/session/info.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { BlockNumber } from '@polkadot/types/srml/types';
+import { BlockNumber } from '@polkadot/types/interfaces';
 import { DerivedSessionInfo } from '../types';
 
 import BN from 'bn.js';
diff --git a/packages/api-derive/src/staking/info.ts b/packages/api-derive/src/staking/info.ts
index 51f7309790..4a5ff9d3f8 100644
--- a/packages/api-derive/src/staking/info.ts
+++ b/packages/api-derive/src/staking/info.ts
@@ -2,9 +2,9 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { BlockNumber } from '@polkadot/types/srml/runtime/types';
-import { Keys } from '@polkadot/types/srml/session/types';
-import { Exposure, RewardDestination, StakingLedger, UnlockChunk, ValidatorPrefs } from '@polkadot/types/srml/staking/types';
+import { BlockNumber } from '@polkadot/types/interfaces/runtime';
+import { Keys } from '@polkadot/types/interfaces/session';
+import { Exposure, RewardDestination, StakingLedger, UnlockChunk, ValidatorPrefs } from '@polkadot/types/interfaces/staking';
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { DerivedStaking, DerivedUnlocking } from '../types';
diff --git a/packages/api-derive/src/type/ReferendumInfoExtended.ts b/packages/api-derive/src/type/ReferendumInfoExtended.ts
index 551e40a43c..615fddd7ef 100644
--- a/packages/api-derive/src/type/ReferendumInfoExtended.ts
+++ b/packages/api-derive/src/type/ReferendumInfoExtended.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { ReferendumIndex, ReferendumInfo } from '@polkadot/types/srml/democracy/types';
+import { ReferendumIndex, ReferendumInfo } from '@polkadot/types/interfaces/democracy';
 
 import BN from 'bn.js';
 import { ClassOf, createType } from '@polkadot/types';
diff --git a/packages/api-derive/src/types.ts b/packages/api-derive/src/types.ts
index a72da8b047..4a69b926ce 100644
--- a/packages/api-derive/src/types.ts
+++ b/packages/api-derive/src/types.ts
@@ -2,9 +2,9 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { SetIndex, VoteIndex } from '@polkadot/types/srml/elections/types';
-import { Balance, BlockNumber, Index } from '@polkadot/types/srml/runtime/types';
-import { Exposure, RewardDestination, StakingLedger, ValidatorPrefs } from '@polkadot/types/srml/staking/types';
+import { SetIndex, VoteIndex } from '@polkadot/types/interfaces/elections';
+import { Balance, BlockNumber, Index } from '@polkadot/types/interfaces/runtime';
+import { Exposure, RewardDestination, StakingLedger, ValidatorPrefs } from '@polkadot/types/interfaces/staking';
 
 import BN from 'bn.js';
 import { AccountId, Vote } from '@polkadot/types';
diff --git a/packages/api-derive/src/util/approvalFlagToBool.ts b/packages/api-derive/src/util/approvalFlagToBool.ts
index dea3f47cd3..dd25be906d 100644
--- a/packages/api-derive/src/util/approvalFlagToBool.ts
+++ b/packages/api-derive/src/util/approvalFlagToBool.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { ApprovalFlag } from '@polkadot/types/srml/elections/types';
+import { ApprovalFlag } from '@polkadot/types/interfaces/elections';
 
 import BN from 'bn.js';
 import { Vec } from '@polkadot/types';
diff --git a/packages/api-derive/src/util/approvalFlagsToBools.ts b/packages/api-derive/src/util/approvalFlagsToBools.ts
index b2fd43d7fe..8cc9aca248 100644
--- a/packages/api-derive/src/util/approvalFlagsToBools.ts
+++ b/packages/api-derive/src/util/approvalFlagsToBools.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { ApprovalFlag } from '@polkadot/types/srml/elections/types';
+import { ApprovalFlag } from '@polkadot/types/interfaces/elections';
 
 import { Vec } from '@polkadot/types';
 
diff --git a/packages/api/src/Base.ts b/packages/api/src/Base.ts
index ab2c495b8d..59522b0aab 100644
--- a/packages/api/src/Base.ts
+++ b/packages/api/src/Base.ts
@@ -3,7 +3,7 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { ProviderInterface } from '@polkadot/rpc-provider/types';
-import { Hash, RuntimeVersion, SignedBlock } from '@polkadot/types/srml/types';
+import { Hash, RuntimeVersion, SignedBlock } from '@polkadot/types/interfaces';
 import { AnyFunction, Codec, CodecArg, RegistryTypes } from '@polkadot/types/types';
 import {
   ApiInterfaceRx, ApiInterfaceEvents, ApiOptions, ApiTypes, DecorateMethodOptions,
@@ -27,7 +27,7 @@ import { Event, getTypeRegistry, Metadata, Method, Null, u64 } from '@polkadot/t
 import Linkage, { LinkageResult } from '@polkadot/types/codec/Linkage';
 import { DEFAULT_VERSION as EXTRINSIC_DEFAULT_VERSION } from '@polkadot/types/primitive/Extrinsic/constants';
 import { MethodFunction, ModulesWithMethods } from '@polkadot/types/primitive/Method';
-import * as srmlTypes from '@polkadot/types/srml/definitions';
+import * as interfacesTypes from '@polkadot/types/interfaces/definitions';
 import { StorageEntry } from '@polkadot/types/primitive/StorageKey';
 import { assert, compactStripLength, isFunction, isObject, isUndefined, logger, u8aToHex } from '@polkadot/util';
 import { cryptoWaitReady } from '@polkadot/util-crypto';
@@ -143,7 +143,7 @@ export default abstract class ApiBase<ApiType> {
     // we only re-register the types (global) if this is not a cloned instance
     if (!options.source) {
       // first register the definitions we have, i.e. those where there are no type classes
-      Object.values(srmlTypes).forEach(({ types }): void =>
+      Object.values(interfacesTypes).forEach(({ types }): void =>
         this.registerTypes(types)
       );
 
diff --git a/packages/api/src/SignerPayload.ts b/packages/api/src/SignerPayload.ts
index e0f7279189..dfb4d31f22 100644
--- a/packages/api/src/SignerPayload.ts
+++ b/packages/api/src/SignerPayload.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Balance, BlockNumber, Hash, Index } from '@polkadot/types/srml/types';
+import { Balance, BlockNumber, Hash, Index } from '@polkadot/types/interfaces';
 import { SignerPayload as ISignerPayload } from './types';
 
 import { Address, ClassOf, Compact, ExtrinsicEra, Struct, u8, Method } from '@polkadot/types';
diff --git a/packages/api/src/SubmittableExtrinsic.ts b/packages/api/src/SubmittableExtrinsic.ts
index d986270924..1856579a52 100644
--- a/packages/api/src/SubmittableExtrinsic.ts
+++ b/packages/api/src/SubmittableExtrinsic.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { ExtrinsicStatus, EventRecord, Hash, Index, SignedBlock } from '@polkadot/types/srml/types';
+import { ExtrinsicStatus, EventRecord, Hash, Index, SignedBlock } from '@polkadot/types/interfaces';
 import { AnyNumber, AnyU8a, Callback, Codec, IExtrinsic, IExtrinsicEra, IKeyringPair, SignatureOptions } from '@polkadot/types/types';
 import { ApiInterfaceRx, ApiTypes } from './types';
 
diff --git a/packages/api/src/checkTypes.manual.ts b/packages/api/src/checkTypes.manual.ts
index ad50b06d8c..baf9398b23 100644
--- a/packages/api/src/checkTypes.manual.ts
+++ b/packages/api/src/checkTypes.manual.ts
@@ -4,7 +4,7 @@
 
 // Simple non-runnable checks to test type definitions in the editor itself
 
-import { Index } from '@polkadot/types/srml/types';
+import { Index } from '@polkadot/types/interfaces';
 
 import { ApiPromise } from '@polkadot/api';
 import { HeaderExtended } from '@polkadot/api-derive';
diff --git a/packages/api/src/types.ts b/packages/api/src/types.ts
index 1fa75305c9..35d11ccb00 100644
--- a/packages/api/src/types.ts
+++ b/packages/api/src/types.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Hash, RuntimeVersion } from '@polkadot/types/srml/types';
+import { Hash, RuntimeVersion } from '@polkadot/types/interfaces';
 import { AnyFunction, Callback, Codec, CodecArg, IExtrinsic, RegistryTypes, SignatureOptions } from '@polkadot/types/types';
 
 import BN from 'bn.js';
diff --git a/packages/api/src/util/filterEvents.ts b/packages/api/src/util/filterEvents.ts
index f1e8adb9bb..cbd9ce414f 100644
--- a/packages/api/src/util/filterEvents.ts
+++ b/packages/api/src/util/filterEvents.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { EventRecord, SignedBlock } from '@polkadot/types/srml/types';
+import { EventRecord, SignedBlock } from '@polkadot/types/interfaces';
 
 import { U8a } from '@polkadot/types';
 
diff --git a/packages/api/test/e2e/api-derive/rx.spec.ts b/packages/api/test/e2e/api-derive/rx.spec.ts
index af546a1234..506aec67bf 100644
--- a/packages/api/test/e2e/api-derive/rx.spec.ts
+++ b/packages/api/test/e2e/api-derive/rx.spec.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { BlockNumber } from '@polkadot/types/srml/types';
+import { BlockNumber } from '@polkadot/types/interfaces';
 
 import BN from 'bn.js';
 
diff --git a/packages/api/test/e2e/api/promise-alex-archive.spec.ts b/packages/api/test/e2e/api/promise-alex-archive.spec.ts
index ac145f58c2..d386674d83 100644
--- a/packages/api/test/e2e/api/promise-alex-archive.spec.ts
+++ b/packages/api/test/e2e/api/promise-alex-archive.spec.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { SignedBlock } from '@polkadot/types/srml/types';
+import { SignedBlock } from '@polkadot/types/interfaces';
 
 import WsProvider from '@polkadot/rpc-provider/ws';
 import { Extrinsic } from '@polkadot/types';
diff --git a/packages/api/test/e2e/api/promise-alex.spec.ts b/packages/api/test/e2e/api/promise-alex.spec.ts
index 964f5a475f..c9791f000e 100644
--- a/packages/api/test/e2e/api/promise-alex.spec.ts
+++ b/packages/api/test/e2e/api/promise-alex.spec.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { EventRecord } from '@polkadot/types/srml/types';
+import { EventRecord } from '@polkadot/types/interfaces';
 
 import WsProvider from '@polkadot/rpc-provider/ws';
 import { AccountId, ClassOf, Header, Option, Vec } from '@polkadot/types';
diff --git a/packages/api/test/e2e/api/promise-contract.spec.ts b/packages/api/test/e2e/api/promise-contract.spec.ts
index 7fcb1f1a0a..3fc5c38c42 100644
--- a/packages/api/test/e2e/api/promise-contract.spec.ts
+++ b/packages/api/test/e2e/api/promise-contract.spec.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Hash } from '@polkadot/types/srml/types';
+import { Hash } from '@polkadot/types/interfaces';
 
 import fs from 'fs';
 import path from 'path';
diff --git a/packages/api/test/e2e/api/promise-queries-dev.spec.ts b/packages/api/test/e2e/api/promise-queries-dev.spec.ts
index e0abaca58c..a409fec798 100644
--- a/packages/api/test/e2e/api/promise-queries-dev.spec.ts
+++ b/packages/api/test/e2e/api/promise-queries-dev.spec.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Balance, Index } from '@polkadot/types/srml/types';
+import { Balance, Index } from '@polkadot/types/interfaces';
 
 import BN from 'bn.js';
 
diff --git a/packages/api/test/e2e/api/promise-queries.spec.ts b/packages/api/test/e2e/api/promise-queries.spec.ts
index a290741760..9ac5d97eee 100644
--- a/packages/api/test/e2e/api/promise-queries.spec.ts
+++ b/packages/api/test/e2e/api/promise-queries.spec.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { EventRecord, Hash, SessionIndex } from '@polkadot/types/srml/types';
+import { EventRecord, Hash, SessionIndex } from '@polkadot/types/interfaces';
 
 import { HeaderExtended } from '@polkadot/api-derive';
 import WsProvider from '@polkadot/rpc-provider/ws';
diff --git a/packages/api/test/e2e/api/promise-tx.spec.ts b/packages/api/test/e2e/api/promise-tx.spec.ts
index 38030013bd..b4ebb8c3f4 100644
--- a/packages/api/test/e2e/api/promise-tx.spec.ts
+++ b/packages/api/test/e2e/api/promise-tx.spec.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { EventRecord, Hash, Index, SignedBlock } from '@polkadot/types/srml/types';
+import { EventRecord, Hash, Index, SignedBlock } from '@polkadot/types/interfaces';
 
 import Keyring from '@polkadot/keyring';
 import testingPairs from '@polkadot/keyring/testingPairs';
diff --git a/packages/api/test/e2e/api/rx-queries.spec.ts b/packages/api/test/e2e/api/rx-queries.spec.ts
index f707c09f20..2fd8577497 100644
--- a/packages/api/test/e2e/api/rx-queries.spec.ts
+++ b/packages/api/test/e2e/api/rx-queries.spec.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Balance } from '@polkadot/types/srml/types';
+import { Balance } from '@polkadot/types/interfaces';
 
 import BN from 'bn.js';
 import { Observable } from 'rxjs';
diff --git a/packages/api/test/e2e/api/rx-tx.spec.ts b/packages/api/test/e2e/api/rx-tx.spec.ts
index 22697a7750..ba20c049a6 100644
--- a/packages/api/test/e2e/api/rx-tx.spec.ts
+++ b/packages/api/test/e2e/api/rx-tx.spec.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Index } from '@polkadot/types/srml/types';
+import { Index } from '@polkadot/types/interfaces';
 
 import { Observable } from 'rxjs';
 import { first, switchMap } from 'rxjs/operators';
diff --git a/packages/api/test/e2e/rpc-core/alexander.spec.ts b/packages/api/test/e2e/rpc-core/alexander.spec.ts
index e5f5ee0c26..cc412be240 100644
--- a/packages/api/test/e2e/rpc-core/alexander.spec.ts
+++ b/packages/api/test/e2e/rpc-core/alexander.spec.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { SignedBlock, StorageChangeSet } from '@polkadot/types/srml/types';
+import { SignedBlock, StorageChangeSet } from '@polkadot/types/interfaces';
 
 import storage from '@polkadot/api-metadata/storage/static';
 import WsProvider from '@polkadot/rpc-provider/ws';
diff --git a/packages/api/test/e2e/rpc-core/basics.spec.ts b/packages/api/test/e2e/rpc-core/basics.spec.ts
index f142dc35ca..b249eb2dc2 100644
--- a/packages/api/test/e2e/rpc-core/basics.spec.ts
+++ b/packages/api/test/e2e/rpc-core/basics.spec.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { ChainProperties } from '@polkadot/types/srml/types';
+import { ChainProperties } from '@polkadot/types/interfaces';
 
 import { ClassOf, Extrinsic, Vec } from '@polkadot/types';
 import WsProvider from '@polkadot/rpc-provider/ws';
diff --git a/packages/api/test/e2e/rpc-core/chain.spec.ts b/packages/api/test/e2e/rpc-core/chain.spec.ts
index f6d88ee3c0..9abd57192e 100644
--- a/packages/api/test/e2e/rpc-core/chain.spec.ts
+++ b/packages/api/test/e2e/rpc-core/chain.spec.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { RuntimeVersion } from '@polkadot/types/srml/types';
+import { RuntimeVersion } from '@polkadot/types/interfaces';
 
 import { ClassOf, Header } from '@polkadot/types';
 import WsProvider from '@polkadot/rpc-provider/ws';
diff --git a/packages/api/test/e2e/rpc-core/state.spec.ts b/packages/api/test/e2e/rpc-core/state.spec.ts
index ea425fdbcc..be7821ed66 100644
--- a/packages/api/test/e2e/rpc-core/state.spec.ts
+++ b/packages/api/test/e2e/rpc-core/state.spec.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Balance, Hash, StorageData } from '@polkadot/types/srml/types';
+import { Balance, Hash, StorageData } from '@polkadot/types/interfaces';
 
 import fs from 'fs';
 import path from 'path';
diff --git a/packages/api/test/e2e/rpc-core/subscribe.spec.ts b/packages/api/test/e2e/rpc-core/subscribe.spec.ts
index 3389a35d41..20a7c715ac 100644
--- a/packages/api/test/e2e/rpc-core/subscribe.spec.ts
+++ b/packages/api/test/e2e/rpc-core/subscribe.spec.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { StorageChangeSet } from '@polkadot/types/srml/types';
+import { StorageChangeSet } from '@polkadot/types/interfaces';
 
 import WsProvider from '@polkadot/rpc-provider/ws';
 import storage from '@polkadot/api-metadata/storage/static';
diff --git a/packages/rpc-core/src/formatting.spec.ts b/packages/rpc-core/src/formatting.spec.ts
index 1a0388aaf6..6ea27c8e6c 100644
--- a/packages/rpc-core/src/formatting.spec.ts
+++ b/packages/rpc-core/src/formatting.spec.ts
@@ -4,7 +4,7 @@
 
 import '@polkadot/types/injector';
 
-import { Balance } from '@polkadot/types/srml/types';
+import { Balance } from '@polkadot/types/interfaces';
 import { Codec } from '@polkadot/types/types';
 
 import fromMetadata from '@polkadot/api-metadata/storage/fromMetadata';
diff --git a/packages/rpc-core/src/index.ts b/packages/rpc-core/src/index.ts
index 819d926494..a1ba216890 100644
--- a/packages/rpc-core/src/index.ts
+++ b/packages/rpc-core/src/index.ts
@@ -4,7 +4,7 @@
 
 import { ProviderInterface } from '@polkadot/rpc-provider/types';
 import { RpcSection, RpcMethod } from '@polkadot/jsonrpc/types';
-import { StorageChangeSet, StorageData } from '@polkadot/types/srml/types';
+import { StorageChangeSet, StorageData } from '@polkadot/types/interfaces';
 import { AnyJson, Codec } from '@polkadot/types/types';
 import { RpcInterface, RpcInterfaceMethod, RpcInterfaceSection } from './types';
 
diff --git a/packages/types/src/codec/Compact.spec.ts b/packages/types/src/codec/Compact.spec.ts
index b304ba2d38..b950c4f3df 100644
--- a/packages/types/src/codec/Compact.spec.ts
+++ b/packages/types/src/codec/Compact.spec.ts
@@ -4,7 +4,7 @@
 
 import '../injector';
 
-import { Balance, BlockNumber } from '../srml/runtime/types';
+import { Balance, BlockNumber } from '../interfaces/runtime';
 
 import BN from 'bn.js';
 
diff --git a/packages/types/src/codec/Tuple.spec.ts b/packages/types/src/codec/Tuple.spec.ts
index 76a76f8d02..21fcfdbe8e 100644
--- a/packages/types/src/codec/Tuple.spec.ts
+++ b/packages/types/src/codec/Tuple.spec.ts
@@ -4,8 +4,8 @@
 
 import '../injector';
 
-import { VoteThreshold } from '../srml/elections/types';
-import { BlockNumber } from '../srml/runtime/types';
+import { VoteThreshold } from '../interfaces/elections';
+import { BlockNumber } from '../interfaces/runtime';
 import { CodecTo } from '../types';
 
 import extrinsics from '@polkadot/api-metadata/extrinsics/static';
diff --git a/packages/types/src/codec/Vec.spec.ts b/packages/types/src/codec/Vec.spec.ts
index 71ee6792d3..169758ca65 100644
--- a/packages/types/src/codec/Vec.spec.ts
+++ b/packages/types/src/codec/Vec.spec.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Proposal, PropIndex } from '../srml/democracy/types';
+import { Proposal, PropIndex } from '../interfaces/democracy';
 import { Codec, CodecTo } from '../types';
 
 import extrinsics from '@polkadot/api-metadata/extrinsics/static';
diff --git a/packages/types/src/injector.ts b/packages/types/src/injector.ts
index 6a0741712d..09217dd125 100644
--- a/packages/types/src/injector.ts
+++ b/packages/types/src/injector.ts
@@ -4,7 +4,7 @@
 
 import { ClassOf } from './codec/createType';
 import getTypeRegistry from './codec/typeRegistry';
-import * as srmlTypes from './srml/definitions';
+import * as definitions from './interfaces/definitions';
 
 /**
  * @description A utility method that injects all the srml definitions into the type registry
@@ -12,7 +12,7 @@ import * as srmlTypes from './srml/definitions';
 export function injectDefinitions (): void {
   const registry = getTypeRegistry();
 
-  Object.values(srmlTypes).forEach(({ types }): void =>
+  Object.values(definitions).forEach(({ types }): void =>
     registry.register(types)
   );
 
diff --git a/packages/types/src/interfaceRegistry.ts b/packages/types/src/interfaceRegistry.ts
index d438e77336..9d5239b78a 100644
--- a/packages/types/src/interfaceRegistry.ts
+++ b/packages/types/src/interfaceRegistry.ts
@@ -1,4 +1,4 @@
-// Auto-generated via `yarn build:srmlTs`, do not edit
+// Auto-generated via `yarn build:interfaces`, do not edit
 
 import { Compact, Option, Vec } from './codec';
 import { AccountId, AccountIndex, Address, Block, Bool, Bytes, ConsensusEngineId, Data, Digest, DigestItem, Event, Extrinsic, ExtrinsicEra, Fixed64, H160, H256, H512, Header, I128, I16, I256, I32, I64, I8, ImmortalEra, Method, Moment, MortalEra, Null, Origin, SignaturePayload, StorageHasher, StorageKey, Text, Type, U128, U16, U256, U32, U64, U8, Vote, bool, i128, i16, i256, i32, i64, i8, u128, u16, u256, u32, u64, u8, usize } from './primitive';
diff --git a/packages/types/src/srml/authorship/definitions.ts b/packages/types/src/interfaces/authorship/definitions.ts
similarity index 100%
rename from packages/types/src/srml/authorship/definitions.ts
rename to packages/types/src/interfaces/authorship/definitions.ts
diff --git a/packages/types/src/interfaces/authorship/index.ts b/packages/types/src/interfaces/authorship/index.ts
new file mode 100644
index 0000000000..f94c8a0ae8
--- /dev/null
+++ b/packages/types/src/interfaces/authorship/index.ts
@@ -0,0 +1,3 @@
+// Auto-generated via `yarn build:interfaces`, do not edit
+
+export * from './types';
diff --git a/packages/types/src/srml/authorship/types.ts b/packages/types/src/interfaces/authorship/types.ts
similarity index 90%
rename from packages/types/src/srml/authorship/types.ts
rename to packages/types/src/interfaces/authorship/types.ts
index 5f4a7a8d85..2d6d6cf6f8 100644
--- a/packages/types/src/srml/authorship/types.ts
+++ b/packages/types/src/interfaces/authorship/types.ts
@@ -1,9 +1,9 @@
-// Auto-generated via `yarn build:srmlTs`, do not edit
+// Auto-generated via `yarn build:interfaces`, do not edit
 
 import { Codec } from '../../types';
 import { Enum, Option, Vec } from '../../codec';
 import { AccountId } from '../../primitive';
-import { BlockNumber, Hash } from '../runtime/types';
+import { BlockNumber, Hash } from '../runtime';
 
 /** BlockNumber */
 export type InclusionHeight = BlockNumber;
diff --git a/packages/types/src/srml/babe/definitions.ts b/packages/types/src/interfaces/babe/definitions.ts
similarity index 100%
rename from packages/types/src/srml/babe/definitions.ts
rename to packages/types/src/interfaces/babe/definitions.ts
diff --git a/packages/types/src/interfaces/babe/index.ts b/packages/types/src/interfaces/babe/index.ts
new file mode 100644
index 0000000000..f94c8a0ae8
--- /dev/null
+++ b/packages/types/src/interfaces/babe/index.ts
@@ -0,0 +1,3 @@
+// Auto-generated via `yarn build:interfaces`, do not edit
+
+export * from './types';
diff --git a/packages/types/src/srml/babe/types.ts b/packages/types/src/interfaces/babe/types.ts
similarity index 87%
rename from packages/types/src/srml/babe/types.ts
rename to packages/types/src/interfaces/babe/types.ts
index f97f308b0f..898b96dc3b 100644
--- a/packages/types/src/srml/babe/types.ts
+++ b/packages/types/src/interfaces/babe/types.ts
@@ -1,4 +1,4 @@
-// Auto-generated via `yarn build:srmlTs`, do not edit
+// Auto-generated via `yarn build:interfaces`, do not edit
 
 import { Compact, Option, Vec } from '../../codec';
 import { u64 } from '../../primitive';
diff --git a/packages/types/src/srml/balances/definitions.ts b/packages/types/src/interfaces/balances/definitions.ts
similarity index 100%
rename from packages/types/src/srml/balances/definitions.ts
rename to packages/types/src/interfaces/balances/definitions.ts
diff --git a/packages/types/src/interfaces/balances/index.ts b/packages/types/src/interfaces/balances/index.ts
new file mode 100644
index 0000000000..f94c8a0ae8
--- /dev/null
+++ b/packages/types/src/interfaces/balances/index.ts
@@ -0,0 +1,3 @@
+// Auto-generated via `yarn build:interfaces`, do not edit
+
+export * from './types';
diff --git a/packages/types/src/srml/balances/types.ts b/packages/types/src/interfaces/balances/types.ts
similarity index 95%
rename from packages/types/src/srml/balances/types.ts
rename to packages/types/src/interfaces/balances/types.ts
index 5217fb32d9..6c55bac00d 100644
--- a/packages/types/src/srml/balances/types.ts
+++ b/packages/types/src/interfaces/balances/types.ts
@@ -1,7 +1,7 @@
-// Auto-generated via `yarn build:srmlTs`, do not edit
+// Auto-generated via `yarn build:interfaces`, do not edit
 
 import { Option, Set, Struct, Vec } from '../../codec';
-import { Balance, BlockNumber, LockIdentifier } from '../runtime/types';
+import { Balance, BlockNumber, LockIdentifier } from '../runtime';
 
 /** Struct */
 export interface BalanceLock extends Struct {
diff --git a/packages/types/src/srml/collective/definitions.ts b/packages/types/src/interfaces/collective/definitions.ts
similarity index 100%
rename from packages/types/src/srml/collective/definitions.ts
rename to packages/types/src/interfaces/collective/definitions.ts
diff --git a/packages/types/src/interfaces/collective/index.ts b/packages/types/src/interfaces/collective/index.ts
new file mode 100644
index 0000000000..f94c8a0ae8
--- /dev/null
+++ b/packages/types/src/interfaces/collective/index.ts
@@ -0,0 +1,3 @@
+// Auto-generated via `yarn build:interfaces`, do not edit
+
+export * from './types';
diff --git a/packages/types/src/srml/collective/types.ts b/packages/types/src/interfaces/collective/types.ts
similarity index 94%
rename from packages/types/src/srml/collective/types.ts
rename to packages/types/src/interfaces/collective/types.ts
index 2fe0e7a6a3..11b2e8e107 100644
--- a/packages/types/src/srml/collective/types.ts
+++ b/packages/types/src/interfaces/collective/types.ts
@@ -1,4 +1,4 @@
-// Auto-generated via `yarn build:srmlTs`, do not edit
+// Auto-generated via `yarn build:interfaces`, do not edit
 
 import { Compact, Option, Struct, Vec } from '../../codec';
 import { AccountId, u32, u64 } from '../../primitive';
diff --git a/packages/types/src/srml/consensus/definitions.ts b/packages/types/src/interfaces/consensus/definitions.ts
similarity index 100%
rename from packages/types/src/srml/consensus/definitions.ts
rename to packages/types/src/interfaces/consensus/definitions.ts
diff --git a/packages/types/src/interfaces/consensus/index.ts b/packages/types/src/interfaces/consensus/index.ts
new file mode 100644
index 0000000000..f94c8a0ae8
--- /dev/null
+++ b/packages/types/src/interfaces/consensus/index.ts
@@ -0,0 +1,3 @@
+// Auto-generated via `yarn build:interfaces`, do not edit
+
+export * from './types';
diff --git a/packages/types/src/srml/consensus/types.ts b/packages/types/src/interfaces/consensus/types.ts
similarity index 86%
rename from packages/types/src/srml/consensus/types.ts
rename to packages/types/src/interfaces/consensus/types.ts
index a991314136..a25832bf63 100644
--- a/packages/types/src/srml/consensus/types.ts
+++ b/packages/types/src/interfaces/consensus/types.ts
@@ -1,4 +1,4 @@
-// Auto-generated via `yarn build:srmlTs`, do not edit
+// Auto-generated via `yarn build:interfaces`, do not edit
 
 import { Option, Vec } from '../../codec';
 import { AccountId } from '../../primitive';
diff --git a/packages/types/src/srml/contracts/definitions.ts b/packages/types/src/interfaces/contracts/definitions.ts
similarity index 100%
rename from packages/types/src/srml/contracts/definitions.ts
rename to packages/types/src/interfaces/contracts/definitions.ts
diff --git a/packages/types/src/interfaces/contracts/index.ts b/packages/types/src/interfaces/contracts/index.ts
new file mode 100644
index 0000000000..f94c8a0ae8
--- /dev/null
+++ b/packages/types/src/interfaces/contracts/index.ts
@@ -0,0 +1,3 @@
+// Auto-generated via `yarn build:interfaces`, do not edit
+
+export * from './types';
diff --git a/packages/types/src/srml/contracts/types.ts b/packages/types/src/interfaces/contracts/types.ts
similarity index 97%
rename from packages/types/src/srml/contracts/types.ts
rename to packages/types/src/interfaces/contracts/types.ts
index c5c3d8eef6..d2d4dc11b5 100644
--- a/packages/types/src/srml/contracts/types.ts
+++ b/packages/types/src/interfaces/contracts/types.ts
@@ -1,8 +1,8 @@
-// Auto-generated via `yarn build:srmlTs`, do not edit
+// Auto-generated via `yarn build:interfaces`, do not edit
 
 import { Compact, Enum, Option, Struct, Vec } from '../../codec';
 import { Bool, Bytes, Null, u32, u64, u8 } from '../../primitive';
-import { Balance, BlockNumber, Hash } from '../runtime/types';
+import { Balance, BlockNumber, Hash } from '../runtime';
 
 /** Struct */
 export interface AliveContractInfo extends Struct {
diff --git a/packages/types/src/srml/definitions.ts b/packages/types/src/interfaces/definitions.ts
similarity index 100%
rename from packages/types/src/srml/definitions.ts
rename to packages/types/src/interfaces/definitions.ts
diff --git a/packages/types/src/srml/democracy/definitions.ts b/packages/types/src/interfaces/democracy/definitions.ts
similarity index 100%
rename from packages/types/src/srml/democracy/definitions.ts
rename to packages/types/src/interfaces/democracy/definitions.ts
diff --git a/packages/types/src/interfaces/democracy/index.ts b/packages/types/src/interfaces/democracy/index.ts
new file mode 100644
index 0000000000..f94c8a0ae8
--- /dev/null
+++ b/packages/types/src/interfaces/democracy/index.ts
@@ -0,0 +1,3 @@
+// Auto-generated via `yarn build:interfaces`, do not edit
+
+export * from './types';
diff --git a/packages/types/src/srml/democracy/types.ts b/packages/types/src/interfaces/democracy/types.ts
similarity index 91%
rename from packages/types/src/srml/democracy/types.ts
rename to packages/types/src/interfaces/democracy/types.ts
index 221b93d59a..51b4409580 100644
--- a/packages/types/src/srml/democracy/types.ts
+++ b/packages/types/src/interfaces/democracy/types.ts
@@ -1,9 +1,9 @@
-// Auto-generated via `yarn build:srmlTs`, do not edit
+// Auto-generated via `yarn build:interfaces`, do not edit
 
 import { Compact, Enum, Option, Struct, Vec } from '../../codec';
 import { Method, u32 } from '../../primitive';
-import { BlockNumber } from '../runtime/types';
-import { VoteThreshold } from '../elections/types';
+import { BlockNumber } from '../runtime';
+import { VoteThreshold } from '../elections';
 
 /** Enum */
 export interface Conviction extends Enum {
diff --git a/packages/types/src/srml/deprecated/definitions.ts b/packages/types/src/interfaces/deprecated/definitions.ts
similarity index 100%
rename from packages/types/src/srml/deprecated/definitions.ts
rename to packages/types/src/interfaces/deprecated/definitions.ts
diff --git a/packages/types/src/interfaces/deprecated/index.ts b/packages/types/src/interfaces/deprecated/index.ts
new file mode 100644
index 0000000000..f94c8a0ae8
--- /dev/null
+++ b/packages/types/src/interfaces/deprecated/index.ts
@@ -0,0 +1,3 @@
+// Auto-generated via `yarn build:interfaces`, do not edit
+
+export * from './types';
diff --git a/packages/types/src/srml/deprecated/types.ts b/packages/types/src/interfaces/deprecated/types.ts
similarity index 95%
rename from packages/types/src/srml/deprecated/types.ts
rename to packages/types/src/interfaces/deprecated/types.ts
index c7ab80f160..33309504e9 100644
--- a/packages/types/src/srml/deprecated/types.ts
+++ b/packages/types/src/interfaces/deprecated/types.ts
@@ -1,8 +1,8 @@
-// Auto-generated via `yarn build:srmlTs`, do not edit
+// Auto-generated via `yarn build:interfaces`, do not edit
 
 import { Compact, Enum, Option, Struct, Vec } from '../../codec';
 import { AccountId, Bytes, Null, i8, u32, u64 } from '../../primitive';
-import { Balance } from '../runtime/types';
+import { Balance } from '../runtime';
 
 /** Struct */
 export interface AccountInfo extends Struct {
diff --git a/packages/types/src/srml/elections/definitions.ts b/packages/types/src/interfaces/elections/definitions.ts
similarity index 100%
rename from packages/types/src/srml/elections/definitions.ts
rename to packages/types/src/interfaces/elections/definitions.ts
diff --git a/packages/types/src/interfaces/elections/index.ts b/packages/types/src/interfaces/elections/index.ts
new file mode 100644
index 0000000000..f94c8a0ae8
--- /dev/null
+++ b/packages/types/src/interfaces/elections/index.ts
@@ -0,0 +1,3 @@
+// Auto-generated via `yarn build:interfaces`, do not edit
+
+export * from './types';
diff --git a/packages/types/src/srml/elections/types.ts b/packages/types/src/interfaces/elections/types.ts
similarity index 94%
rename from packages/types/src/srml/elections/types.ts
rename to packages/types/src/interfaces/elections/types.ts
index be09161536..4839bf12d4 100644
--- a/packages/types/src/srml/elections/types.ts
+++ b/packages/types/src/interfaces/elections/types.ts
@@ -1,8 +1,8 @@
-// Auto-generated via `yarn build:srmlTs`, do not edit
+// Auto-generated via `yarn build:interfaces`, do not edit
 
 import { Compact, Enum, Option, Struct, Vec } from '../../codec';
 import { u32 } from '../../primitive';
-import { Balance } from '../runtime/types';
+import { Balance } from '../runtime';
 
 /** u32 */
 export type ApprovalFlag = u32;
diff --git a/packages/types/src/srml/grandpa/definitions.ts b/packages/types/src/interfaces/grandpa/definitions.ts
similarity index 100%
rename from packages/types/src/srml/grandpa/definitions.ts
rename to packages/types/src/interfaces/grandpa/definitions.ts
diff --git a/packages/types/src/interfaces/grandpa/index.ts b/packages/types/src/interfaces/grandpa/index.ts
new file mode 100644
index 0000000000..f94c8a0ae8
--- /dev/null
+++ b/packages/types/src/interfaces/grandpa/index.ts
@@ -0,0 +1,3 @@
+// Auto-generated via `yarn build:interfaces`, do not edit
+
+export * from './types';
diff --git a/packages/types/src/srml/grandpa/types.ts b/packages/types/src/interfaces/grandpa/types.ts
similarity index 93%
rename from packages/types/src/srml/grandpa/types.ts
rename to packages/types/src/interfaces/grandpa/types.ts
index 746fea8d0e..356a50626c 100644
--- a/packages/types/src/srml/grandpa/types.ts
+++ b/packages/types/src/interfaces/grandpa/types.ts
@@ -1,10 +1,10 @@
-// Auto-generated via `yarn build:srmlTs`, do not edit
+// Auto-generated via `yarn build:interfaces`, do not edit
 
 import { Codec } from '../../types';
 import { Compact, Enum, Option, Struct, Vec } from '../../codec';
 import { u64 } from '../../primitive';
-import { BlockNumber } from '../runtime/types';
-import { AuthorityId } from '../consensus/types';
+import { BlockNumber } from '../runtime';
+import { AuthorityId } from '../consensus';
 
 /** u64 */
 export type AuthorityWeight = u64;
diff --git a/packages/types/src/srml/imOnline/definitions.ts b/packages/types/src/interfaces/imOnline/definitions.ts
similarity index 100%
rename from packages/types/src/srml/imOnline/definitions.ts
rename to packages/types/src/interfaces/imOnline/definitions.ts
diff --git a/packages/types/src/interfaces/imOnline/index.ts b/packages/types/src/interfaces/imOnline/index.ts
new file mode 100644
index 0000000000..f94c8a0ae8
--- /dev/null
+++ b/packages/types/src/interfaces/imOnline/index.ts
@@ -0,0 +1,3 @@
+// Auto-generated via `yarn build:interfaces`, do not edit
+
+export * from './types';
diff --git a/packages/types/src/srml/imOnline/types.ts b/packages/types/src/interfaces/imOnline/types.ts
similarity index 86%
rename from packages/types/src/srml/imOnline/types.ts
rename to packages/types/src/interfaces/imOnline/types.ts
index 54388c7174..b529fc4f32 100644
--- a/packages/types/src/srml/imOnline/types.ts
+++ b/packages/types/src/interfaces/imOnline/types.ts
@@ -1,10 +1,10 @@
-// Auto-generated via `yarn build:srmlTs`, do not edit
+// Auto-generated via `yarn build:interfaces`, do not edit
 
 import { Option, Struct, Vec } from '../../codec';
 import { Bytes } from '../../primitive';
-import { BlockNumber } from '../runtime/types';
-import { AuthorityId } from '../consensus/types';
-import { SessionIndex } from '../session/types';
+import { BlockNumber } from '../runtime';
+import { AuthorityId } from '../consensus';
+import { SessionIndex } from '../session';
 
 /** Struct */
 export interface Heartbeat extends Struct {
diff --git a/packages/types/src/interfaces/index.ts b/packages/types/src/interfaces/index.ts
new file mode 100644
index 0000000000..f94c8a0ae8
--- /dev/null
+++ b/packages/types/src/interfaces/index.ts
@@ -0,0 +1,3 @@
+// Auto-generated via `yarn build:interfaces`, do not edit
+
+export * from './types';
diff --git a/packages/types/src/srml/parachains/definitions.ts b/packages/types/src/interfaces/parachains/definitions.ts
similarity index 100%
rename from packages/types/src/srml/parachains/definitions.ts
rename to packages/types/src/interfaces/parachains/definitions.ts
diff --git a/packages/types/src/interfaces/parachains/index.ts b/packages/types/src/interfaces/parachains/index.ts
new file mode 100644
index 0000000000..f94c8a0ae8
--- /dev/null
+++ b/packages/types/src/interfaces/parachains/index.ts
@@ -0,0 +1,3 @@
+// Auto-generated via `yarn build:interfaces`, do not edit
+
+export * from './types';
diff --git a/packages/types/src/srml/parachains/types.ts b/packages/types/src/interfaces/parachains/types.ts
similarity index 99%
rename from packages/types/src/srml/parachains/types.ts
rename to packages/types/src/interfaces/parachains/types.ts
index 77d6746a5e..e7b31aaec0 100644
--- a/packages/types/src/srml/parachains/types.ts
+++ b/packages/types/src/interfaces/parachains/types.ts
@@ -1,9 +1,9 @@
-// Auto-generated via `yarn build:srmlTs`, do not edit
+// Auto-generated via `yarn build:interfaces`, do not edit
 
 import { Codec } from '../../types';
 import { Compact, Enum, Option, Struct, Vec } from '../../codec';
 import { AccountId, Bytes, u32, u64 } from '../../primitive';
-import { BalanceOf, BlockNumber, Hash, Signature } from '../runtime/types';
+import { BalanceOf, BlockNumber, Hash, Signature } from '../runtime';
 
 /** Struct */
 export interface AttestedCandidate extends Struct {
diff --git a/packages/types/src/srml/rpc/ChainProperties.spec.ts b/packages/types/src/interfaces/rpc/ChainProperties.spec.ts
similarity index 100%
rename from packages/types/src/srml/rpc/ChainProperties.spec.ts
rename to packages/types/src/interfaces/rpc/ChainProperties.spec.ts
diff --git a/packages/types/src/srml/rpc/ExtrinsicStatus.spec.ts b/packages/types/src/interfaces/rpc/ExtrinsicStatus.spec.ts
similarity index 100%
rename from packages/types/src/srml/rpc/ExtrinsicStatus.spec.ts
rename to packages/types/src/interfaces/rpc/ExtrinsicStatus.spec.ts
diff --git a/packages/types/src/srml/rpc/KeyValueOption.spec.ts b/packages/types/src/interfaces/rpc/KeyValueOption.spec.ts
similarity index 100%
rename from packages/types/src/srml/rpc/KeyValueOption.spec.ts
rename to packages/types/src/interfaces/rpc/KeyValueOption.spec.ts
diff --git a/packages/types/src/srml/rpc/RuntimeVersion.spec.ts b/packages/types/src/interfaces/rpc/RuntimeVersion.spec.ts
similarity index 100%
rename from packages/types/src/srml/rpc/RuntimeVersion.spec.ts
rename to packages/types/src/interfaces/rpc/RuntimeVersion.spec.ts
diff --git a/packages/types/src/srml/rpc/SignedBlock.spec.ts b/packages/types/src/interfaces/rpc/SignedBlock.spec.ts
similarity index 100%
rename from packages/types/src/srml/rpc/SignedBlock.spec.ts
rename to packages/types/src/interfaces/rpc/SignedBlock.spec.ts
diff --git a/packages/types/src/srml/rpc/StorageChangeSet.spec.ts b/packages/types/src/interfaces/rpc/StorageChangeSet.spec.ts
similarity index 100%
rename from packages/types/src/srml/rpc/StorageChangeSet.spec.ts
rename to packages/types/src/interfaces/rpc/StorageChangeSet.spec.ts
diff --git a/packages/types/src/srml/rpc/definitions.ts b/packages/types/src/interfaces/rpc/definitions.ts
similarity index 100%
rename from packages/types/src/srml/rpc/definitions.ts
rename to packages/types/src/interfaces/rpc/definitions.ts
diff --git a/packages/types/src/interfaces/rpc/index.ts b/packages/types/src/interfaces/rpc/index.ts
new file mode 100644
index 0000000000..f94c8a0ae8
--- /dev/null
+++ b/packages/types/src/interfaces/rpc/index.ts
@@ -0,0 +1,3 @@
+// Auto-generated via `yarn build:interfaces`, do not edit
+
+export * from './types';
diff --git a/packages/types/src/srml/rpc/types.ts b/packages/types/src/interfaces/rpc/types.ts
similarity index 98%
rename from packages/types/src/srml/rpc/types.ts
rename to packages/types/src/interfaces/rpc/types.ts
index 4be6a8bdf1..4fb739b3fa 100644
--- a/packages/types/src/srml/rpc/types.ts
+++ b/packages/types/src/interfaces/rpc/types.ts
@@ -1,9 +1,9 @@
-// Auto-generated via `yarn build:srmlTs`, do not edit
+// Auto-generated via `yarn build:interfaces`, do not edit
 
 import { Codec } from '../../types';
 import { Enum, Option, Struct, Vec } from '../../codec';
 import { Block, Bytes, ConsensusEngineId, StorageKey, Text, bool, u32, u64, u8 } from '../../primitive';
-import { BlockNumber, Hash, Justification, Signature, StorageData } from '../runtime/types';
+import { BlockNumber, Hash, Justification, Signature, StorageData } from '../runtime';
 
 /** Vec<u8> */
 export type ApiId = Vec<u8>;
diff --git a/packages/types/src/srml/runtime/KeyValue.spec.ts b/packages/types/src/interfaces/runtime/KeyValue.spec.ts
similarity index 100%
rename from packages/types/src/srml/runtime/KeyValue.spec.ts
rename to packages/types/src/interfaces/runtime/KeyValue.spec.ts
diff --git a/packages/types/src/srml/runtime/definitions.ts b/packages/types/src/interfaces/runtime/definitions.ts
similarity index 100%
rename from packages/types/src/srml/runtime/definitions.ts
rename to packages/types/src/interfaces/runtime/definitions.ts
diff --git a/packages/types/src/interfaces/runtime/index.ts b/packages/types/src/interfaces/runtime/index.ts
new file mode 100644
index 0000000000..f94c8a0ae8
--- /dev/null
+++ b/packages/types/src/interfaces/runtime/index.ts
@@ -0,0 +1,3 @@
+// Auto-generated via `yarn build:interfaces`, do not edit
+
+export * from './types';
diff --git a/packages/types/src/srml/runtime/types.ts b/packages/types/src/interfaces/runtime/types.ts
similarity index 98%
rename from packages/types/src/srml/runtime/types.ts
rename to packages/types/src/interfaces/runtime/types.ts
index 40bbec0ace..29f74912ee 100644
--- a/packages/types/src/srml/runtime/types.ts
+++ b/packages/types/src/interfaces/runtime/types.ts
@@ -1,4 +1,4 @@
-// Auto-generated via `yarn build:srmlTs`, do not edit
+// Auto-generated via `yarn build:interfaces`, do not edit
 
 import { Codec } from '../../types';
 import { Compact, Option, Struct, Vec } from '../../codec';
diff --git a/packages/types/src/srml/session/definitions.ts b/packages/types/src/interfaces/session/definitions.ts
similarity index 100%
rename from packages/types/src/srml/session/definitions.ts
rename to packages/types/src/interfaces/session/definitions.ts
diff --git a/packages/types/src/interfaces/session/index.ts b/packages/types/src/interfaces/session/index.ts
new file mode 100644
index 0000000000..f94c8a0ae8
--- /dev/null
+++ b/packages/types/src/interfaces/session/index.ts
@@ -0,0 +1,3 @@
+// Auto-generated via `yarn build:interfaces`, do not edit
+
+export * from './types';
diff --git a/packages/types/src/srml/session/types.ts b/packages/types/src/interfaces/session/types.ts
similarity index 84%
rename from packages/types/src/srml/session/types.ts
rename to packages/types/src/interfaces/session/types.ts
index 88e043b7a0..8b65ab42e7 100644
--- a/packages/types/src/srml/session/types.ts
+++ b/packages/types/src/interfaces/session/types.ts
@@ -1,8 +1,8 @@
-// Auto-generated via `yarn build:srmlTs`, do not edit
+// Auto-generated via `yarn build:interfaces`, do not edit
 
 import { Compact, Option, Vec } from '../../codec';
 import { u32 } from '../../primitive';
-import { SessionKeys } from '../runtime/types';
+import { SessionKeys } from '../runtime';
 
 /** SessionKeys */
 export type Keys = SessionKeys;
diff --git a/packages/types/src/srml/staking/definitions.ts b/packages/types/src/interfaces/staking/definitions.ts
similarity index 100%
rename from packages/types/src/srml/staking/definitions.ts
rename to packages/types/src/interfaces/staking/definitions.ts
diff --git a/packages/types/src/interfaces/staking/index.ts b/packages/types/src/interfaces/staking/index.ts
new file mode 100644
index 0000000000..f94c8a0ae8
--- /dev/null
+++ b/packages/types/src/interfaces/staking/index.ts
@@ -0,0 +1,3 @@
+// Auto-generated via `yarn build:interfaces`, do not edit
+
+export * from './types';
diff --git a/packages/types/src/srml/staking/types.ts b/packages/types/src/interfaces/staking/types.ts
similarity index 96%
rename from packages/types/src/srml/staking/types.ts
rename to packages/types/src/interfaces/staking/types.ts
index 3ea4986333..6b73ecd7df 100644
--- a/packages/types/src/srml/staking/types.ts
+++ b/packages/types/src/interfaces/staking/types.ts
@@ -1,8 +1,8 @@
-// Auto-generated via `yarn build:srmlTs`, do not edit
+// Auto-generated via `yarn build:interfaces`, do not edit
 
 import { Compact, Enum, Option, Struct, Vec } from '../../codec';
 import { AccountId, Moment, u32 } from '../../primitive';
-import { Balance, BlockNumber } from '../runtime/types';
+import { Balance, BlockNumber } from '../runtime';
 
 /** u32 */
 export type EraIndex = u32;
diff --git a/packages/types/src/srml/system/EventRecord.spec.ts b/packages/types/src/interfaces/system/EventRecord.spec.ts
similarity index 100%
rename from packages/types/src/srml/system/EventRecord.spec.ts
rename to packages/types/src/interfaces/system/EventRecord.spec.ts
diff --git a/packages/types/src/srml/system/definitions.ts b/packages/types/src/interfaces/system/definitions.ts
similarity index 100%
rename from packages/types/src/srml/system/definitions.ts
rename to packages/types/src/interfaces/system/definitions.ts
diff --git a/packages/types/src/interfaces/system/index.ts b/packages/types/src/interfaces/system/index.ts
new file mode 100644
index 0000000000..f94c8a0ae8
--- /dev/null
+++ b/packages/types/src/interfaces/system/index.ts
@@ -0,0 +1,3 @@
+// Auto-generated via `yarn build:interfaces`, do not edit
+
+export * from './types';
diff --git a/packages/types/src/srml/system/types.ts b/packages/types/src/interfaces/system/types.ts
similarity index 94%
rename from packages/types/src/srml/system/types.ts
rename to packages/types/src/interfaces/system/types.ts
index 9581dc7f79..e03817b8c4 100644
--- a/packages/types/src/srml/system/types.ts
+++ b/packages/types/src/interfaces/system/types.ts
@@ -1,8 +1,8 @@
-// Auto-generated via `yarn build:srmlTs`, do not edit
+// Auto-generated via `yarn build:interfaces`, do not edit
 
 import { Compact, Enum, Option, Struct, Vec } from '../../codec';
 import { Bytes, Digest, Event, u32, u8 } from '../../primitive';
-import { Hash } from '../runtime/types';
+import { Hash } from '../runtime';
 
 /** Digest */
 export type DigestOf = Digest;
diff --git a/packages/types/src/srml/treasury/definitions.ts b/packages/types/src/interfaces/treasury/definitions.ts
similarity index 100%
rename from packages/types/src/srml/treasury/definitions.ts
rename to packages/types/src/interfaces/treasury/definitions.ts
diff --git a/packages/types/src/interfaces/treasury/index.ts b/packages/types/src/interfaces/treasury/index.ts
new file mode 100644
index 0000000000..f94c8a0ae8
--- /dev/null
+++ b/packages/types/src/interfaces/treasury/index.ts
@@ -0,0 +1,3 @@
+// Auto-generated via `yarn build:interfaces`, do not edit
+
+export * from './types';
diff --git a/packages/types/src/srml/treasury/types.ts b/packages/types/src/interfaces/treasury/types.ts
similarity index 85%
rename from packages/types/src/srml/treasury/types.ts
rename to packages/types/src/interfaces/treasury/types.ts
index e68d0f1f1d..27f1f823b8 100644
--- a/packages/types/src/srml/treasury/types.ts
+++ b/packages/types/src/interfaces/treasury/types.ts
@@ -1,8 +1,8 @@
-// Auto-generated via `yarn build:srmlTs`, do not edit
+// Auto-generated via `yarn build:interfaces`, do not edit
 
 import { Option, Struct, Vec } from '../../codec';
 import { AccountId } from '../../primitive';
-import { Balance } from '../runtime/types';
+import { Balance } from '../runtime';
 
 /** Struct */
 export interface TreasuryProposal extends Struct {
diff --git a/packages/types/src/srml/types.ts b/packages/types/src/interfaces/types.ts
similarity index 91%
rename from packages/types/src/srml/types.ts
rename to packages/types/src/interfaces/types.ts
index c6e4a2824b..b59d193c27 100644
--- a/packages/types/src/srml/types.ts
+++ b/packages/types/src/interfaces/types.ts
@@ -1,4 +1,4 @@
-// Auto-generated via `yarn build:srmlTs`, do not edit
+// Auto-generated via `yarn build:interfaces`, do not edit
 
 export * from './runtime/types';
 export * from './consensus/types';
diff --git a/packages/types/src/primitive/Block.ts b/packages/types/src/primitive/Block.ts
index d48134f321..092af48466 100644
--- a/packages/types/src/primitive/Block.ts
+++ b/packages/types/src/primitive/Block.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Hash } from '../srml/runtime/types';
+import { Hash } from '../interfaces/runtime';
 import { AnyU8a } from '../types';
 
 import { blake2AsU8a } from '@polkadot/util-crypto';
diff --git a/packages/types/src/primitive/Digest.ts b/packages/types/src/primitive/Digest.ts
index 1493833758..1581ef07a9 100644
--- a/packages/types/src/primitive/Digest.ts
+++ b/packages/types/src/primitive/Digest.ts
@@ -2,9 +2,9 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { AuthorityId } from '../srml/consensus/types';
-import { Hash } from '../srml/runtime/types';
-import { Consensus, PreRuntime, Seal, SealV0 } from '../srml/rpc/types';
+import { AuthorityId } from '../interfaces/consensus';
+import { Hash } from '../interfaces/runtime';
+import { Consensus, PreRuntime, Seal, SealV0 } from '../interfaces/rpc';
 
 import { assert } from '@polkadot/util';
 
diff --git a/packages/types/src/primitive/Event.ts b/packages/types/src/primitive/Event.ts
index 63f38e04f1..1393d79368 100644
--- a/packages/types/src/primitive/Event.ts
+++ b/packages/types/src/primitive/Event.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { EventId } from '../srml/system/types';
+import { EventId } from '../interfaces/system';
 import { Constructor, Codec } from '../types';
 
 import { assert, isUndefined, stringCamelCase, u8aToHex } from '@polkadot/util';
diff --git a/packages/types/src/primitive/EventRecord.ts b/packages/types/src/primitive/EventRecord.ts
index 5154fa0fa2..b5e9134f9b 100644
--- a/packages/types/src/primitive/EventRecord.ts
+++ b/packages/types/src/primitive/EventRecord.ts
@@ -2,8 +2,8 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Hash } from '../srml/runtime/types';
-import { Phase } from '../srml/system/types';
+import { Hash } from '../interfaces/runtime';
+import { Phase } from '../interfaces/system';
 
 import { ClassOf } from '../codec/createType';
 import Struct from '../codec/Struct';
diff --git a/packages/types/src/primitive/Extrinsic/Extrinsic.ts b/packages/types/src/primitive/Extrinsic/Extrinsic.ts
index 08aeb78087..1926cba60b 100644
--- a/packages/types/src/primitive/Extrinsic/Extrinsic.ts
+++ b/packages/types/src/primitive/Extrinsic/Extrinsic.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Balance, Index } from '../../srml/runtime/types';
+import { Balance, Index } from '../../interfaces/runtime';
 import { AnyU8a, ArgsDef, Codec, ExtrinsicPayloadValue, IExtrinsic, IHash, IKeyringPair, SignatureOptions } from '../../types';
 
 import { assert, isHex, isU8a, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util';
diff --git a/packages/types/src/primitive/Extrinsic/SignaturePayload.ts b/packages/types/src/primitive/Extrinsic/SignaturePayload.ts
index b50b7ea6cc..42df19fd21 100644
--- a/packages/types/src/primitive/Extrinsic/SignaturePayload.ts
+++ b/packages/types/src/primitive/Extrinsic/SignaturePayload.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Balance, Hash, Index } from '../../srml/runtime/types';
+import { Balance, Hash, Index } from '../../interfaces/runtime';
 import { IKeyringPair } from '../../types';
 
 import { u8aToHex } from '@polkadot/util';
diff --git a/packages/types/src/primitive/Extrinsic/v1/ExtrinsicSignature.ts b/packages/types/src/primitive/Extrinsic/v1/ExtrinsicSignature.ts
index 5a966454f1..eeaf6fc02d 100644
--- a/packages/types/src/primitive/Extrinsic/v1/ExtrinsicSignature.ts
+++ b/packages/types/src/primitive/Extrinsic/v1/ExtrinsicSignature.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Balance, Index, Signature } from '../../../srml/runtime/types';
+import { Balance, Index, Signature } from '../../../interfaces/runtime';
 import { ExtrinsicPayloadValue, IExtrinsicSignature, IKeyringPair, SignatureOptions } from '../../../types';
 
 import createType, { ClassOf } from '../../../codec/createType';
diff --git a/packages/types/src/primitive/Extrinsic/v1/SignaturePayload.ts b/packages/types/src/primitive/Extrinsic/v1/SignaturePayload.ts
index bae56e240f..0f52d4b93e 100644
--- a/packages/types/src/primitive/Extrinsic/v1/SignaturePayload.ts
+++ b/packages/types/src/primitive/Extrinsic/v1/SignaturePayload.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Hash, Index } from '../../../srml/runtime/types';
+import { Hash, Index } from '../../../interfaces/runtime';
 import { AnyNumber, AnyU8a, ExtrinsicPayloadValue, IExtrinsicEra, IKeyringPair, IMethod } from '../../../types';
 
 import { ClassOf } from '../../../codec/createType';
diff --git a/packages/types/src/primitive/Extrinsic/v2/ExtrinsicExtra.ts b/packages/types/src/primitive/Extrinsic/v2/ExtrinsicExtra.ts
index 245f8a780d..4801333d26 100644
--- a/packages/types/src/primitive/Extrinsic/v2/ExtrinsicExtra.ts
+++ b/packages/types/src/primitive/Extrinsic/v2/ExtrinsicExtra.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Balance, Index } from '../../../srml/runtime/types';
+import { Balance, Index } from '../../../interfaces/runtime';
 import { AnyNumber } from '../../../types';
 
 import { ClassOf } from '../../../codec/createType';
diff --git a/packages/types/src/primitive/Extrinsic/v2/ExtrinsicSignature.ts b/packages/types/src/primitive/Extrinsic/v2/ExtrinsicSignature.ts
index afb9223d48..c7b78a02c8 100644
--- a/packages/types/src/primitive/Extrinsic/v2/ExtrinsicSignature.ts
+++ b/packages/types/src/primitive/Extrinsic/v2/ExtrinsicSignature.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Balance, Index, Signature } from '../../../srml/runtime/types';
+import { Balance, Index, Signature } from '../../../interfaces/runtime';
 import { ExtrinsicPayloadValue, IExtrinsicSignature, IKeyringPair, SignatureOptions } from '../../../types';
 
 import createType, { ClassOf } from '../../../codec/createType';
diff --git a/packages/types/src/primitive/Extrinsic/v2/SignaturePayload.ts b/packages/types/src/primitive/Extrinsic/v2/SignaturePayload.ts
index 0f66bfc48c..a9f87146a1 100644
--- a/packages/types/src/primitive/Extrinsic/v2/SignaturePayload.ts
+++ b/packages/types/src/primitive/Extrinsic/v2/SignaturePayload.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Balance, Hash, Index } from '../../../srml/runtime/types';
+import { Balance, Hash, Index } from '../../../interfaces/runtime';
 import { AnyNumber, AnyU8a, ExtrinsicPayloadValue, IExtrinsicEra, IKeyringPair, IMethod } from '../../../types';
 
 import { ClassOf } from '../../../codec/createType';
diff --git a/packages/types/src/primitive/Header.ts b/packages/types/src/primitive/Header.ts
index 89ab1165fc..ba14b0d5bf 100644
--- a/packages/types/src/primitive/Header.ts
+++ b/packages/types/src/primitive/Header.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { BlockNumber, Hash } from '../srml/runtime/types';
+import { BlockNumber, Hash } from '../interfaces/runtime';
 import { AnyNumber, AnyU8a } from '../types';
 
 import { ClassOf } from '../codec/createType';
diff --git a/packages/types/src/primitive/Vote.ts b/packages/types/src/primitive/Vote.ts
index c2daeeb8ba..517afd5371 100644
--- a/packages/types/src/primitive/Vote.ts
+++ b/packages/types/src/primitive/Vote.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Conviction } from '../srml/democracy/types';
+import { Conviction } from '../interfaces/democracy';
 
 import { isBoolean, isNumber, isObject, isU8a, isUndefined } from '@polkadot/util';
 
diff --git a/packages/types/src/scripts/srmlTS.ts b/packages/types/src/scripts/interfacesTs.ts
similarity index 91%
rename from packages/types/src/scripts/srmlTS.ts
rename to packages/types/src/scripts/interfacesTs.ts
index ffb4808b56..4fc22ec4b6 100644
--- a/packages/types/src/scripts/srmlTS.ts
+++ b/packages/types/src/scripts/interfacesTs.ts
@@ -9,7 +9,7 @@ import { getTypeDef, TypeDef, TypeDefInfo, TypeDefExtVecFixed } from '../codec/c
 import * as codecClasses from '../codec';
 import { COMPACT_ENCODABLE } from '../codec/Compact';
 import * as primitiveClasses from '../primitive';
-import * as definitions from '../srml/definitions';
+import * as definitions from '../interfaces/definitions';
 import { Constructor } from '../types';
 
 // these map all the codec and primitive types for import, see the TypeImports below. If
@@ -27,7 +27,7 @@ interface TypeImports {
   primitiveTypes: TypeExist;
 }
 
-const HEADER = '// Auto-generated via `yarn build:srmlTs`, do not edit\n\n';
+const HEADER = '// Auto-generated via `yarn build:interfaces`, do not edit\n\n';
 const FOOTER = '\n';
 
 // Maps the types as found to the source location. This is used to generate the
@@ -49,7 +49,7 @@ function setImports ({ codecTypes, localTypes, ownTypes, primitiveTypes }: TypeI
       if (moduleName) {
         localTypes[moduleName][type] = true;
 
-        console.log(`\tImporting ${type} from ../'${moduleName}/types'`);
+        console.log(`\tImporting ${type} from ../${moduleName}`);
       }
     }
   });
@@ -278,7 +278,7 @@ ${Object.keys(types).map((type): string => getDerivedTypes(type, types[type], im
 }`;
 }
 
-function generateTsDef (srmlName: string, { types }: { types: Record<string, any> }): void {
+function generateTsDef (defName: string, { types }: { types: Record<string, any> }): void {
   // handlers are defined externally to use - this means that when we do a
   // `generators[typedef.info](...)` TS will show any unhandled types. Rather
   // we are being explicit in having no handlers where we do not support (yet)
@@ -327,23 +327,25 @@ function generateTsDef (srmlName: string, { types }: { types: Record<string, any
       types: Object.keys(primitiveTypes)
     },
     ...Object.keys(localTypes).map((moduleName): { file: string; types: string[] } => ({
-      file: `../${moduleName}/types`,
+      file: `../${moduleName}`,
       types: Object.keys(localTypes[moduleName])
     }))
   ]);
 
-  fs.writeFileSync(`packages/types/src/srml/${srmlName}/types.ts`, header.concat(sortedDefs).concat(interfaceReg).concat(FOOTER), { flag: 'w' });
+  fs.writeFileSync(`packages/types/src/interfaces/${defName}/types.ts`, header.concat(sortedDefs).concat(interfaceReg).concat(FOOTER), { flag: 'w' });
+  fs.writeFileSync(`packages/types/src/interfaces/${defName}/index.ts`, HEADER.concat(`export * from './types';`).concat(FOOTER), { flag: 'w' });
 }
 
-Object.entries(definitions).forEach(([srmlName, obj]): void => {
-  console.log(`Extracting definitions for ${srmlName}`);
+Object.entries(definitions).forEach(([defName, obj]): void => {
+  console.log(`Extracting interfaces for ${defName}`);
 
-  generateTsDef(srmlName, obj);
+  generateTsDef(defName, obj);
 });
 
-console.log(`Writing srml/types.ts`);
+console.log(`Writing interfaces/types.ts`);
 
-fs.writeFileSync(`packages/types/src/srml/types.ts`, HEADER.concat(Object.keys(definitions).map((moduleName): string => `export * from './${moduleName}/types';`).join('\n')).concat(FOOTER), { flag: 'w' });
+fs.writeFileSync(`packages/types/src/interfaces/types.ts`, HEADER.concat(Object.keys(definitions).map((moduleName): string => `export * from './${moduleName}/types';`).join('\n')).concat(FOOTER), { flag: 'w' });
+fs.writeFileSync(`packages/types/src/interfaces/index.ts`, HEADER.concat(`export * from './types';`).concat(FOOTER), { flag: 'w' });
 
 function generateInterfaceRegistry (): void {
   const codecTypes: TypeExist = {};
diff --git a/packages/types/src/scripts/srmlTSWrapper.js b/packages/types/src/scripts/interfacesTsWrapper.js
similarity index 90%
rename from packages/types/src/scripts/srmlTSWrapper.js
rename to packages/types/src/scripts/interfacesTsWrapper.js
index 2f47849748..97da7046c3 100644
--- a/packages/types/src/scripts/srmlTSWrapper.js
+++ b/packages/types/src/scripts/interfacesTsWrapper.js
@@ -7,4 +7,4 @@ require('@babel/register')({
   extensions: ['.js', '.ts']
 });
 
-require('./srmlTS.ts');
+require('./interfacesTs.ts');
diff --git a/packages/types/src/types.ts b/packages/types/src/types.ts
index 1bfeac4232..acd41879e9 100644
--- a/packages/types/src/types.ts
+++ b/packages/types/src/types.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Balance, Index } from './srml/runtime/types';
+import { Balance, Index } from './interfaces/runtime';
 
 import BN from 'bn.js';