diff --git a/basic-network/.env b/basic-network/.env
deleted file mode 100644
index 4fd2ee0d73..0000000000
--- a/basic-network/.env
+++ /dev/null
@@ -1 +0,0 @@
-COMPOSE_PROJECT_NAME=net
diff --git a/basic-network/README.md b/basic-network/README.md
deleted file mode 100644
index ec8acfbc25..0000000000
--- a/basic-network/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-## Basic Network Config
-
-Note that this basic configuration uses pre-generated certificates and
-key material, and also has predefined transactions to initialize a
-channel named "mychannel".
-
-To regenerate this material, simply run ``generate.sh``.
-
-To start the network, run ``start.sh``.
-To stop it, run ``stop.sh``
-To completely remove all incriminating evidence of the network
-on your system, run ``teardown.sh``.
-
-
This work is licensed under a Creative Commons Attribution 4.0 International License
diff --git a/basic-network/config/channel.tx b/basic-network/config/channel.tx
deleted file mode 100644
index e4e8678138..0000000000
Binary files a/basic-network/config/channel.tx and /dev/null differ
diff --git a/basic-network/config/genesis.block b/basic-network/config/genesis.block
deleted file mode 100644
index 8f555216e5..0000000000
Binary files a/basic-network/config/genesis.block and /dev/null differ
diff --git a/basic-network/configtx.yaml b/basic-network/configtx.yaml
deleted file mode 100644
index c7554769e7..0000000000
--- a/basic-network/configtx.yaml
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright IBM Corp. All Rights Reserved.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
----
-################################################################################
-#
-# Section: Organizations
-#
-# - This section defines the different organizational identities which will
-# be referenced later in the configuration.
-#
-################################################################################
-Organizations:
-
- # SampleOrg defines an MSP using the sampleconfig. It should never be used
- # in production but may be used as a template for other definitions
- - &OrdererOrg
- # DefaultOrg defines the organization which is used in the sampleconfig
- # of the fabric.git development environment
- Name: OrdererOrg
-
- # ID to load the MSP definition as
- ID: OrdererMSP
-
- # MSPDir is the filesystem path which contains the MSP configuration
- MSPDir: crypto-config/ordererOrganizations/example.com/msp
-
- # Policies defines the set of policies at this level of the config tree
- # For organization policies, their canonical path is usually
- # /Channel///
- Policies:
- Readers:
- Type: Signature
- Rule: "OR('OrdererMSP.member')"
- Writers:
- Type: Signature
- Rule: "OR('OrdererMSP.member')"
- Admins:
- Type: Signature
- Rule: "OR('OrdererMSP.admin')"
-
- - &Org1
- # DefaultOrg defines the organization which is used in the sampleconfig
- # of the fabric.git development environment
- Name: Org1MSP
-
- # ID to load the MSP definition as
- ID: Org1MSP
-
- MSPDir: crypto-config/peerOrganizations/org1.example.com/msp
-
- # Policies defines the set of policies at this level of the config tree
- # For organization policies, their canonical path is usually
- # /Channel///
- Policies:
- Readers:
- Type: Signature
- Rule: "OR('Org1MSP.admin', 'Org1MSP.peer', 'Org1MSP.client')"
- Writers:
- Type: Signature
- Rule: "OR('Org1MSP.admin', 'Org1MSP.client')"
- Admins:
- Type: Signature
- Rule: "OR('Org1MSP.admin')"
- Endorsement:
- Type: Signature
- Rule: "OR('Org1MSP.peer')"
-
- # leave this flag set to true.
- AnchorPeers:
- # AnchorPeers defines the location of peers which can be used
- # for cross org gossip communication. Note, this value is only
- # encoded in the genesis block in the Application section context
- - Host: peer0.org1.example.com
- Port: 7051
-
-################################################################################
-#
-# SECTION: Capabilities
-#
-# - This section defines the capabilities of fabric network. This is a new
-# concept as of v1.1.0 and should not be utilized in mixed networks with
-# v1.0.x peers and orderers. Capabilities define features which must be
-# present in a fabric binary for that binary to safely participate in the
-# fabric network. For instance, if a new MSP type is added, newer binaries
-# might recognize and validate the signatures from this type, while older
-# binaries without this support would be unable to validate those
-# transactions. This could lead to different versions of the fabric binaries
-# having different world states. Instead, defining a capability for a channel
-# informs those binaries without this capability that they must cease
-# processing transactions until they have been upgraded. For v1.0.x if any
-# capabilities are defined (including a map with all capabilities turned off)
-# then the v1.0.x peer will deliberately crash.
-#
-################################################################################
-Capabilities:
- # Channel capabilities apply to both the orderers and the peers and must be
- # supported by both.
- # Set the value of the capability to true to require it.
- Channel: &ChannelCapabilities
- # V2_0 capability ensures that orderers and peers behave according
- # to v2.0 channel capabilities. Orderers and peers from
- # prior releases would behave in an incompatible way, and are therefore
- # not able to participate in channels at v2.0 capability.
- # Prior to enabling V2.0 channel capabilities, ensure that all
- # orderers and peers on a channel are at v2.0.0 or later.
- V2_0: true
-
- # Orderer capabilities apply only to the orderers, and may be safely
- # used with prior release peers.
- # Set the value of the capability to true to require it.
- Orderer: &OrdererCapabilities
- # V2_0 orderer capability ensures that orderers behave according
- # to v2.0 orderer capabilities. Orderers from
- # prior releases would behave in an incompatible way, and are therefore
- # not able to participate in channels at v2.0 orderer capability.
- # Prior to enabling V2.0 orderer capabilities, ensure that all
- # orderers on channel are at v2.0.0 or later.
- V2_0: true
-
- # Application capabilities apply only to the peer network, and may be safely
- # used with prior release orderers.
- # Set the value of the capability to true to require it.
- Application: &ApplicationCapabilities
- # V2_0 application capability ensures that peers behave according
- # to v2.0 application capabilities. Peers from
- # prior releases would behave in an incompatible way, and are therefore
- # not able to participate in channels at v2.0 application capability.
- # Prior to enabling V2.0 application capabilities, ensure that all
- # peers on channel are at v2.0.0 or later.
- V2_0: true
-
-################################################################################
-#
-# SECTION: Application
-#
-# - This section defines the values to encode into a config transaction or
-# genesis block for application related parameters
-#
-################################################################################
-Application: &ApplicationDefaults
-
- # Organizations is the list of orgs which are defined as participants on
- # the application side of the network
- Organizations:
-
- # Policies defines the set of policies at this level of the config tree
- # For Application policies, their canonical path is
- # /Channel/Application/
- Policies:
- Readers:
- Type: ImplicitMeta
- Rule: "ANY Readers"
- Writers:
- Type: ImplicitMeta
- Rule: "ANY Writers"
- Admins:
- Type: ImplicitMeta
- Rule: "MAJORITY Admins"
- LifecycleEndorsement:
- Type: ImplicitMeta
- Rule: "MAJORITY Endorsement"
- Endorsement:
- Type: ImplicitMeta
- Rule: "MAJORITY Endorsement"
-
- Capabilities:
- <<: *ApplicationCapabilities
-################################################################################
-#
-# SECTION: Orderer
-#
-# - This section defines the values to encode into a config transaction or
-# genesis block for orderer related parameters
-#
-################################################################################
-Orderer: &OrdererDefaults
-
- # Orderer Type: The orderer implementation to start
- # Available types are "solo" and "kafka"
- OrdererType: solo
-
- Addresses:
- - orderer.example.com:7050
-
- # Batch Timeout: The amount of time to wait before creating a batch
- BatchTimeout: 2s
-
- # Batch Size: Controls the number of messages batched into a block
- BatchSize:
-
- # Max Message Count: The maximum number of messages to permit in a batch
- MaxMessageCount: 10
-
- # Absolute Max Bytes: The absolute maximum number of bytes allowed for
- # the serialized messages in a batch.
- AbsoluteMaxBytes: 99 MB
-
- # Preferred Max Bytes: The preferred maximum number of bytes allowed for
- # the serialized messages in a batch. A message larger than the preferred
- # max bytes will result in a batch larger than preferred max bytes.
- PreferredMaxBytes: 512 KB
-
- Kafka:
- # Brokers: A list of Kafka brokers to which the orderer connects
- # NOTE: Use IP:port notation
- Brokers:
- - 127.0.0.1:9092
-
- # Organizations is the list of orgs which are defined as participants on
- # the orderer side of the network
- Organizations:
-
- # Policies defines the set of policies at this level of the config tree
- # For Orderer policies, their canonical path is
- # /Channel/Orderer/
- Policies:
- Readers:
- Type: ImplicitMeta
- Rule: "ANY Readers"
- Writers:
- Type: ImplicitMeta
- Rule: "ANY Writers"
- Admins:
- Type: ImplicitMeta
- Rule: "MAJORITY Admins"
- # BlockValidation specifies what signatures must be included in the block
- # from the orderer for the peer to validate it.
- BlockValidation:
- Type: ImplicitMeta
- Rule: "ANY Writers"
-
-################################################################################
-#
-# CHANNEL
-#
-# This section defines the values to encode into a config transaction or
-# genesis block for channel related parameters.
-#
-################################################################################
-Channel: &ChannelDefaults
- # Policies defines the set of policies at this level of the config tree
- # For Channel policies, their canonical path is
- # /Channel/
- Policies:
- # Who may invoke the 'Deliver' API
- Readers:
- Type: ImplicitMeta
- Rule: "ANY Readers"
- # Who may invoke the 'Broadcast' API
- Writers:
- Type: ImplicitMeta
- Rule: "ANY Writers"
- # By default, who may modify elements at this config level
- Admins:
- Type: ImplicitMeta
- Rule: "MAJORITY Admins"
-
- # Capabilities describes the channel level capabilities, see the
- # dedicated Capabilities section elsewhere in this file for a full
- # description
- Capabilities:
- <<: *ChannelCapabilities
-
-################################################################################
-#
-# Profile
-#
-# - Different configuration profiles may be encoded here to be specified
-# as parameters to the configtxgen tool
-#
-################################################################################
-Profiles:
-
- OneOrgOrdererGenesis:
- <<: *ChannelDefaults
- Orderer:
- <<: *OrdererDefaults
- Organizations:
- - *OrdererOrg
- Capabilities:
- <<: *OrdererCapabilities
- Consortiums:
- SampleConsortium:
- Organizations:
- - *Org1
- OneOrgChannel:
- Consortium: SampleConsortium
- <<: *ChannelDefaults
- Application:
- <<: *ApplicationDefaults
- Organizations:
- - *Org1
- Capabilities:
- <<: *ApplicationCapabilities
diff --git a/basic-network/connection.json b/basic-network/connection.json
deleted file mode 100644
index 54cfca3276..0000000000
--- a/basic-network/connection.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
- "name": "basic-network",
- "version": "1.0.0",
- "client": {
- "organization": "Org1",
- "connection": {
- "timeout": {
- "peer": {
- "endorser": "300"
- },
- "orderer": "300"
- }
- }
- },
- "channels": {
- "mychannel": {
- "orderers": [
- "orderer.example.com"
- ],
- "peers": {
- "peer0.org1.example.com": {}
- }
- }
- },
- "organizations": {
- "Org1": {
- "mspid": "Org1MSP",
- "peers": [
- "peer0.org1.example.com"
- ],
- "certificateAuthorities": [
- "ca.example.com"
- ]
- }
- },
- "orderers": {
- "orderer.example.com": {
- "url": "grpc://localhost:7050"
- }
- },
- "peers": {
- "peer0.org1.example.com": {
- "url": "grpc://localhost:7051"
- }
- },
- "certificateAuthorities": {
- "ca.example.com": {
- "url": "http://localhost:7054",
- "caName": "ca.example.com"
- }
- }
-}
diff --git a/basic-network/connection.yaml b/basic-network/connection.yaml
deleted file mode 100644
index 2493b1219a..0000000000
--- a/basic-network/connection.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-name: basic-network
-version: 1.0.0
-client:
- organization: Org1
- connection:
- timeout:
- peer:
- endorser: '300'
- orderer: '300'
-channels:
- mychannel:
- orderers:
- - orderer.example.com
- peers:
- peer0.org1.example.com: {}
-organizations:
- Org1:
- mspid: Org1MSP
- peers:
- - peer0.org1.example.com
- certificateAuthorities:
- - ca.example.com
-orderers:
- orderer.example.com:
- url: grpc://localhost:7050
-peers:
- peer0.org1.example.com:
- url: grpc://localhost:7051
-certificateAuthorities:
- ca.example.com:
- url: http://localhost:7054
- caName: ca.example.com
diff --git a/basic-network/crypto-config.yaml b/basic-network/crypto-config.yaml
deleted file mode 100644
index 4c41cb2a04..0000000000
--- a/basic-network/crypto-config.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright IBM Corp. All Rights Reserved.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-# ---------------------------------------------------------------------------
-# "OrdererOrgs" - Definition of organizations managing orderer nodes
-# ---------------------------------------------------------------------------
-OrdererOrgs:
- # ---------------------------------------------------------------------------
- # Orderer
- # ---------------------------------------------------------------------------
- - Name: Orderer
- Domain: example.com
- # ---------------------------------------------------------------------------
- # "Specs" - See PeerOrgs below for complete description
- # ---------------------------------------------------------------------------
- Specs:
- - Hostname: orderer
-# ---------------------------------------------------------------------------
-# "PeerOrgs" - Definition of organizations managing peer nodes
-# ---------------------------------------------------------------------------
-PeerOrgs:
- # ---------------------------------------------------------------------------
- # Org1
- # ---------------------------------------------------------------------------
- - Name: Org1
- Domain: org1.example.com
- EnableNodeOUs: true
- # ---------------------------------------------------------------------------
- # "Specs"
- # ---------------------------------------------------------------------------
- # Uncomment this section to enable the explicit definition of hosts in your
- # configuration. Most users will want to use Template, below
- #
- # Specs is an array of Spec entries. Each Spec entry consists of two fields:
- # - Hostname: (Required) The desired hostname, sans the domain.
- # - CommonName: (Optional) Specifies the template or explicit override for
- # the CN. By default, this is the template:
- #
- # "{{.Hostname}}.{{.Domain}}"
- #
- # which obtains its values from the Spec.Hostname and
- # Org.Domain, respectively.
- # ---------------------------------------------------------------------------
- # Specs:
- # - Hostname: foo # implicitly "foo.org1.example.com"
- # CommonName: foo27.org5.example.com # overrides Hostname-based FQDN set above
- # - Hostname: bar
- # - Hostname: baz
- # ---------------------------------------------------------------------------
- # "Template"
- # ---------------------------------------------------------------------------
- # Allows for the definition of 1 or more hosts that are created sequentially
- # from a template. By default, this looks like "peer%d" from 0 to Count-1.
- # You may override the number of nodes (Count), the starting index (Start)
- # or the template used to construct the name (Hostname).
- #
- # Note: Template and Specs are not mutually exclusive. You may define both
- # sections and the aggregate nodes will be created for you. Take care with
- # name collisions
- # ---------------------------------------------------------------------------
- Template:
- Count: 1
- # Start: 5
- # Hostname: {{.Prefix}}{{.Index}} # default
- # ---------------------------------------------------------------------------
- # "Users"
- # ---------------------------------------------------------------------------
- # Count: The number of user accounts _in addition_ to Admin
- # ---------------------------------------------------------------------------
- Users:
- Count: 2
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/ca/648c46f45ef1849bf71259e8af75b24fbc7f10d14b1d24874ae29d06068f65b3_sk b/basic-network/crypto-config/ordererOrganizations/example.com/ca/648c46f45ef1849bf71259e8af75b24fbc7f10d14b1d24874ae29d06068f65b3_sk
deleted file mode 100644
index 3626a4579e..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/ca/648c46f45ef1849bf71259e8af75b24fbc7f10d14b1d24874ae29d06068f65b3_sk
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg7ILJbkoZBYqsu5pg
-8L6AvqBcNe9XQm5Y2FyjWJ8+SaShRANCAAQdO6cFQ9UqkEJlDyROQNr+1gb8CtNs
-zzPzNOuTO0WMRFCQ/lpKIINrWfeLpJYtaY4jEFWplHEULmlo+V5wg8Ob
------END PRIVATE KEY-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem
deleted file mode 100644
index d10cb13463..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICPTCCAeOgAwIBAgIQM2WSuizoDl4o6Ra1hKAM8jAKBggqhkjOPQQDAjBpMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w
-bGUuY29tMB4XDTE5MDQwMzE0MzUwMFoXDTI5MDMzMTE0MzUwMFowaTELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
-Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv
-bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABB07pwVD1SqQQmUPJE5A2v7WBvwK
-02zPM/M065M7RYxEUJD+Wkogg2tZ94ukli1pjiMQVamUcRQuaWj5XnCDw5ujbTBr
-MA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-DwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQgZIxG9F7xhJv3Elnor3WyT7x/ENFL
-HSSHSuKdBgaPZbMwCgYIKoZIzj0EAwIDSAAwRQIhAMCHE/tBDpX7J9E6cAJ+4x5N
-QiHaV4M6KD2TdTmR6B31AiA6PNJhyJIfbeRfi5bYyhVz6XFkhywK1g2SnYDy8I/2
-lQ==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem
deleted file mode 100644
index 014a46ff41..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICCjCCAbCgAwIBAgIQDmT3mRPEOoRB+uyj/WYmfTAKBggqhkjOPQQDAjBpMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w
-bGUuY29tMB4XDTE5MDQwMzE0MzUwMFoXDTI5MDMzMTE0MzUwMFowVjELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
-Y28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI
-zj0DAQcDQgAEvOsEIZNTIIhQ9SgcOA19vS/VrCrfw/rnGYMmkdZnzK/s9tcqDWtw
-r3vu9QU/lvtRZQQrpRVGJ3+PCNOQcuBuP6NNMEswDgYDVR0PAQH/BAQDAgeAMAwG
-A1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgZIxG9F7xhJv3Elnor3WyT7x/ENFLHSSH
-SuKdBgaPZbMwCgYIKoZIzj0EAwIDSAAwRQIhAJX03gBFoiN6Lgga32SZf7merIE5
-hI0dyWxSnk7w/bwyAiBppwuk/F1Xa5QIs5f27lvqb6ml35D+XoQZGH3xapAV/w==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem
deleted file mode 100644
index d10cb13463..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICPTCCAeOgAwIBAgIQM2WSuizoDl4o6Ra1hKAM8jAKBggqhkjOPQQDAjBpMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w
-bGUuY29tMB4XDTE5MDQwMzE0MzUwMFoXDTI5MDMzMTE0MzUwMFowaTELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
-Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv
-bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABB07pwVD1SqQQmUPJE5A2v7WBvwK
-02zPM/M065M7RYxEUJD+Wkogg2tZ94ukli1pjiMQVamUcRQuaWj5XnCDw5ujbTBr
-MA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-DwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQgZIxG9F7xhJv3Elnor3WyT7x/ENFL
-HSSHSuKdBgaPZbMwCgYIKoZIzj0EAwIDSAAwRQIhAMCHE/tBDpX7J9E6cAJ+4x5N
-QiHaV4M6KD2TdTmR6B31AiA6PNJhyJIfbeRfi5bYyhVz6XFkhywK1g2SnYDy8I/2
-lQ==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem
deleted file mode 100644
index 647ed247de..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICQzCCAeqgAwIBAgIRAIbz4U6+kgdiF8Od7x68k4AwCgYIKoZIzj0EAwIwbDEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l
-eGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1MDBaMGwxCzAJ
-BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh
-bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh
-bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARpyNzuqy3vGD8w64tu
-sCXu5rsAXys4olGMPUjfkljuP8jFDfJwxGU+20C/+hiFsjRdH1CMbPQoxzG21f84
-nPvco20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG
-AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEILePu2sfJ++9aUaXy849
-D31OLfdxpqdmLdbW4OGsL9AKMAoGCCqGSM49BAMCA0cAMEQCICLFFQizOr/8WEkT
-1tvkYlMsFD0QVE+yQZJmnk6n0ytAAiATc53kdAT9r+KqRH5cGyHtt2j8cGW5M6og
-dnmK55WtnA==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem
deleted file mode 100644
index 014a46ff41..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICCjCCAbCgAwIBAgIQDmT3mRPEOoRB+uyj/WYmfTAKBggqhkjOPQQDAjBpMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w
-bGUuY29tMB4XDTE5MDQwMzE0MzUwMFoXDTI5MDMzMTE0MzUwMFowVjELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
-Y28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI
-zj0DAQcDQgAEvOsEIZNTIIhQ9SgcOA19vS/VrCrfw/rnGYMmkdZnzK/s9tcqDWtw
-r3vu9QU/lvtRZQQrpRVGJ3+PCNOQcuBuP6NNMEswDgYDVR0PAQH/BAQDAgeAMAwG
-A1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgZIxG9F7xhJv3Elnor3WyT7x/ENFLHSSH
-SuKdBgaPZbMwCgYIKoZIzj0EAwIDSAAwRQIhAJX03gBFoiN6Lgga32SZf7merIE5
-hI0dyWxSnk7w/bwyAiBppwuk/F1Xa5QIs5f27lvqb6ml35D+XoQZGH3xapAV/w==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem
deleted file mode 100644
index d10cb13463..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICPTCCAeOgAwIBAgIQM2WSuizoDl4o6Ra1hKAM8jAKBggqhkjOPQQDAjBpMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w
-bGUuY29tMB4XDTE5MDQwMzE0MzUwMFoXDTI5MDMzMTE0MzUwMFowaTELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
-Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv
-bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABB07pwVD1SqQQmUPJE5A2v7WBvwK
-02zPM/M065M7RYxEUJD+Wkogg2tZ94ukli1pjiMQVamUcRQuaWj5XnCDw5ujbTBr
-MA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-DwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQgZIxG9F7xhJv3Elnor3WyT7x/ENFL
-HSSHSuKdBgaPZbMwCgYIKoZIzj0EAwIDSAAwRQIhAMCHE/tBDpX7J9E6cAJ+4x5N
-QiHaV4M6KD2TdTmR6B31AiA6PNJhyJIfbeRfi5bYyhVz6XFkhywK1g2SnYDy8I/2
-lQ==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/59a642f746fd7bc4e8980d4ea0a4497bdc354767d44e6d85b7326903c38f0df8_sk b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/59a642f746fd7bc4e8980d4ea0a4497bdc354767d44e6d85b7326903c38f0df8_sk
deleted file mode 100644
index f97c0bb77a..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/59a642f746fd7bc4e8980d4ea0a4497bdc354767d44e6d85b7326903c38f0df8_sk
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg9i2Mj6BNESew1Xss
-07ZNbTLq0SSSl0KvohwTjBRX/yKhRANCAARfc8Z7npAuT5h6cGayOImSd6/E/ve6
-blbFmysowIWXpD4i3sV1Rm1Gp14d7EYRPAcE1MwQ7tv5sAQgp1RWecg9
------END PRIVATE KEY-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem
deleted file mode 100644
index 3f4c6f3679..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICDDCCAbKgAwIBAgIQOiGD8n8XeFrxYZLzp4YzITAKBggqhkjOPQQDAjBpMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w
-bGUuY29tMB4XDTE5MDQwMzE0MzUwMFoXDTI5MDMzMTE0MzUwMFowWDELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
-Y28xHDAaBgNVBAMTE29yZGVyZXIuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggq
-hkjOPQMBBwNCAARfc8Z7npAuT5h6cGayOImSd6/E/ve6blbFmysowIWXpD4i3sV1
-Rm1Gp14d7EYRPAcE1MwQ7tv5sAQgp1RWecg9o00wSzAOBgNVHQ8BAf8EBAMCB4Aw
-DAYDVR0TAQH/BAIwADArBgNVHSMEJDAigCBkjEb0XvGEm/cSWeivdbJPvH8Q0Usd
-JIdK4p0GBo9lszAKBggqhkjOPQQDAgNIADBFAiEAuiXXJJ/5ghe4XySpQY53Nze7
-tSWeUronN+fgMTA6OboCICYWd236d+l0Z8/X83bJk9Wk/iTSYknoPQ3V/3bVMsT6
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem
deleted file mode 100644
index 647ed247de..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICQzCCAeqgAwIBAgIRAIbz4U6+kgdiF8Od7x68k4AwCgYIKoZIzj0EAwIwbDEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l
-eGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1MDBaMGwxCzAJ
-BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh
-bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh
-bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARpyNzuqy3vGD8w64tu
-sCXu5rsAXys4olGMPUjfkljuP8jFDfJwxGU+20C/+hiFsjRdH1CMbPQoxzG21f84
-nPvco20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG
-AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEILePu2sfJ++9aUaXy849
-D31OLfdxpqdmLdbW4OGsL9AKMAoGCCqGSM49BAMCA0cAMEQCICLFFQizOr/8WEkT
-1tvkYlMsFD0QVE+yQZJmnk6n0ytAAiATc53kdAT9r+KqRH5cGyHtt2j8cGW5M6og
-dnmK55WtnA==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt
deleted file mode 100644
index 647ed247de..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICQzCCAeqgAwIBAgIRAIbz4U6+kgdiF8Od7x68k4AwCgYIKoZIzj0EAwIwbDEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l
-eGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1MDBaMGwxCzAJ
-BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh
-bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh
-bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARpyNzuqy3vGD8w64tu
-sCXu5rsAXys4olGMPUjfkljuP8jFDfJwxGU+20C/+hiFsjRdH1CMbPQoxzG21f84
-nPvco20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG
-AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEILePu2sfJ++9aUaXy849
-D31OLfdxpqdmLdbW4OGsL9AKMAoGCCqGSM49BAMCA0cAMEQCICLFFQizOr/8WEkT
-1tvkYlMsFD0QVE+yQZJmnk6n0ytAAiATc53kdAT9r+KqRH5cGyHtt2j8cGW5M6og
-dnmK55WtnA==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt
deleted file mode 100644
index 15361b60d4..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICWTCCAgCgAwIBAgIRAOtmgphZzsrJyEUOYqj+tSIwCgYIKoZIzj0EAwIwbDEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l
-eGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1MDBaMFgxCzAJ
-BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh
-bmNpc2NvMRwwGgYDVQQDExNvcmRlcmVyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0C
-AQYIKoZIzj0DAQcDQgAEpEH+O8Cpx8ArCqZXwRSoLKpYrzN5HpO6EIdBQ+zOpdNF
-EhcMfLkA9OkQKsWfqHFKRREYlXlM0JrMED88uu+7RKOBljCBkzAOBgNVHQ8BAf8E
-BAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQC
-MAAwKwYDVR0jBCQwIoAgt4+7ax8n771pRpfLzj0PfU4t93Gmp2Yt1tbg4awv0Aow
-JwYDVR0RBCAwHoITb3JkZXJlci5leGFtcGxlLmNvbYIHb3JkZXJlcjAKBggqhkjO
-PQQDAgNHADBEAiA2lxV9A7WZ5Joj5SC1ZHzmrO+hTn7dEy3b+bACqBqL/QIgXP+l
-yT9gOCruy3CIhxzwUvy+AKmWQ0a2jPVbZ7i1xXk=
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key b/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key
deleted file mode 100644
index 7fda200876..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgcfTXkdwJb0j3ufgq
-KnqOfW0ph2B6Z9PijMEHrDswabqhRANCAASkQf47wKnHwCsKplfBFKgsqlivM3ke
-k7oQh0FD7M6l00USFwx8uQD06RAqxZ+ocUpFERiVeUzQmswQPzy677tE
------END PRIVATE KEY-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/tlsca/b78fbb6b1f27efbd694697cbce3d0f7d4e2df771a6a7662dd6d6e0e1ac2fd00a_sk b/basic-network/crypto-config/ordererOrganizations/example.com/tlsca/b78fbb6b1f27efbd694697cbce3d0f7d4e2df771a6a7662dd6d6e0e1ac2fd00a_sk
deleted file mode 100644
index 74d65910c3..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/tlsca/b78fbb6b1f27efbd694697cbce3d0f7d4e2df771a6a7662dd6d6e0e1ac2fd00a_sk
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg0VNZQ97o4L9R3rpJ
-hbinlLBN4XzgXxlW0WGdvrtYUHahRANCAARpyNzuqy3vGD8w64tusCXu5rsAXys4
-olGMPUjfkljuP8jFDfJwxGU+20C/+hiFsjRdH1CMbPQoxzG21f84nPvc
------END PRIVATE KEY-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem
deleted file mode 100644
index 647ed247de..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICQzCCAeqgAwIBAgIRAIbz4U6+kgdiF8Od7x68k4AwCgYIKoZIzj0EAwIwbDEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l
-eGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1MDBaMGwxCzAJ
-BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh
-bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh
-bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARpyNzuqy3vGD8w64tu
-sCXu5rsAXys4olGMPUjfkljuP8jFDfJwxGU+20C/+hiFsjRdH1CMbPQoxzG21f84
-nPvco20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG
-AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEILePu2sfJ++9aUaXy849
-D31OLfdxpqdmLdbW4OGsL9AKMAoGCCqGSM49BAMCA0cAMEQCICLFFQizOr/8WEkT
-1tvkYlMsFD0QVE+yQZJmnk6n0ytAAiATc53kdAT9r+KqRH5cGyHtt2j8cGW5M6og
-dnmK55WtnA==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem
deleted file mode 100644
index 014a46ff41..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICCjCCAbCgAwIBAgIQDmT3mRPEOoRB+uyj/WYmfTAKBggqhkjOPQQDAjBpMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w
-bGUuY29tMB4XDTE5MDQwMzE0MzUwMFoXDTI5MDMzMTE0MzUwMFowVjELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
-Y28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI
-zj0DAQcDQgAEvOsEIZNTIIhQ9SgcOA19vS/VrCrfw/rnGYMmkdZnzK/s9tcqDWtw
-r3vu9QU/lvtRZQQrpRVGJ3+PCNOQcuBuP6NNMEswDgYDVR0PAQH/BAQDAgeAMAwG
-A1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgZIxG9F7xhJv3Elnor3WyT7x/ENFLHSSH
-SuKdBgaPZbMwCgYIKoZIzj0EAwIDSAAwRQIhAJX03gBFoiN6Lgga32SZf7merIE5
-hI0dyWxSnk7w/bwyAiBppwuk/F1Xa5QIs5f27lvqb6ml35D+XoQZGH3xapAV/w==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem
deleted file mode 100644
index d10cb13463..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICPTCCAeOgAwIBAgIQM2WSuizoDl4o6Ra1hKAM8jAKBggqhkjOPQQDAjBpMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w
-bGUuY29tMB4XDTE5MDQwMzE0MzUwMFoXDTI5MDMzMTE0MzUwMFowaTELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
-Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv
-bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABB07pwVD1SqQQmUPJE5A2v7WBvwK
-02zPM/M065M7RYxEUJD+Wkogg2tZ94ukli1pjiMQVamUcRQuaWj5XnCDw5ujbTBr
-MA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-DwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQgZIxG9F7xhJv3Elnor3WyT7x/ENFL
-HSSHSuKdBgaPZbMwCgYIKoZIzj0EAwIDSAAwRQIhAMCHE/tBDpX7J9E6cAJ+4x5N
-QiHaV4M6KD2TdTmR6B31AiA6PNJhyJIfbeRfi5bYyhVz6XFkhywK1g2SnYDy8I/2
-lQ==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/d0d5354320a712722aca5b7a288a1798db622d7e4d7606e505a8f944fcb446f1_sk b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/d0d5354320a712722aca5b7a288a1798db622d7e4d7606e505a8f944fcb446f1_sk
deleted file mode 100644
index 876ddad1af..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/d0d5354320a712722aca5b7a288a1798db622d7e4d7606e505a8f944fcb446f1_sk
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgm60ZQuGuhkdKlHlp
-Ss/3sQC0JRBr4J3+06S47tuJKxShRANCAAS86wQhk1MgiFD1KBw4DX29L9WsKt/D
-+ucZgyaR1mfMr+z21yoNa3Cve+71BT+W+1FlBCulFUYnf48I05By4G4/
------END PRIVATE KEY-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem
deleted file mode 100644
index 014a46ff41..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICCjCCAbCgAwIBAgIQDmT3mRPEOoRB+uyj/WYmfTAKBggqhkjOPQQDAjBpMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w
-bGUuY29tMB4XDTE5MDQwMzE0MzUwMFoXDTI5MDMzMTE0MzUwMFowVjELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
-Y28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI
-zj0DAQcDQgAEvOsEIZNTIIhQ9SgcOA19vS/VrCrfw/rnGYMmkdZnzK/s9tcqDWtw
-r3vu9QU/lvtRZQQrpRVGJ3+PCNOQcuBuP6NNMEswDgYDVR0PAQH/BAQDAgeAMAwG
-A1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgZIxG9F7xhJv3Elnor3WyT7x/ENFLHSSH
-SuKdBgaPZbMwCgYIKoZIzj0EAwIDSAAwRQIhAJX03gBFoiN6Lgga32SZf7merIE5
-hI0dyWxSnk7w/bwyAiBppwuk/F1Xa5QIs5f27lvqb6ml35D+XoQZGH3xapAV/w==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem
deleted file mode 100644
index 647ed247de..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICQzCCAeqgAwIBAgIRAIbz4U6+kgdiF8Od7x68k4AwCgYIKoZIzj0EAwIwbDEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l
-eGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1MDBaMGwxCzAJ
-BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh
-bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh
-bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARpyNzuqy3vGD8w64tu
-sCXu5rsAXys4olGMPUjfkljuP8jFDfJwxGU+20C/+hiFsjRdH1CMbPQoxzG21f84
-nPvco20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG
-AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEILePu2sfJ++9aUaXy849
-D31OLfdxpqdmLdbW4OGsL9AKMAoGCCqGSM49BAMCA0cAMEQCICLFFQizOr/8WEkT
-1tvkYlMsFD0QVE+yQZJmnk6n0ytAAiATc53kdAT9r+KqRH5cGyHtt2j8cGW5M6og
-dnmK55WtnA==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt
deleted file mode 100644
index 647ed247de..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICQzCCAeqgAwIBAgIRAIbz4U6+kgdiF8Od7x68k4AwCgYIKoZIzj0EAwIwbDEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l
-eGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1MDBaMGwxCzAJ
-BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh
-bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh
-bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARpyNzuqy3vGD8w64tu
-sCXu5rsAXys4olGMPUjfkljuP8jFDfJwxGU+20C/+hiFsjRdH1CMbPQoxzG21f84
-nPvco20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG
-AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEILePu2sfJ++9aUaXy849
-D31OLfdxpqdmLdbW4OGsL9AKMAoGCCqGSM49BAMCA0cAMEQCICLFFQizOr/8WEkT
-1tvkYlMsFD0QVE+yQZJmnk6n0ytAAiATc53kdAT9r+KqRH5cGyHtt2j8cGW5M6og
-dnmK55WtnA==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.crt b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.crt
deleted file mode 100644
index 924a04c476..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.crt
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICKzCCAdKgAwIBAgIQfCAywNgEHI/DZAn6/YtLxjAKBggqhkjOPQQDAjBsMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAYBgNVBAMTEXRsc2NhLmV4
-YW1wbGUuY29tMB4XDTE5MDQwMzE0MzUwMFoXDTI5MDMzMTE0MzUwMFowVjELMAkG
-A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu
-Y2lzY28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYI
-KoZIzj0DAQcDQgAEWfwfjHN/tsL7xtVO+K95Kb/4YkFnjjHJfXwpeXoYARz/uQvC
-TRUU9sWbnu4GY5dd5Zo21K1SmC8JVN+WTGOf5KNsMGowDgYDVR0PAQH/BAQDAgWg
-MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMCsG
-A1UdIwQkMCKAILePu2sfJ++9aUaXy849D31OLfdxpqdmLdbW4OGsL9AKMAoGCCqG
-SM49BAMCA0cAMEQCIAem9y0xrm7JtWDLnb2kl/VKkog4t4JTSHn+TbX2ATVQAiBj
-RAnCepWwQefo2T/Yt/FjcxW9NGg4pcq70RjlN3w4Nw==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.key b/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.key
deleted file mode 100644
index 42055f39e3..0000000000
--- a/basic-network/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.key
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQghjq6fFiakPCEPD4Q
-K9o1exnhGAVn2yfmdWgSWeA7aoShRANCAARZ/B+Mc3+2wvvG1U74r3kpv/hiQWeO
-Mcl9fCl5ehgBHP+5C8JNFRT2xZue7gZjl13lmjbUrVKYLwlU35ZMY5/k
------END PRIVATE KEY-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/ca/76ecb26bf00310f650893c18f4459e03526f717dbebaba1fd572da030cecd2d9_sk b/basic-network/crypto-config/peerOrganizations/org1.example.com/ca/76ecb26bf00310f650893c18f4459e03526f717dbebaba1fd572da030cecd2d9_sk
deleted file mode 100644
index 94e64e8e99..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/ca/76ecb26bf00310f650893c18f4459e03526f717dbebaba1fd572da030cecd2d9_sk
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg0ulsAiNhX3McgBWR
-5sK+q90fK7tNQbPc43pbBH9jZVWhRANCAAS+9WaY59kvfBjNuGYep2vcQZFbNj4u
-7u+QQfOYmr7K5Gz2CKY4cyetLnuPkBcQhRF05ju8u3IarnT88qn9t9gM
------END PRIVATE KEY-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem
deleted file mode 100644
index f9099f6a4b..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICUDCCAfegAwIBAgIQLpBhJqg/HNcbDf8mBVTfPzAKBggqhkjOPQQDAjBzMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu
-b3JnMS5leGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1MDBa
-MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T
-YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMRwwGgYDVQQD
-ExNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-vvVmmOfZL3wYzbhmHqdr3EGRWzY+Lu7vkEHzmJq+yuRs9gimOHMnrS57j5AXEIUR
-dOY7vLtyGq50/PKp/bfYDKNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCB2
-7LJr8AMQ9lCJPBj0RZ4DUm9xfb66uh/VctoDDOzS2TAKBggqhkjOPQQDAgNHADBE
-AiAw6gaDSAPZpd3ZPKQ+anK+u7KMRi/K8J928d/75Z/wDQIgITk7fjENP1B83SEB
-xdVpMSqVfnwRRrEJFs+jS1ZztPE=
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
deleted file mode 100644
index ac6d2b3221..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICKjCCAdGgAwIBAgIRAPTSLupozmwcZ48H1jy0OYMwCgYIKoZIzj0EAwIwczEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh
-Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMTQzNTAwWhcNMjkwMzMxMTQzNTAw
-WjBsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN
-U2FuIEZyYW5jaXNjbzEPMA0GA1UECxMGY2xpZW50MR8wHQYDVQQDDBZBZG1pbkBv
-cmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEgCotpEt9
-BLbmV2l5cDxu6ZhbXr7NqmKwfYxN/HfLxAIv4IcaKG/pJeGK7dsvVSrecVvIbsd7
-bKncC0fCczuD0aNNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYD
-VR0jBCQwIoAgduyya/ADEPZQiTwY9EWeA1JvcX2+urof1XLaAwzs0tkwCgYIKoZI
-zj0EAwIDRwAwRAIgVolif/BDAdxuCLGstL/vfFq3zgNiuQ4Evk2B7EXF2NUCIA8K
-bsRh9QALSbCsoeSrItsfx7OLM6Ta/4+souF69BGv
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
deleted file mode 100644
index f9099f6a4b..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICUDCCAfegAwIBAgIQLpBhJqg/HNcbDf8mBVTfPzAKBggqhkjOPQQDAjBzMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu
-b3JnMS5leGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1MDBa
-MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T
-YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMRwwGgYDVQQD
-ExNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-vvVmmOfZL3wYzbhmHqdr3EGRWzY+Lu7vkEHzmJq+yuRs9gimOHMnrS57j5AXEIUR
-dOY7vLtyGq50/PKp/bfYDKNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCB2
-7LJr8AMQ9lCJPBj0RZ4DUm9xfb66uh/VctoDDOzS2TAKBggqhkjOPQQDAgNHADBE
-AiAw6gaDSAPZpd3ZPKQ+anK+u7KMRi/K8J928d/75Z/wDQIgITk7fjENP1B83SEB
-xdVpMSqVfnwRRrEJFs+jS1ZztPE=
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/config.yaml b/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/config.yaml
deleted file mode 100644
index f044870547..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/config.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-NodeOUs:
- Enable: true
- ClientOUIdentifier:
- Certificate: cacerts/ca.org1.example.com-cert.pem
- OrganizationalUnitIdentifier: client
- PeerOUIdentifier:
- Certificate: cacerts/ca.org1.example.com-cert.pem
- OrganizationalUnitIdentifier: peer
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
deleted file mode 100644
index c28f0dae93..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICWDCCAf6gAwIBAgIRAMlkjk2w9CSX+gV6QY41KIowCgYIKoZIzj0EAwIwdjEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs
-c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMTQzNTAwWhcNMjkwMzMxMTQz
-NTAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
-BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G
-A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABNXLUtSIrYGulAC1M7jdtHBPA7N9k72Rww5y/xYA3d6qlpj0ONBlA7fo
-CAXvwmt8m6Ppc2TJOTKPX6DuqHyvLgqjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV
-HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV
-HQ4EIgQgliVo3c3LMbazZMr/yGKsLqdiqe/o/1TJREoPr8PJRb8wCgYIKoZIzj0E
-AwIDSAAwRQIhANVLtc1NB90R2vNu1AdlKVyWwgLlKMGKxIEDFmnJjOg3AiATXxYn
-zF6M01hCvorDq9txEE56pNYfs22lTy5rrw8Zyg==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
deleted file mode 100644
index ac6d2b3221..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICKjCCAdGgAwIBAgIRAPTSLupozmwcZ48H1jy0OYMwCgYIKoZIzj0EAwIwczEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh
-Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMTQzNTAwWhcNMjkwMzMxMTQzNTAw
-WjBsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN
-U2FuIEZyYW5jaXNjbzEPMA0GA1UECxMGY2xpZW50MR8wHQYDVQQDDBZBZG1pbkBv
-cmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEgCotpEt9
-BLbmV2l5cDxu6ZhbXr7NqmKwfYxN/HfLxAIv4IcaKG/pJeGK7dsvVSrecVvIbsd7
-bKncC0fCczuD0aNNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYD
-VR0jBCQwIoAgduyya/ADEPZQiTwY9EWeA1JvcX2+urof1XLaAwzs0tkwCgYIKoZI
-zj0EAwIDRwAwRAIgVolif/BDAdxuCLGstL/vfFq3zgNiuQ4Evk2B7EXF2NUCIA8K
-bsRh9QALSbCsoeSrItsfx7OLM6Ta/4+souF69BGv
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
deleted file mode 100644
index f9099f6a4b..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICUDCCAfegAwIBAgIQLpBhJqg/HNcbDf8mBVTfPzAKBggqhkjOPQQDAjBzMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu
-b3JnMS5leGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1MDBa
-MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T
-YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMRwwGgYDVQQD
-ExNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-vvVmmOfZL3wYzbhmHqdr3EGRWzY+Lu7vkEHzmJq+yuRs9gimOHMnrS57j5AXEIUR
-dOY7vLtyGq50/PKp/bfYDKNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCB2
-7LJr8AMQ9lCJPBj0RZ4DUm9xfb66uh/VctoDDOzS2TAKBggqhkjOPQQDAgNHADBE
-AiAw6gaDSAPZpd3ZPKQ+anK+u7KMRi/K8J928d/75Z/wDQIgITk7fjENP1B83SEB
-xdVpMSqVfnwRRrEJFs+jS1ZztPE=
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/config.yaml b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/config.yaml
deleted file mode 100644
index f044870547..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/config.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-NodeOUs:
- Enable: true
- ClientOUIdentifier:
- Certificate: cacerts/ca.org1.example.com-cert.pem
- OrganizationalUnitIdentifier: client
- PeerOUIdentifier:
- Certificate: cacerts/ca.org1.example.com-cert.pem
- OrganizationalUnitIdentifier: peer
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/3edc106f6762315aae4cc735ea60d0903773dfb89e7f6875b38c1bd35375223c_sk b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/3edc106f6762315aae4cc735ea60d0903773dfb89e7f6875b38c1bd35375223c_sk
deleted file mode 100644
index a7d3aa97a1..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/3edc106f6762315aae4cc735ea60d0903773dfb89e7f6875b38c1bd35375223c_sk
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgDhiiUsnVPzerS+EW
-DsFPnNkCriYia9z64JKwgRldmY+hRANCAASK4yImcq7Gz0izaPZsp5WchUDdswqv
-szNtxHiVj6hLDkfxq7bo3W3N+4ydOMOGYfstIDFua4yc/ML9DyVWordH
------END PRIVATE KEY-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem
deleted file mode 100644
index 4268161300..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICJzCCAc6gAwIBAgIQZ4zjzysPz/LRbbfFhyV/2jAKBggqhkjOPQQDAjBzMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu
-b3JnMS5leGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1MDBa
-MGoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T
-YW4gRnJhbmNpc2NvMQ0wCwYDVQQLEwRwZWVyMR8wHQYDVQQDExZwZWVyMC5vcmcx
-LmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEiuMiJnKuxs9I
-s2j2bKeVnIVA3bMKr7MzbcR4lY+oSw5H8au26N1tzfuMnTjDhmH7LSAxbmuMnPzC
-/Q8lVqK3R6NNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0j
-BCQwIoAgduyya/ADEPZQiTwY9EWeA1JvcX2+urof1XLaAwzs0tkwCgYIKoZIzj0E
-AwIDRwAwRAIgZvJaC2nzBsxjFjye5kcOCVH2W105GVygCYZGCUG64IwCIEVNzVgw
-jsCQFzBj0l9aXsJOhA9wCV3aQlLFhix9xnxK
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
deleted file mode 100644
index c28f0dae93..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICWDCCAf6gAwIBAgIRAMlkjk2w9CSX+gV6QY41KIowCgYIKoZIzj0EAwIwdjEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs
-c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMTQzNTAwWhcNMjkwMzMxMTQz
-NTAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
-BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G
-A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABNXLUtSIrYGulAC1M7jdtHBPA7N9k72Rww5y/xYA3d6qlpj0ONBlA7fo
-CAXvwmt8m6Ppc2TJOTKPX6DuqHyvLgqjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV
-HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV
-HQ4EIgQgliVo3c3LMbazZMr/yGKsLqdiqe/o/1TJREoPr8PJRb8wCgYIKoZIzj0E
-AwIDSAAwRQIhANVLtc1NB90R2vNu1AdlKVyWwgLlKMGKxIEDFmnJjOg3AiATXxYn
-zF6M01hCvorDq9txEE56pNYfs22lTy5rrw8Zyg==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt
deleted file mode 100644
index c28f0dae93..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICWDCCAf6gAwIBAgIRAMlkjk2w9CSX+gV6QY41KIowCgYIKoZIzj0EAwIwdjEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs
-c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMTQzNTAwWhcNMjkwMzMxMTQz
-NTAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
-BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G
-A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABNXLUtSIrYGulAC1M7jdtHBPA7N9k72Rww5y/xYA3d6qlpj0ONBlA7fo
-CAXvwmt8m6Ppc2TJOTKPX6DuqHyvLgqjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV
-HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV
-HQ4EIgQgliVo3c3LMbazZMr/yGKsLqdiqe/o/1TJREoPr8PJRb8wCgYIKoZIzj0E
-AwIDSAAwRQIhANVLtc1NB90R2vNu1AdlKVyWwgLlKMGKxIEDFmnJjOg3AiATXxYn
-zF6M01hCvorDq9txEE56pNYfs22lTy5rrw8Zyg==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt
deleted file mode 100644
index c7ee626d76..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICZjCCAg2gAwIBAgIQcKjz/huiumA5EOg9vU00aDAKBggqhkjOPQQDAjB2MQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz
-Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1
-MDBaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH
-Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDExZwZWVyMC5vcmcxLmV4YW1wbGUuY29t
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEgjKYKz0nN+ygU7B7PnUpjixJoo8d
-G0bjy5t34SUa9L6+iAGLUJEnCYlzqEalc8gSbLCrykUO3OPmigddL5Ad+KOBlzCB
-lDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgliVo3c3LMbazZMr/yGKsLqdiqe/o
-/1TJREoPr8PJRb8wKAYDVR0RBCEwH4IWcGVlcjAub3JnMS5leGFtcGxlLmNvbYIF
-cGVlcjAwCgYIKoZIzj0EAwIDRwAwRAIgQT7XLdNo2k7O0bUPfegP8/brbtUXg67I
-5eWuveRh7igCIC4fpRBnMBmbXi+nogfhsTAQXHc1qUG8o90TgWcjaHRQ
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key b/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key
deleted file mode 100644
index e4e3dd7b5e..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgEDwGDOy10Vl47555
-mjted5LdMcXVRYTdLABuboD8hfOhRANCAASCMpgrPSc37KBTsHs+dSmOLEmijx0b
-RuPLm3fhJRr0vr6IAYtQkScJiXOoRqVzyBJssKvKRQ7c4+aKB10vkB34
------END PRIVATE KEY-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/tlsca/962568ddcdcb31b6b364caffc862ac2ea762a9efe8ff54c9444a0fafc3c945bf_sk b/basic-network/crypto-config/peerOrganizations/org1.example.com/tlsca/962568ddcdcb31b6b364caffc862ac2ea762a9efe8ff54c9444a0fafc3c945bf_sk
deleted file mode 100644
index 5a6222da59..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/tlsca/962568ddcdcb31b6b364caffc862ac2ea762a9efe8ff54c9444a0fafc3c945bf_sk
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgYtAtaP3W44bfF24S
-CbavtZGE+1i4qaZvNazXdZhNf0ahRANCAATVy1LUiK2BrpQAtTO43bRwTwOzfZO9
-kcMOcv8WAN3eqpaY9DjQZQO36AgF78JrfJuj6XNkyTkyj1+g7qh8ry4K
------END PRIVATE KEY-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem
deleted file mode 100644
index c28f0dae93..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICWDCCAf6gAwIBAgIRAMlkjk2w9CSX+gV6QY41KIowCgYIKoZIzj0EAwIwdjEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs
-c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMTQzNTAwWhcNMjkwMzMxMTQz
-NTAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
-BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G
-A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABNXLUtSIrYGulAC1M7jdtHBPA7N9k72Rww5y/xYA3d6qlpj0ONBlA7fo
-CAXvwmt8m6Ppc2TJOTKPX6DuqHyvLgqjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV
-HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV
-HQ4EIgQgliVo3c3LMbazZMr/yGKsLqdiqe/o/1TJREoPr8PJRb8wCgYIKoZIzj0E
-AwIDSAAwRQIhANVLtc1NB90R2vNu1AdlKVyWwgLlKMGKxIEDFmnJjOg3AiATXxYn
-zF6M01hCvorDq9txEE56pNYfs22lTy5rrw8Zyg==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
deleted file mode 100644
index ac6d2b3221..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICKjCCAdGgAwIBAgIRAPTSLupozmwcZ48H1jy0OYMwCgYIKoZIzj0EAwIwczEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh
-Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMTQzNTAwWhcNMjkwMzMxMTQzNTAw
-WjBsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN
-U2FuIEZyYW5jaXNjbzEPMA0GA1UECxMGY2xpZW50MR8wHQYDVQQDDBZBZG1pbkBv
-cmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEgCotpEt9
-BLbmV2l5cDxu6ZhbXr7NqmKwfYxN/HfLxAIv4IcaKG/pJeGK7dsvVSrecVvIbsd7
-bKncC0fCczuD0aNNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYD
-VR0jBCQwIoAgduyya/ADEPZQiTwY9EWeA1JvcX2+urof1XLaAwzs0tkwCgYIKoZI
-zj0EAwIDRwAwRAIgVolif/BDAdxuCLGstL/vfFq3zgNiuQ4Evk2B7EXF2NUCIA8K
-bsRh9QALSbCsoeSrItsfx7OLM6Ta/4+souF69BGv
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
deleted file mode 100644
index f9099f6a4b..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICUDCCAfegAwIBAgIQLpBhJqg/HNcbDf8mBVTfPzAKBggqhkjOPQQDAjBzMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu
-b3JnMS5leGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1MDBa
-MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T
-YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMRwwGgYDVQQD
-ExNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-vvVmmOfZL3wYzbhmHqdr3EGRWzY+Lu7vkEHzmJq+yuRs9gimOHMnrS57j5AXEIUR
-dOY7vLtyGq50/PKp/bfYDKNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCB2
-7LJr8AMQ9lCJPBj0RZ4DUm9xfb66uh/VctoDDOzS2TAKBggqhkjOPQQDAgNHADBE
-AiAw6gaDSAPZpd3ZPKQ+anK+u7KMRi/K8J928d/75Z/wDQIgITk7fjENP1B83SEB
-xdVpMSqVfnwRRrEJFs+jS1ZztPE=
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/5ba12183ab07014ba831f9a79cf51fe7e6f62cdebe6193f070445243aedddee9_sk b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/5ba12183ab07014ba831f9a79cf51fe7e6f62cdebe6193f070445243aedddee9_sk
deleted file mode 100644
index 4808ee17f2..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/5ba12183ab07014ba831f9a79cf51fe7e6f62cdebe6193f070445243aedddee9_sk
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg1txEHdaQb0Mc41Ja
-cti7dNjwV184ulQuOnbfvmp6mxyhRANCAASAKi2kS30EtuZXaXlwPG7pmFtevs2q
-YrB9jE38d8vEAi/ghxoob+kl4Yrt2y9VKt5xW8hux3tsqdwLR8JzO4PR
------END PRIVATE KEY-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem
deleted file mode 100644
index ac6d2b3221..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICKjCCAdGgAwIBAgIRAPTSLupozmwcZ48H1jy0OYMwCgYIKoZIzj0EAwIwczEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh
-Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMTQzNTAwWhcNMjkwMzMxMTQzNTAw
-WjBsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN
-U2FuIEZyYW5jaXNjbzEPMA0GA1UECxMGY2xpZW50MR8wHQYDVQQDDBZBZG1pbkBv
-cmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEgCotpEt9
-BLbmV2l5cDxu6ZhbXr7NqmKwfYxN/HfLxAIv4IcaKG/pJeGK7dsvVSrecVvIbsd7
-bKncC0fCczuD0aNNMEswDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYD
-VR0jBCQwIoAgduyya/ADEPZQiTwY9EWeA1JvcX2+urof1XLaAwzs0tkwCgYIKoZI
-zj0EAwIDRwAwRAIgVolif/BDAdxuCLGstL/vfFq3zgNiuQ4Evk2B7EXF2NUCIA8K
-bsRh9QALSbCsoeSrItsfx7OLM6Ta/4+souF69BGv
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
deleted file mode 100644
index c28f0dae93..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICWDCCAf6gAwIBAgIRAMlkjk2w9CSX+gV6QY41KIowCgYIKoZIzj0EAwIwdjEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs
-c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMTQzNTAwWhcNMjkwMzMxMTQz
-NTAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
-BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G
-A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABNXLUtSIrYGulAC1M7jdtHBPA7N9k72Rww5y/xYA3d6qlpj0ONBlA7fo
-CAXvwmt8m6Ppc2TJOTKPX6DuqHyvLgqjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV
-HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV
-HQ4EIgQgliVo3c3LMbazZMr/yGKsLqdiqe/o/1TJREoPr8PJRb8wCgYIKoZIzj0E
-AwIDSAAwRQIhANVLtc1NB90R2vNu1AdlKVyWwgLlKMGKxIEDFmnJjOg3AiATXxYn
-zF6M01hCvorDq9txEE56pNYfs22lTy5rrw8Zyg==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt
deleted file mode 100644
index c28f0dae93..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICWDCCAf6gAwIBAgIRAMlkjk2w9CSX+gV6QY41KIowCgYIKoZIzj0EAwIwdjEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs
-c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMTQzNTAwWhcNMjkwMzMxMTQz
-NTAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
-BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G
-A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABNXLUtSIrYGulAC1M7jdtHBPA7N9k72Rww5y/xYA3d6qlpj0ONBlA7fo
-CAXvwmt8m6Ppc2TJOTKPX6DuqHyvLgqjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV
-HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV
-HQ4EIgQgliVo3c3LMbazZMr/yGKsLqdiqe/o/1TJREoPr8PJRb8wCgYIKoZIzj0E
-AwIDSAAwRQIhANVLtc1NB90R2vNu1AdlKVyWwgLlKMGKxIEDFmnJjOg3AiATXxYn
-zF6M01hCvorDq9txEE56pNYfs22lTy5rrw8Zyg==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.crt b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.crt
deleted file mode 100644
index 2e1dc72213..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.crt
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICOzCCAeGgAwIBAgIQXkFwRCgoNHCpTxhSKbCosDAKBggqhkjOPQQDAjB2MQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz
-Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1
-MDBaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH
-Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29t
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEqIU9hL6nY3DFRLkIyzEWkbdfaP+n
-KxUjmaQf2ek3Va6pZOA5AFa6hsigu+G6j7+SNSvgCPEd4HKDaSutM2xmIqNsMGow
-DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM
-BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIJYlaN3NyzG2s2TK/8hirC6nYqnv6P9U
-yURKD6/DyUW/MAoGCCqGSM49BAMCA0gAMEUCIQCvm4VTqpAy4m3xO5pDwva4t6Hn
-bixMIEZCO7omOOtS+AIgFkSPWr+rHZMeLw/yfRUVcxHIkXOse3+GWMIODVTV3O0=
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.key b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.key
deleted file mode 100644
index 53764e839d..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.key
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgsCCkj2Sk5IcspDP2
-h5vymzb8oXOabtozYsA+b8GymE2hRANCAASohT2EvqdjcMVEuQjLMRaRt19o/6cr
-FSOZpB/Z6TdVrqlk4DkAVrqGyKC74bqPv5I1K+AI8R3gcoNpK60zbGYi
------END PRIVATE KEY-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem
deleted file mode 100644
index 245811e0c0..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICKjCCAdCgAwIBAgIQPtDazK5/UJ5O4kIjkXIuRzAKBggqhkjOPQQDAjBzMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu
-b3JnMS5leGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1MDBa
-MGwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T
-YW4gRnJhbmNpc2NvMQ8wDQYDVQQLEwZjbGllbnQxHzAdBgNVBAMMFlVzZXIxQG9y
-ZzEuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASqaX9nKMqY
-xUpvA4wlu0vjsq7ul176fNqnpiX/2e37eZwl7H4BVBRy0O5u7XU3oUetkllUedf3
-ksM1r8PiMdbCo00wSzAOBgNVHQ8BAf8EBAMCB4AwDAYDVR0TAQH/BAIwADArBgNV
-HSMEJDAigCB27LJr8AMQ9lCJPBj0RZ4DUm9xfb66uh/VctoDDOzS2TAKBggqhkjO
-PQQDAgNIADBFAiEAibEuWCvvRiti95mlRj+jDyxFGtcKJHEVCQWE3jb55z8CIHKM
-TdGegUWzJE9Uwk0vKYeorCp/xEIeXlRg0F72IrME
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
deleted file mode 100644
index f9099f6a4b..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICUDCCAfegAwIBAgIQLpBhJqg/HNcbDf8mBVTfPzAKBggqhkjOPQQDAjBzMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu
-b3JnMS5leGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1MDBa
-MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T
-YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMRwwGgYDVQQD
-ExNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-vvVmmOfZL3wYzbhmHqdr3EGRWzY+Lu7vkEHzmJq+yuRs9gimOHMnrS57j5AXEIUR
-dOY7vLtyGq50/PKp/bfYDKNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCB2
-7LJr8AMQ9lCJPBj0RZ4DUm9xfb66uh/VctoDDOzS2TAKBggqhkjOPQQDAgNHADBE
-AiAw6gaDSAPZpd3ZPKQ+anK+u7KMRi/K8J928d/75Z/wDQIgITk7fjENP1B83SEB
-xdVpMSqVfnwRRrEJFs+jS1ZztPE=
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/740efb1655d71c3984062726b31361c151463b13979271b86e41d5a3dc3594de_sk b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/740efb1655d71c3984062726b31361c151463b13979271b86e41d5a3dc3594de_sk
deleted file mode 100644
index 6a6ec02534..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/740efb1655d71c3984062726b31361c151463b13979271b86e41d5a3dc3594de_sk
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgCpkB+6o19A96VsE9
-6F54Q+enYPgBTuhu8hmJtGpNiRGhRANCAASqaX9nKMqYxUpvA4wlu0vjsq7ul176
-fNqnpiX/2e37eZwl7H4BVBRy0O5u7XU3oUetkllUedf3ksM1r8PiMdbC
------END PRIVATE KEY-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem
deleted file mode 100644
index 245811e0c0..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICKjCCAdCgAwIBAgIQPtDazK5/UJ5O4kIjkXIuRzAKBggqhkjOPQQDAjBzMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu
-b3JnMS5leGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1MDBa
-MGwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T
-YW4gRnJhbmNpc2NvMQ8wDQYDVQQLEwZjbGllbnQxHzAdBgNVBAMMFlVzZXIxQG9y
-ZzEuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASqaX9nKMqY
-xUpvA4wlu0vjsq7ul176fNqnpiX/2e37eZwl7H4BVBRy0O5u7XU3oUetkllUedf3
-ksM1r8PiMdbCo00wSzAOBgNVHQ8BAf8EBAMCB4AwDAYDVR0TAQH/BAIwADArBgNV
-HSMEJDAigCB27LJr8AMQ9lCJPBj0RZ4DUm9xfb66uh/VctoDDOzS2TAKBggqhkjO
-PQQDAgNIADBFAiEAibEuWCvvRiti95mlRj+jDyxFGtcKJHEVCQWE3jb55z8CIHKM
-TdGegUWzJE9Uwk0vKYeorCp/xEIeXlRg0F72IrME
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
deleted file mode 100644
index c28f0dae93..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICWDCCAf6gAwIBAgIRAMlkjk2w9CSX+gV6QY41KIowCgYIKoZIzj0EAwIwdjEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs
-c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMTQzNTAwWhcNMjkwMzMxMTQz
-NTAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
-BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G
-A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABNXLUtSIrYGulAC1M7jdtHBPA7N9k72Rww5y/xYA3d6qlpj0ONBlA7fo
-CAXvwmt8m6Ppc2TJOTKPX6DuqHyvLgqjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV
-HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV
-HQ4EIgQgliVo3c3LMbazZMr/yGKsLqdiqe/o/1TJREoPr8PJRb8wCgYIKoZIzj0E
-AwIDSAAwRQIhANVLtc1NB90R2vNu1AdlKVyWwgLlKMGKxIEDFmnJjOg3AiATXxYn
-zF6M01hCvorDq9txEE56pNYfs22lTy5rrw8Zyg==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt
deleted file mode 100644
index c28f0dae93..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICWDCCAf6gAwIBAgIRAMlkjk2w9CSX+gV6QY41KIowCgYIKoZIzj0EAwIwdjEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs
-c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMTQzNTAwWhcNMjkwMzMxMTQz
-NTAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
-BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G
-A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABNXLUtSIrYGulAC1M7jdtHBPA7N9k72Rww5y/xYA3d6qlpj0ONBlA7fo
-CAXvwmt8m6Ppc2TJOTKPX6DuqHyvLgqjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV
-HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV
-HQ4EIgQgliVo3c3LMbazZMr/yGKsLqdiqe/o/1TJREoPr8PJRb8wCgYIKoZIzj0E
-AwIDSAAwRQIhANVLtc1NB90R2vNu1AdlKVyWwgLlKMGKxIEDFmnJjOg3AiATXxYn
-zF6M01hCvorDq9txEE56pNYfs22lTy5rrw8Zyg==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.crt b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.crt
deleted file mode 100644
index 4d404fbb0f..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.crt
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICOjCCAeGgAwIBAgIQFcvnlYYt63B/N8uVk9r+wzAKBggqhkjOPQQDAjB2MQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz
-Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1
-MDBaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH
-Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZVc2VyMUBvcmcxLmV4YW1wbGUuY29t
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEcjjN2SQtUCb1ev5JemrMdLtN7xY/
-Badt/V6ohTg8mIib2nOyibzkleWzXs+or+AlPWUIhLn5JP84BMD99NpgyKNsMGow
-DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM
-BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIJYlaN3NyzG2s2TK/8hirC6nYqnv6P9U
-yURKD6/DyUW/MAoGCCqGSM49BAMCA0cAMEQCIBOkd0GVGuWzmkPimEW9vteY+k99
-MeTYgc2F8j8od93bAiAmzpDaLq1A9c+gDkEmyWA9QOfzZDoURxlWRixBnOI4GQ==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.key b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.key
deleted file mode 100644
index dd6b9e7ce8..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.key
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgjQaNXOxAnttn9C5o
-ZmcbkQZnWO0hopq3x8NmLhic/nihRANCAARyOM3ZJC1QJvV6/kl6asx0u03vFj8F
-p239XqiFODyYiJvac7KJvOSV5bNez6iv4CU9ZQiEufkk/zgEwP302mDI
------END PRIVATE KEY-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/msp/admincerts/User2@org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/msp/admincerts/User2@org1.example.com-cert.pem
deleted file mode 100644
index dfb724107f..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/msp/admincerts/User2@org1.example.com-cert.pem
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICKjCCAdCgAwIBAgIQNwzUtAh/fzgVyyotLFAZOjAKBggqhkjOPQQDAjBzMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu
-b3JnMS5leGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1MDBa
-MGwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T
-YW4gRnJhbmNpc2NvMQ8wDQYDVQQLEwZjbGllbnQxHzAdBgNVBAMMFlVzZXIyQG9y
-ZzEuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS9+zwo6PJ6
-popCLW1lItExE5gLhHEbGotJdegIBkzFDnYPyoeQBz09y3nvadVDDkZWKskM0EkK
-gVZxd3E+42eso00wSzAOBgNVHQ8BAf8EBAMCB4AwDAYDVR0TAQH/BAIwADArBgNV
-HSMEJDAigCB27LJr8AMQ9lCJPBj0RZ4DUm9xfb66uh/VctoDDOzS2TAKBggqhkjO
-PQQDAgNIADBFAiEAr7bIEXexFaVBKaTxjSO7icD+0dQ3q8oGo8EgJGXE5TMCIGXB
-a9SMPgoA6oRokUAYXo89Zqfsv8c0OQcnIhdgkdvs
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
deleted file mode 100644
index f9099f6a4b..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICUDCCAfegAwIBAgIQLpBhJqg/HNcbDf8mBVTfPzAKBggqhkjOPQQDAjBzMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu
-b3JnMS5leGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1MDBa
-MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T
-YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMRwwGgYDVQQD
-ExNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
-vvVmmOfZL3wYzbhmHqdr3EGRWzY+Lu7vkEHzmJq+yuRs9gimOHMnrS57j5AXEIUR
-dOY7vLtyGq50/PKp/bfYDKNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCB2
-7LJr8AMQ9lCJPBj0RZ4DUm9xfb66uh/VctoDDOzS2TAKBggqhkjOPQQDAgNHADBE
-AiAw6gaDSAPZpd3ZPKQ+anK+u7KMRi/K8J928d/75Z/wDQIgITk7fjENP1B83SEB
-xdVpMSqVfnwRRrEJFs+jS1ZztPE=
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/msp/keystore/5185716bd707635c718c6c37c6424f9b1cb6d0f7c1659d083077c1308edcdd51_sk b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/msp/keystore/5185716bd707635c718c6c37c6424f9b1cb6d0f7c1659d083077c1308edcdd51_sk
deleted file mode 100644
index 56a5702466..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/msp/keystore/5185716bd707635c718c6c37c6424f9b1cb6d0f7c1659d083077c1308edcdd51_sk
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgY96RXD7zH4JyKjQM
-64XopJAvWE8dg6DUj3Epn4/LzZ6hRANCAAS9+zwo6PJ6popCLW1lItExE5gLhHEb
-GotJdegIBkzFDnYPyoeQBz09y3nvadVDDkZWKskM0EkKgVZxd3E+42es
------END PRIVATE KEY-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/msp/signcerts/User2@org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/msp/signcerts/User2@org1.example.com-cert.pem
deleted file mode 100644
index dfb724107f..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/msp/signcerts/User2@org1.example.com-cert.pem
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICKjCCAdCgAwIBAgIQNwzUtAh/fzgVyyotLFAZOjAKBggqhkjOPQQDAjBzMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu
-b3JnMS5leGFtcGxlLmNvbTAeFw0xOTA0MDMxNDM1MDBaFw0yOTAzMzExNDM1MDBa
-MGwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T
-YW4gRnJhbmNpc2NvMQ8wDQYDVQQLEwZjbGllbnQxHzAdBgNVBAMMFlVzZXIyQG9y
-ZzEuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS9+zwo6PJ6
-popCLW1lItExE5gLhHEbGotJdegIBkzFDnYPyoeQBz09y3nvadVDDkZWKskM0EkK
-gVZxd3E+42eso00wSzAOBgNVHQ8BAf8EBAMCB4AwDAYDVR0TAQH/BAIwADArBgNV
-HSMEJDAigCB27LJr8AMQ9lCJPBj0RZ4DUm9xfb66uh/VctoDDOzS2TAKBggqhkjO
-PQQDAgNIADBFAiEAr7bIEXexFaVBKaTxjSO7icD+0dQ3q8oGo8EgJGXE5TMCIGXB
-a9SMPgoA6oRokUAYXo89Zqfsv8c0OQcnIhdgkdvs
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
deleted file mode 100644
index c28f0dae93..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICWDCCAf6gAwIBAgIRAMlkjk2w9CSX+gV6QY41KIowCgYIKoZIzj0EAwIwdjEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs
-c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMTQzNTAwWhcNMjkwMzMxMTQz
-NTAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
-BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G
-A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABNXLUtSIrYGulAC1M7jdtHBPA7N9k72Rww5y/xYA3d6qlpj0ONBlA7fo
-CAXvwmt8m6Ppc2TJOTKPX6DuqHyvLgqjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV
-HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV
-HQ4EIgQgliVo3c3LMbazZMr/yGKsLqdiqe/o/1TJREoPr8PJRb8wCgYIKoZIzj0E
-AwIDSAAwRQIhANVLtc1NB90R2vNu1AdlKVyWwgLlKMGKxIEDFmnJjOg3AiATXxYn
-zF6M01hCvorDq9txEE56pNYfs22lTy5rrw8Zyg==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/tls/ca.crt b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/tls/ca.crt
deleted file mode 100644
index c28f0dae93..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/tls/ca.crt
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICWDCCAf6gAwIBAgIRAMlkjk2w9CSX+gV6QY41KIowCgYIKoZIzj0EAwIwdjEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs
-c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMTQzNTAwWhcNMjkwMzMxMTQz
-NTAwWjB2MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
-BxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0G
-A1UEAxMWdGxzY2Eub3JnMS5leGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABNXLUtSIrYGulAC1M7jdtHBPA7N9k72Rww5y/xYA3d6qlpj0ONBlA7fo
-CAXvwmt8m6Ppc2TJOTKPX6DuqHyvLgqjbTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNV
-HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zApBgNV
-HQ4EIgQgliVo3c3LMbazZMr/yGKsLqdiqe/o/1TJREoPr8PJRb8wCgYIKoZIzj0E
-AwIDSAAwRQIhANVLtc1NB90R2vNu1AdlKVyWwgLlKMGKxIEDFmnJjOg3AiATXxYn
-zF6M01hCvorDq9txEE56pNYfs22lTy5rrw8Zyg==
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/tls/client.crt b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/tls/client.crt
deleted file mode 100644
index 7fe2dd1d11..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/tls/client.crt
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICOzCCAeKgAwIBAgIRAMbuFgbQt91/LT946pVdwiQwCgYIKoZIzj0EAwIwdjEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs
-c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMTkwNDAzMTQzNTAwWhcNMjkwMzMxMTQz
-NTAwWjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
-BxMNU2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWVXNlcjJAb3JnMS5leGFtcGxlLmNv
-bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGzz4PC2BsqP1BP3CMzxZx5KysQh
-e866ZW3e0jKYv0AzlBZwM2KrSobkR3y4Ui/OY0CK7kcHlPaouXw/vrvsTrejbDBq
-MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-DAYDVR0TAQH/BAIwADArBgNVHSMEJDAigCCWJWjdzcsxtrNkyv/IYqwup2Kp7+j/
-VMlESg+vw8lFvzAKBggqhkjOPQQDAgNHADBEAiAoRPwnGSjRWI08/9hrE9WUmIqI
-gWiBQMAqf+gYhhaJqwIgbyuB99aSpEBmsajkndHth1qWbDzRv3u8EqRGPHvNVmg=
------END CERTIFICATE-----
diff --git a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/tls/client.key b/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/tls/client.key
deleted file mode 100644
index 5352d1d4e2..0000000000
--- a/basic-network/crypto-config/peerOrganizations/org1.example.com/users/User2@org1.example.com/tls/client.key
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgnQDjne8Pk5lgK5C5
-BwRcztZVvULltrpHAU7X3Z+hrDihRANCAARs8+DwtgbKj9QT9wjM8WceSsrEIXvO
-umVt3tIymL9AM5QWcDNiq0qG5Ed8uFIvzmNAiu5HB5T2qLl8P7677E63
------END PRIVATE KEY-----
diff --git a/basic-network/docker-compose.yml b/basic-network/docker-compose.yml
deleted file mode 100644
index 6f97c7e20a..0000000000
--- a/basic-network/docker-compose.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# Copyright IBM Corp All Rights Reserved
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-version: '2'
-
-networks:
- basic:
-
-services:
- ca.example.com:
- image: hyperledger/fabric-ca
- environment:
- - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
- - FABRIC_CA_SERVER_CA_NAME=ca.example.com
- - FABRIC_CA_SERVER_CA_CERTFILE=/etc/hyperledger/fabric-ca-server-config/ca.org1.example.com-cert.pem
- - FABRIC_CA_SERVER_CA_KEYFILE=/etc/hyperledger/fabric-ca-server-config/76ecb26bf00310f650893c18f4459e03526f717dbebaba1fd572da030cecd2d9_sk
- ports:
- - "7054:7054"
- command: sh -c 'fabric-ca-server start -b admin:adminpw'
- volumes:
- - ./crypto-config/peerOrganizations/org1.example.com/ca/:/etc/hyperledger/fabric-ca-server-config
- container_name: ca.example.com
- networks:
- - basic
-
- orderer.example.com:
- container_name: orderer.example.com
- image: hyperledger/fabric-orderer
- environment:
- - FABRIC_LOGGING_SPEC=info
- - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
- - ORDERER_GENERAL_BOOTSTRAPMETHOD=file
- - ORDERER_GENERAL_BOOTSTRAPFILE=/etc/hyperledger/configtx/genesis.block
- - ORDERER_GENERAL_LOCALMSPID=OrdererMSP
- - ORDERER_GENERAL_LOCALMSPDIR=/etc/hyperledger/msp/orderer/msp
- working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer
- command: orderer
- ports:
- - 7050:7050
- volumes:
- - ./config/:/etc/hyperledger/configtx
- - ./crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/:/etc/hyperledger/msp/orderer
- - ./crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/:/etc/hyperledger/msp/peerOrg1
- networks:
- - basic
-
- peer0.org1.example.com:
- container_name: peer0.org1.example.com
- image: hyperledger/fabric-peer
- environment:
- - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock
- - CORE_PEER_ID=peer0.org1.example.com
- - FABRIC_LOGGING_SPEC=info
- - CORE_CHAINCODE_LOGGING_LEVEL=info
- - CORE_PEER_LOCALMSPID=Org1MSP
- - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/peer/
- - CORE_PEER_ADDRESS=peer0.org1.example.com:7051
- # # the following setting starts chaincode containers on the same
- # # bridge network as the peers
- # # https://docs.docker.com/compose/networking/
- - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=${COMPOSE_PROJECT_NAME}_basic
- - CORE_LEDGER_STATE_STATEDATABASE=CouchDB
- - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb:5984
- # The CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME and CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD
- # provide the credentials for ledger to connect to CouchDB. The username and password must
- # match the username and password set for the associated CouchDB.
- - CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME=
- - CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD=
- working_dir: /opt/gopath/src/github.com/hyperledger/fabric
- command: peer node start
- # command: peer node start --peer-chaincodedev=true
- ports:
- - 7051:7051
- - 7053:7053
- volumes:
- - /var/run/:/host/var/run/
- - ./crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp:/etc/hyperledger/msp/peer
- - ./crypto-config/peerOrganizations/org1.example.com/users:/etc/hyperledger/msp/users
- - ./config:/etc/hyperledger/configtx
- depends_on:
- - orderer.example.com
- - couchdb
- networks:
- - basic
-
- couchdb:
- container_name: couchdb
- image: couchdb:2.3
- # Populate the COUCHDB_USER and COUCHDB_PASSWORD to set an admin user and password
- # for CouchDB. This will prevent CouchDB from operating in an "Admin Party" mode.
- environment:
- - COUCHDB_USER=
- - COUCHDB_PASSWORD=
- ports:
- - 5984:5984
- networks:
- - basic
-
- cli:
- container_name: cli
- image: hyperledger/fabric-tools
- tty: true
- environment:
- - GOPATH=/opt/gopath
- - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock
- - FABRIC_LOGGING_SPEC=info
- - CORE_PEER_ID=cli
- - CORE_PEER_ADDRESS=peer0.org1.example.com:7051
- - CORE_PEER_LOCALMSPID=Org1MSP
- - CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp
- - CORE_CHAINCODE_KEEPALIVE=10
- working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer
- command: /bin/bash
- volumes:
- - /var/run/:/host/var/run/
- - ./../chaincode/:/opt/gopath/src/github.com/
- - ./crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/
- networks:
- - basic
- #depends_on:
- # - orderer.example.com
- # - peer0.org1.example.com
- # - couchdb
diff --git a/basic-network/generate.sh b/basic-network/generate.sh
deleted file mode 100755
index 7966cd397a..0000000000
--- a/basic-network/generate.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# Copyright IBM Corp All Rights Reserved
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-export PATH=$GOPATH/src/github.com/hyperledger/fabric/build/bin:${PWD}/../bin:${PWD}:$PATH
-export FABRIC_CFG_PATH=${PWD}
-CHANNEL_NAME=mychannel
-
-# remove previous crypto material and config transactions
-rm -fr config/*
-rm -fr crypto-config/*
-
-# generate crypto material
-cryptogen generate --config=./crypto-config.yaml
-if [ "$?" -ne 0 ]; then
- echo "Failed to generate crypto material..."
- exit 1
-fi
-
-# generate genesis block for orderer
-configtxgen -profile OneOrgOrdererGenesis -channelID ordererchannel -outputBlock ./config/genesis.block
-if [ "$?" -ne 0 ]; then
- echo "Failed to generate orderer genesis block..."
- exit 1
-fi
-
-# generate channel configuration transaction
-configtxgen -profile OneOrgChannel -outputCreateChannelTx ./config/channel.tx -channelID $CHANNEL_NAME
-if [ "$?" -ne 0 ]; then
- echo "Failed to generate channel configuration transaction..."
- exit 1
-fi
-
-# generate anchor peer transaction
-configtxgen -profile OneOrgChannel -outputAnchorPeersUpdate ./config/Org1MSPanchors.tx -channelID $CHANNEL_NAME -asOrg Org1MSP
-if [ "$?" -ne 0 ]; then
- echo "Failed to generate anchor peer update for Org1MSP..."
- exit 1
-fi
diff --git a/basic-network/init.sh b/basic-network/init.sh
deleted file mode 100755
index caf7c76d49..0000000000
--- a/basic-network/init.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-#
-# Copyright IBM Corp All Rights Reserved
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-# Exit on first error, print all commands.
-set -ev
-# delete previous creds
-rm -rf ~/.hfc-key-store/*
-
-# copy peer admin credentials into the keyValStore
-mkdir -p ~/.hfc-key-store
diff --git a/basic-network/start.sh b/basic-network/start.sh
deleted file mode 100755
index 43e08a9acc..0000000000
--- a/basic-network/start.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-#
-# Copyright IBM Corp All Rights Reserved
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Exit on first error, print all commands.
-set -ev
-
-# don't rewrite paths for Windows Git Bash users
-export MSYS_NO_PATHCONV=1
-
-docker-compose -f docker-compose.yml down
-
-docker-compose -f docker-compose.yml up -d ca.example.com orderer.example.com peer0.org1.example.com couchdb
-docker ps -a
-
-# wait for Hyperledger Fabric to start
-# incase of errors when running later commands, issue export FABRIC_START_TIMEOUT=
-export FABRIC_START_TIMEOUT=10
-#echo ${FABRIC_START_TIMEOUT}
-sleep ${FABRIC_START_TIMEOUT}
-
-# Create the channel
-docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/users/Admin@org1.example.com/msp" peer0.org1.example.com peer channel create -o orderer.example.com:7050 -c mychannel -f /etc/hyperledger/configtx/channel.tx
-# Join peer0.org1.example.com to the channel.
-docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/users/Admin@org1.example.com/msp" peer0.org1.example.com peer channel join -b mychannel.block
diff --git a/basic-network/stop.sh b/basic-network/stop.sh
deleted file mode 100755
index 53ad51603d..0000000000
--- a/basic-network/stop.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#
-# Copyright IBM Corp All Rights Reserved
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Exit on first error, print all commands.
-set -ev
-
-# Shut down the Docker containers that might be currently running.
-docker-compose -f docker-compose.yml stop
diff --git a/basic-network/teardown.sh b/basic-network/teardown.sh
deleted file mode 100755
index 189b6070c4..0000000000
--- a/basic-network/teardown.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-#
-# Copyright IBM Corp All Rights Reserved
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# Exit on first error, print all commands.
-set -e
-
-# Shut down the Docker containers for the system tests.
-docker-compose -f docker-compose.yml kill && docker-compose -f docker-compose.yml down
-
-# remove the local state
-rm -f ~/.hfc-key-store/*
-
-# remove chaincode docker images
-docker rm $(docker ps -aq)
-docker rmi $(docker images dev-* -q)
-
-# Your system is now clean