diff --git a/packages/api-contract/src/MetaRegistry.ts b/packages/api-contract/src/MetaRegistry.ts
index aaf7cc94fe..0bd164e249 100644
--- a/packages/api-contract/src/MetaRegistry.ts
+++ b/packages/api-contract/src/MetaRegistry.ts
@@ -5,7 +5,7 @@ import { ContractDisplayName, ChainProperties, SiField, SiLookupTypeId, SiType,
 import { InterfaceTypes, TypeDef, TypeDefInfo } from '@polkadot/types/types';
 
 import { assert, isUndefined } from '@polkadot/util';
-import { TypeRegistry, withTypeString } from '@polkadot/types';
+import { TypeRegistry, withTypeString } from '@polkadot/types/create';
 
 interface PartialTypeSpec {
   readonly type: SiLookupTypeId;
diff --git a/packages/api-contract/src/util.ts b/packages/api-contract/src/util.ts
index e7397778ca..2d9a9c0783 100644
--- a/packages/api-contract/src/util.ts
+++ b/packages/api-contract/src/util.ts
@@ -5,7 +5,8 @@ import { SubmittableResult } from '@polkadot/api';
 import { EventRecord } from '@polkadot/types/interfaces';
 import { Codec, Registry, TypeDef } from '@polkadot/types/types';
 
-import { Raw, createTypeUnsafe } from '@polkadot/types';
+import { Raw } from '@polkadot/types';
+import { createTypeUnsafe } from '@polkadot/types/create';
 
 type ContractEvents = 'CodeStored' | 'ContractExecution' | 'Instantiated';
 
diff --git a/packages/api-derive/src/index.spec.ts b/packages/api-derive/src/index.spec.ts
index 63e30a2003..e01f257b7e 100644
--- a/packages/api-derive/src/index.spec.ts
+++ b/packages/api-derive/src/index.spec.ts
@@ -8,7 +8,7 @@
 import { Observable, from } from 'rxjs';
 import { ApiRx } from '@polkadot/api/rx';
 import MockProvider from '@polkadot/rpc-provider/mock';
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import { ExactDerive } from '.';
 
diff --git a/packages/api-derive/src/util/approvalFlagToBools.spec.ts b/packages/api-derive/src/util/approvalFlagToBools.spec.ts
index 81e1567d78..9b1db87823 100644
--- a/packages/api-derive/src/util/approvalFlagToBools.spec.ts
+++ b/packages/api-derive/src/util/approvalFlagToBools.spec.ts
@@ -3,7 +3,7 @@
 
 import { ApprovalFlag } from '@polkadot/types/interfaces';
 
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import { approvalFlagsToBools } from './approvalFlagsToBools';
 
diff --git a/packages/api/src/base/Decorate.ts b/packages/api/src/base/Decorate.ts
index e1763250e2..f40c9ee464 100644
--- a/packages/api/src/base/Decorate.ts
+++ b/packages/api/src/base/Decorate.ts
@@ -17,8 +17,9 @@ import { memo } from '@polkadot/api-derive/util';
 import { Metadata, expandMetadata } from '@polkadot/metadata';
 import { RpcCore } from '@polkadot/rpc-core';
 import { WsProvider } from '@polkadot/rpc-provider';
-import { Option, Raw, StorageKey, Text, TypeRegistry, u64 } from '@polkadot/types';
+import { Option, Raw, StorageKey, Text, u64 } from '@polkadot/types';
 import { DEFAULT_VERSION as EXTRINSIC_DEFAULT_VERSION } from '@polkadot/types/extrinsic/constants';
+import { TypeRegistry } from '@polkadot/types/create';
 import { unwrapStorageType } from '@polkadot/types/primitive/StorageKey';
 import { assert, compactStripLength, logger, u8aToHex } from '@polkadot/util';
 
diff --git a/packages/api/src/base/Init.ts b/packages/api/src/base/Init.ts
index 78902eef5e..e593f74e66 100644
--- a/packages/api/src/base/Init.ts
+++ b/packages/api/src/base/Init.ts
@@ -10,7 +10,8 @@ import BN from 'bn.js';
 import { Observable, Subscription, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { Metadata } from '@polkadot/metadata';
-import { Text, TypeRegistry } from '@polkadot/types';
+import { Text } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 import { LATEST_EXTRINSIC_VERSION } from '@polkadot/types/extrinsic/Extrinsic';
 import { getSpecAlias, getSpecTypes, getUpgradeVersion } from '@polkadot/types-known';
 import { BN_ZERO, assert, logger, u8aEq, u8aToU8a } from '@polkadot/util';
diff --git a/packages/api/src/checkTypes.manual.ts b/packages/api/src/checkTypes.manual.ts
index 2c46f4dfd8..3acb321764 100644
--- a/packages/api/src/checkTypes.manual.ts
+++ b/packages/api/src/checkTypes.manual.ts
@@ -9,7 +9,7 @@ import { IExtrinsic, IMethod } from '@polkadot/types/types';
 import { ApiPromise } from '@polkadot/api';
 import { HeaderExtended } from '@polkadot/api-derive';
 import { TestKeyringMap, createTestPairs } from '@polkadot/keyring/testingPairs';
-import { createTypeUnsafe, TypeRegistry } from '@polkadot/types';
+import { createTypeUnsafe, TypeRegistry } from '@polkadot/types/create';
 
 import { SubmittableResult } from './';
 
diff --git a/packages/api/src/promise/index.spec.ts b/packages/api/src/promise/index.spec.ts
index 9a322c4e10..ade0df7de5 100644
--- a/packages/api/src/promise/index.spec.ts
+++ b/packages/api/src/promise/index.spec.ts
@@ -6,7 +6,7 @@ import { ApiOptions, SubmittableExtrinsic } from '../types';
 import { createPair } from '@polkadot/keyring/pair';
 import { createTestKeyring } from '@polkadot/keyring/testing';
 import Mock from '@polkadot/rpc-provider/mock/index';
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 import { hexToU8a } from '@polkadot/util';
 
 import { SingleAccountSigner } from '../../test/util';
diff --git a/packages/api/src/rx/index.spec.ts b/packages/api/src/rx/index.spec.ts
index 528a415d9e..61c06361a3 100644
--- a/packages/api/src/rx/index.spec.ts
+++ b/packages/api/src/rx/index.spec.ts
@@ -7,7 +7,7 @@ import { Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { createTestPairs } from '@polkadot/keyring/testingPairs';
 import Mock from '@polkadot/rpc-provider/mock/index';
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import { SingleAccountSigner } from '../../test/util';
 import { ApiRx } from '.';
diff --git a/packages/api/src/util/validate.spec.ts b/packages/api/src/util/validate.spec.ts
index 99c51033f5..15bcf6c1f3 100644
--- a/packages/api/src/util/validate.spec.ts
+++ b/packages/api/src/util/validate.spec.ts
@@ -5,7 +5,7 @@ import { Storage } from '@polkadot/metadata/decorate/types';
 
 import { Metadata, storageFromMeta } from '@polkadot/metadata';
 import metaStatic from '@polkadot/metadata/static';
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import { extractStorageArgs } from './validate';
 
diff --git a/packages/metadata/src/MagicNumber.spec.ts b/packages/metadata/src/MagicNumber.spec.ts
index 3339b050b3..a57be42ebf 100644
--- a/packages/metadata/src/MagicNumber.spec.ts
+++ b/packages/metadata/src/MagicNumber.spec.ts
@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/metadata authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import { MagicNumber, MAGIC_NUMBER } from './MagicNumber';
 
diff --git a/packages/metadata/src/Metadata.spec.ts b/packages/metadata/src/Metadata.spec.ts
index a89d7f022b..d45470203d 100644
--- a/packages/metadata/src/Metadata.spec.ts
+++ b/packages/metadata/src/Metadata.spec.ts
@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/metadata authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import substrateData from './static';
 import { Metadata } from './Metadata';
diff --git a/packages/metadata/src/decorate/consts/fromMetadata.spec.ts b/packages/metadata/src/decorate/consts/fromMetadata.spec.ts
index 3607777352..51dbce44f5 100644
--- a/packages/metadata/src/decorate/consts/fromMetadata.spec.ts
+++ b/packages/metadata/src/decorate/consts/fromMetadata.spec.ts
@@ -3,7 +3,7 @@
 
 import { Constants } from '../types';
 
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import { Metadata } from '../../Metadata';
 import rpcMetadata from '../../static';
diff --git a/packages/metadata/src/decorate/consts/fromMetadata.ts b/packages/metadata/src/decorate/consts/fromMetadata.ts
index 44ff6df1b0..cb6e50f28e 100644
--- a/packages/metadata/src/decorate/consts/fromMetadata.ts
+++ b/packages/metadata/src/decorate/consts/fromMetadata.ts
@@ -4,7 +4,6 @@
 import { Registry } from '@polkadot/types/types';
 import { Constants, ConstantCodec, ModuleConstants } from '../types';
 
-import { createTypeUnsafe } from '@polkadot/types/create';
 import { hexToU8a, stringCamelCase } from '@polkadot/util';
 
 import { Metadata } from '../../Metadata';
@@ -22,7 +21,7 @@ export function constantsFromMeta (registry: Registry, metadata: Metadata): Cons
     result[stringCamelCase(name)] = moduleMetadata.constants.reduce((newModule: ModuleConstants, meta): ModuleConstants => {
       // convert to the natural type as received
       const type = meta.type.toString();
-      const codec: ConstantCodec = createTypeUnsafe(registry, type, [hexToU8a(meta.value.toHex())]);
+      const codec = registry.createType(type as 'Raw', hexToU8a(meta.value.toHex())) as unknown as ConstantCodec;
 
       codec.meta = meta;
       newModule[stringCamelCase(meta.name)] = codec;
diff --git a/packages/metadata/src/decorate/extrinsics/fromMetadata.spec.ts b/packages/metadata/src/decorate/extrinsics/fromMetadata.spec.ts
index 41dd589b10..1939578299 100644
--- a/packages/metadata/src/decorate/extrinsics/fromMetadata.spec.ts
+++ b/packages/metadata/src/decorate/extrinsics/fromMetadata.spec.ts
@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/metadata authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import { Metadata } from '../../Metadata';
 import json from '../../static';
diff --git a/packages/metadata/src/decorate/extrinsics/index.spec.ts b/packages/metadata/src/decorate/extrinsics/index.spec.ts
index 382d216903..b8a7190e93 100644
--- a/packages/metadata/src/decorate/extrinsics/index.spec.ts
+++ b/packages/metadata/src/decorate/extrinsics/index.spec.ts
@@ -3,7 +3,7 @@
 
 import BN from 'bn.js';
 import { createTestPairs } from '@polkadot/keyring/testingPairs';
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import { Metadata } from '../../Metadata';
 import metadataStatic from '../../static';
diff --git a/packages/metadata/src/decorate/storage/createFunction.spec.ts b/packages/metadata/src/decorate/storage/createFunction.spec.ts
index 3bd865e9fa..636d54f38d 100644
--- a/packages/metadata/src/decorate/storage/createFunction.spec.ts
+++ b/packages/metadata/src/decorate/storage/createFunction.spec.ts
@@ -1,7 +1,8 @@
 // Copyright 2017-2020 @polkadot/metadata authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { Text, TypeRegistry } from '@polkadot/types';
+import { Text } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 import { u8aToHex } from '@polkadot/util';
 
 import createFunction from './createFunction';
diff --git a/packages/metadata/src/decorate/storage/createFunction.ts b/packages/metadata/src/decorate/storage/createFunction.ts
index 60b0dbeaff..8227d16947 100644
--- a/packages/metadata/src/decorate/storage/createFunction.ts
+++ b/packages/metadata/src/decorate/storage/createFunction.ts
@@ -7,8 +7,7 @@ import { Codec, Registry } from '@polkadot/types/types';
 
 import BN from 'bn.js';
 import { Raw } from '@polkadot/types/codec';
-import { createTypeUnsafe } from '@polkadot/types/create';
-import { StorageKey } from '@polkadot/types';
+import { StorageKey } from '@polkadot/types/primitive';
 import { assert, compactAddLength, compactStripLength, isNull, isUndefined, stringLowerFirst, u8aConcat } from '@polkadot/util';
 import { xxhashAsU8a } from '@polkadot/util-crypto';
 
@@ -72,8 +71,8 @@ function createKeyDoubleMap (registry: Registry, itemFn: CreateItemFn, args: [Cr
 
   const [key1, key2] = args;
   const map = type.asDoubleMap;
-  const val1 = createTypeUnsafe(registry, map.key1.toString(), [key1]).toU8a();
-  const val2 = createTypeUnsafe(registry, map.key2.toString(), [key2]).toU8a();
+  const val1 = registry.createType(map.key1.toString() as 'Raw', key1).toU8a();
+  const val2 = registry.createType(map.key2.toString() as 'Raw', key2).toU8a();
 
   // as per createKey, always add the length prefix (underlying it is Bytes)
   return compactAddLength(u8aConcat(
@@ -94,7 +93,7 @@ function createKey (registry: Registry, itemFn: CreateItemFn, arg: CreateArgType
 
     assert(!isUndefined(arg) && !isNull(arg), `${name.toString()} is a Map and requires one argument`);
 
-    param = createTypeUnsafe(registry, map.key.toString(), [arg]).toU8a();
+    param = registry.createType(map.key.toString() as 'Raw', arg).toU8a();
   }
 
   // StorageKey is a Bytes, so is length-prefixed
@@ -136,7 +135,7 @@ function extendHeadMeta (registry: Registry, { meta: { documentation, name, type
   // meta fallback only applies to actual entry values, create one for head
   (iterFn as IterFn).meta = registry.createType('StorageEntryMetadataLatest', {
     documentation,
-    fallback: registry.createType('Bytes', createTypeUnsafe(registry, outputType).toHex()),
+    fallback: registry.createType('Bytes', registry.createType(outputType as 'Raw').toHex()),
     modifier: registry.createType('StorageEntryModifierLatest', 1), // required
     name,
     type: registry.createType('StorageEntryTypeLatest', registry.createType('Type', type.isMap ? type.asMap.key : type.asDoubleMap.key1), 0)
diff --git a/packages/metadata/src/decorate/storage/fromMetadata.spec.ts b/packages/metadata/src/decorate/storage/fromMetadata.spec.ts
index 58643d0671..c3f3ef5bba 100644
--- a/packages/metadata/src/decorate/storage/fromMetadata.spec.ts
+++ b/packages/metadata/src/decorate/storage/fromMetadata.spec.ts
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { createTestPairs } from '@polkadot/keyring/testingPairs';
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 import { u8aToHex } from '@polkadot/util';
 
 import { Metadata } from '../../';
diff --git a/packages/metadata/src/decorate/storage/getHasher.spec.ts b/packages/metadata/src/decorate/storage/getHasher.spec.ts
index 21a31cfb2a..3e09b28715 100644
--- a/packages/metadata/src/decorate/storage/getHasher.spec.ts
+++ b/packages/metadata/src/decorate/storage/getHasher.spec.ts
@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/metadata authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 import { stringToU8a } from '@polkadot/util';
 import { xxhashAsU8a } from '@polkadot/util-crypto';
 
diff --git a/packages/metadata/src/decorate/storage/storage.spec.ts b/packages/metadata/src/decorate/storage/storage.spec.ts
index 5abf349bec..015d62e780 100644
--- a/packages/metadata/src/decorate/storage/storage.spec.ts
+++ b/packages/metadata/src/decorate/storage/storage.spec.ts
@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/metadata authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import getStorage from './storage';
 
diff --git a/packages/metadata/src/util/toCallsOnly.spec.ts b/packages/metadata/src/util/toCallsOnly.spec.ts
index 3f716b11d3..b568d37c73 100644
--- a/packages/metadata/src/util/toCallsOnly.spec.ts
+++ b/packages/metadata/src/util/toCallsOnly.spec.ts
@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/metadata authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import staticData from '../static';
 import { Metadata } from '../Metadata';
diff --git a/packages/metadata/src/util/toCallsOnly.ts b/packages/metadata/src/util/toCallsOnly.ts
index 44ec7cc498..1f556cbb66 100644
--- a/packages/metadata/src/util/toCallsOnly.ts
+++ b/packages/metadata/src/util/toCallsOnly.ts
@@ -4,7 +4,8 @@
 import { FunctionMetadataLatest, MetadataLatest } from '@polkadot/types/interfaces/metadata';
 import { AnyJson, Registry } from '@polkadot/types/types';
 
-import { Option, Text, Vec, u8 } from '@polkadot/types';
+import { Option, Vec } from '@polkadot/types/codec';
+import { Text, u8 } from '@polkadot/types/primitive';
 
 interface ModuleMetadataTrimmed {
   calls: Option<Vec<FunctionMetadataLatest>>;
diff --git a/packages/metadata/src/v10/Metadata.spec.ts b/packages/metadata/src/v10/Metadata.spec.ts
index 9ca46eb557..514228f255 100644
--- a/packages/metadata/src/v10/Metadata.spec.ts
+++ b/packages/metadata/src/v10/Metadata.spec.ts
@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/metadata authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import substrateJson from './static-substrate.json';
 import substrateData from './static';
diff --git a/packages/metadata/src/v11/Metadata.spec.ts b/packages/metadata/src/v11/Metadata.spec.ts
index 79a373e8c7..a77aece86f 100644
--- a/packages/metadata/src/v11/Metadata.spec.ts
+++ b/packages/metadata/src/v11/Metadata.spec.ts
@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/metadata authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import substrateJson from './static-substrate.json';
 import substrateData from './static';
diff --git a/packages/metadata/src/v12/Metadata.spec.ts b/packages/metadata/src/v12/Metadata.spec.ts
index 7ac7d3c206..2ec39f5e85 100644
--- a/packages/metadata/src/v12/Metadata.spec.ts
+++ b/packages/metadata/src/v12/Metadata.spec.ts
@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/metadata authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import substrateJson from './static-substrate.json';
 import substrateData from './static';
diff --git a/packages/metadata/src/v9/Metadata.spec.ts b/packages/metadata/src/v9/Metadata.spec.ts
index fcee74695b..0399fcbaa5 100644
--- a/packages/metadata/src/v9/Metadata.spec.ts
+++ b/packages/metadata/src/v9/Metadata.spec.ts
@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/metadata authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import substrateJson from './static-substrate.json';
 import substrateData from './static';
diff --git a/packages/rpc-core/src/cached.spec.ts b/packages/rpc-core/src/cached.spec.ts
index a2139eb71d..afcc709a00 100644
--- a/packages/rpc-core/src/cached.spec.ts
+++ b/packages/rpc-core/src/cached.spec.ts
@@ -3,7 +3,7 @@
 
 import { createTestPairs } from '@polkadot/keyring/testingPairs';
 import MockProvider from '@polkadot/rpc-provider/mock';
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import { RpcCore } from '.';
 
diff --git a/packages/rpc-core/src/index.spec.ts b/packages/rpc-core/src/index.spec.ts
index 18939b1ccd..d880530478 100644
--- a/packages/rpc-core/src/index.spec.ts
+++ b/packages/rpc-core/src/index.spec.ts
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import MockProvider from '@polkadot/rpc-provider/mock';
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 import { isFunction } from '@polkadot/util';
 
 import { RpcCore } from '.';
diff --git a/packages/rpc-core/src/index.ts b/packages/rpc-core/src/index.ts
index 44c530853b..52abe9c47b 100644
--- a/packages/rpc-core/src/index.ts
+++ b/packages/rpc-core/src/index.ts
@@ -10,7 +10,8 @@ import memoizee from 'memoizee';
 import { Observable, Observer } from 'rxjs';
 import { publishReplay, refCount } from 'rxjs/operators';
 import jsonrpc from '@polkadot/types/interfaces/jsonrpc';
-import { Option, StorageKey, Vec, createClass, createTypeUnsafe } from '@polkadot/types';
+import { Option, StorageKey, Vec } from '@polkadot/types';
+import { createClass, createTypeUnsafe } from '@polkadot/types/create';
 import { assert, hexToU8a, isFunction, isNull, isUndefined, logger, u8aToU8a } from '@polkadot/util';
 
 import normalizer from './normalizer';
diff --git a/packages/rpc-core/src/methodSend.spec.ts b/packages/rpc-core/src/methodSend.spec.ts
index 20f011b535..6113ec9ce3 100644
--- a/packages/rpc-core/src/methodSend.spec.ts
+++ b/packages/rpc-core/src/methodSend.spec.ts
@@ -3,7 +3,7 @@
 
 import { DefinitionRpc } from '@polkadot/types/types';
 
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import { RpcCore } from '.';
 
diff --git a/packages/rpc-core/src/replay.spec.ts b/packages/rpc-core/src/replay.spec.ts
index 49d51c991c..a6bd45c59e 100644
--- a/packages/rpc-core/src/replay.spec.ts
+++ b/packages/rpc-core/src/replay.spec.ts
@@ -3,7 +3,7 @@
 
 import { Observable, of } from 'rxjs';
 import MockProvider from '@polkadot/rpc-provider/mock';
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import { RpcCore } from '.';
 
diff --git a/packages/rpc-provider/src/mock/on.spec.ts b/packages/rpc-provider/src/mock/on.spec.ts
index 67b11084df..ddf5725884 100644
--- a/packages/rpc-provider/src/mock/on.spec.ts
+++ b/packages/rpc-provider/src/mock/on.spec.ts
@@ -3,7 +3,7 @@
 
 import { ProviderInterfaceEmitted } from '../types';
 
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import Mock from './';
 
diff --git a/packages/rpc-provider/src/mock/send.spec.ts b/packages/rpc-provider/src/mock/send.spec.ts
index c281608cfb..2863ef95f3 100644
--- a/packages/rpc-provider/src/mock/send.spec.ts
+++ b/packages/rpc-provider/src/mock/send.spec.ts
@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/rpc-provider authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import Mock from './';
 
diff --git a/packages/rpc-provider/src/mock/subscribe.spec.ts b/packages/rpc-provider/src/mock/subscribe.spec.ts
index a143f24c0f..bb6c6c41e3 100644
--- a/packages/rpc-provider/src/mock/subscribe.spec.ts
+++ b/packages/rpc-provider/src/mock/subscribe.spec.ts
@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/rpc-provider authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import Mock from './';
 
diff --git a/packages/rpc-provider/src/mock/unsubscribe.spec.ts b/packages/rpc-provider/src/mock/unsubscribe.spec.ts
index 476ecf7581..71fff3239b 100644
--- a/packages/rpc-provider/src/mock/unsubscribe.spec.ts
+++ b/packages/rpc-provider/src/mock/unsubscribe.spec.ts
@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/rpc-provider authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import Mock from './';
 
diff --git a/packages/typegen/src/util/formatting.ts b/packages/typegen/src/util/formatting.ts
index a9fb4a02fc..1780d50aee 100644
--- a/packages/typegen/src/util/formatting.ts
+++ b/packages/typegen/src/util/formatting.ts
@@ -5,8 +5,7 @@ import Handlebars from 'handlebars';
 
 import { TypeDef, TypeDefInfo } from '@polkadot/types/create/types';
 
-import { getTypeDef } from '@polkadot/types/create';
-import { paramsNotation } from '@polkadot/types/codec/utils';
+import { getTypeDef, paramsNotation } from '@polkadot/types/create';
 import { isString } from '@polkadot/util';
 
 import { setImports, ModuleTypes, TypeImports } from './imports';
diff --git a/packages/types/src/codec/index.ts b/packages/types/src/codec/index.ts
index a5dea4fe86..ca5c116b29 100644
--- a/packages/types/src/codec/index.ts
+++ b/packages/types/src/codec/index.ts
@@ -27,6 +27,3 @@ export { default as Int } from './Int';
 export { default as Raw } from './Raw';
 export { default as UInt } from './UInt';
 export { default as U8aFixed } from './U8aFixed';
-
-// Type management helper functions
-export * from './utils/encodeTypes';
diff --git a/packages/types/src/codec/utils/index.ts b/packages/types/src/codec/utils/index.ts
index 81165735c5..722b504f1e 100644
--- a/packages/types/src/codec/utils/index.ts
+++ b/packages/types/src/codec/utils/index.ts
@@ -7,5 +7,3 @@ export { compareSet } from './compareSet';
 export { decodeU8a } from './decodeU8a';
 export { mapToTypeMap } from './mapToTypeMap';
 export { typeToConstructor } from './typeToConstructor';
-
-export * from './encodeTypes';
diff --git a/packages/types/src/codec/utils/encodeTypes.ts b/packages/types/src/create/encodeTypes.ts
similarity index 98%
rename from packages/types/src/codec/utils/encodeTypes.ts
rename to packages/types/src/create/encodeTypes.ts
index b387387ae3..36a7860df5 100644
--- a/packages/types/src/codec/utils/encodeTypes.ts
+++ b/packages/types/src/create/encodeTypes.ts
@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/types authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { TypeDef, TypeDefInfo } from '../../create/types';
+import { TypeDef, TypeDefInfo } from './types';
 
 import { assert, isNumber, isUndefined } from '@polkadot/util';
 
diff --git a/packages/types/src/create/index.ts b/packages/types/src/create/index.ts
index 082e437276..5c1068faa2 100644
--- a/packages/types/src/create/index.ts
+++ b/packages/types/src/create/index.ts
@@ -5,6 +5,7 @@ import { createType } from './createType';
 
 export * from './createClass';
 export * from './createType';
+export * from './encodeTypes';
 export * from './getTypeDef';
 export * from './registry';
 export * from './typeSplit';
diff --git a/packages/types/src/interfaces/state/StorageChangeSet.spec.ts b/packages/types/src/interfaces/state/StorageChangeSet.spec.ts
index 5902ba1478..a86e65d6e5 100644
--- a/packages/types/src/interfaces/state/StorageChangeSet.spec.ts
+++ b/packages/types/src/interfaces/state/StorageChangeSet.spec.ts
@@ -3,7 +3,7 @@
 
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 
-import { TypeRegistry } from '@polkadot/types';
+import { TypeRegistry } from '@polkadot/types/create';
 
 import json from '../../json/StorageChangeSet.001.json';