diff --git a/benchmark/composer/config-composer.json b/benchmark/composer/config-composer.json
index 2a3841871..83b420d09 100755
--- a/benchmark/composer/config-composer.json
+++ b/benchmark/composer/config-composer.json
@@ -1,11 +1,11 @@
{
"blockchain": {
"type": "composer",
- "config": "network/fabric-v11/2-org-1-peer/composer.json"
+ "config": "network/fabric/2-org-1-peer/composer.json"
},
"command" : {
- "start": "docker-compose -f network/fabric-v11/2-org-1-peer/docker-compose.yaml up -d",
- "end": "docker-compose -f network/fabric-v11/2-org-1-peer/docker-compose.yaml down;docker rm $(docker ps -aq);docker rmi $(docker images dev-* -q)"
+ "start": "docker-compose -f network/fabric/2-org-1-peer/docker-compose.yaml up -d",
+ "end": "docker-compose -f network/fabric/2-org-1-peer/docker-compose.yaml down;docker rm $(docker ps -aq);docker rmi $(docker images dev-* -q)"
},
"test": {
"name": "Composer Performance test",
diff --git a/network/fabric-v11/2-org-1-peer/README.md b/network/fabric/2-org-1-peer/README.md
similarity index 100%
rename from network/fabric-v11/2-org-1-peer/README.md
rename to network/fabric/2-org-1-peer/README.md
diff --git a/network/fabric-v11/2-org-1-peer/composer-tls.json b/network/fabric/2-org-1-peer/composer-tls.json
similarity index 98%
rename from network/fabric-v11/2-org-1-peer/composer-tls.json
rename to network/fabric/2-org-1-peer/composer-tls.json
index 3da774490..dd1e20d3d 100755
--- a/network/fabric-v11/2-org-1-peer/composer-tls.json
+++ b/network/fabric/2-org-1-peer/composer-tls.json
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
- "cryptodir": "network/fabric-v11/config/crypto-config",
+ "cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 3000,
diff --git a/network/fabric-v11/2-org-1-peer/composer.json b/network/fabric/2-org-1-peer/composer.json
similarity index 98%
rename from network/fabric-v11/2-org-1-peer/composer.json
rename to network/fabric/2-org-1-peer/composer.json
index e5a848364..376273ee6 100755
--- a/network/fabric-v11/2-org-1-peer/composer.json
+++ b/network/fabric/2-org-1-peer/composer.json
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
- "cryptodir": "network/fabric-v11/config/crypto-config",
+ "cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 3000,
diff --git a/network/fabric-v11/2-org-1-peer/docker-compose-tls.yaml b/network/fabric/2-org-1-peer/docker-compose-tls.yaml
similarity index 100%
rename from network/fabric-v11/2-org-1-peer/docker-compose-tls.yaml
rename to network/fabric/2-org-1-peer/docker-compose-tls.yaml
diff --git a/network/fabric-v11/2-org-1-peer/docker-compose.yaml b/network/fabric/2-org-1-peer/docker-compose.yaml
similarity index 100%
rename from network/fabric-v11/2-org-1-peer/docker-compose.yaml
rename to network/fabric/2-org-1-peer/docker-compose.yaml
diff --git a/network/fabric-v11/2-org-2-peer/README.md b/network/fabric/2-org-2-peer/README.md
similarity index 100%
rename from network/fabric-v11/2-org-2-peer/README.md
rename to network/fabric/2-org-2-peer/README.md
diff --git a/network/fabric-v11/2-org-2-peer/composer-tls.json b/network/fabric/2-org-2-peer/composer-tls.json
similarity index 98%
rename from network/fabric-v11/2-org-2-peer/composer-tls.json
rename to network/fabric/2-org-2-peer/composer-tls.json
index bdbe0aee8..6ace97e0a 100755
--- a/network/fabric-v11/2-org-2-peer/composer-tls.json
+++ b/network/fabric/2-org-2-peer/composer-tls.json
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
- "cryptodir": "network/fabric-v11/config/crypto-config",
+ "cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 3000,
diff --git a/network/fabric-v11/2-org-2-peer/composer.json b/network/fabric/2-org-2-peer/composer.json
similarity index 98%
rename from network/fabric-v11/2-org-2-peer/composer.json
rename to network/fabric/2-org-2-peer/composer.json
index a628f43e7..80ff10401 100755
--- a/network/fabric-v11/2-org-2-peer/composer.json
+++ b/network/fabric/2-org-2-peer/composer.json
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
- "cryptodir": "network/fabric-v11/config/crypto-config",
+ "cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 3000,
diff --git a/network/fabric-v11/2-org-2-peer/docker-compose-tls.yaml b/network/fabric/2-org-2-peer/docker-compose-tls.yaml
similarity index 100%
rename from network/fabric-v11/2-org-2-peer/docker-compose-tls.yaml
rename to network/fabric/2-org-2-peer/docker-compose-tls.yaml
diff --git a/network/fabric-v11/2-org-2-peer/docker-compose.yaml b/network/fabric/2-org-2-peer/docker-compose.yaml
similarity index 100%
rename from network/fabric-v11/2-org-2-peer/docker-compose.yaml
rename to network/fabric/2-org-2-peer/docker-compose.yaml
diff --git a/network/fabric-v11/2-org-3-peer/README.md b/network/fabric/2-org-3-peer/README.md
similarity index 100%
rename from network/fabric-v11/2-org-3-peer/README.md
rename to network/fabric/2-org-3-peer/README.md
diff --git a/network/fabric-v11/2-org-3-peer/composer-tls.json b/network/fabric/2-org-3-peer/composer-tls.json
similarity index 98%
rename from network/fabric-v11/2-org-3-peer/composer-tls.json
rename to network/fabric/2-org-3-peer/composer-tls.json
index 7d830305c..f41bddc58 100755
--- a/network/fabric-v11/2-org-3-peer/composer-tls.json
+++ b/network/fabric/2-org-3-peer/composer-tls.json
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
- "cryptodir": "network/fabric-v11/config/crypto-config",
+ "cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 3000,
diff --git a/network/fabric-v11/2-org-3-peer/composer.json b/network/fabric/2-org-3-peer/composer.json
similarity index 98%
rename from network/fabric-v11/2-org-3-peer/composer.json
rename to network/fabric/2-org-3-peer/composer.json
index d3bb699b9..bfb77f69d 100755
--- a/network/fabric-v11/2-org-3-peer/composer.json
+++ b/network/fabric/2-org-3-peer/composer.json
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
- "cryptodir": "network/fabric-v11/config/crypto-config",
+ "cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 3000,
diff --git a/network/fabric-v11/2-org-3-peer/docker-compose-tls.yaml b/network/fabric/2-org-3-peer/docker-compose-tls.yaml
similarity index 100%
rename from network/fabric-v11/2-org-3-peer/docker-compose-tls.yaml
rename to network/fabric/2-org-3-peer/docker-compose-tls.yaml
diff --git a/network/fabric-v11/2-org-3-peer/docker-compose.yaml b/network/fabric/2-org-3-peer/docker-compose.yaml
similarity index 100%
rename from network/fabric-v11/2-org-3-peer/docker-compose.yaml
rename to network/fabric/2-org-3-peer/docker-compose.yaml
diff --git a/network/fabric-v11/3-org-1-peer/README.md b/network/fabric/3-org-1-peer/README.md
similarity index 100%
rename from network/fabric-v11/3-org-1-peer/README.md
rename to network/fabric/3-org-1-peer/README.md
diff --git a/network/fabric-v11/3-org-1-peer/composer-tls.json b/network/fabric/3-org-1-peer/composer-tls.json
similarity index 98%
rename from network/fabric-v11/3-org-1-peer/composer-tls.json
rename to network/fabric/3-org-1-peer/composer-tls.json
index 09f2e919e..17d64def7 100755
--- a/network/fabric-v11/3-org-1-peer/composer-tls.json
+++ b/network/fabric/3-org-1-peer/composer-tls.json
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2", "Org3"], "loglevel": "INFO"}],
- "cryptodir": "network/fabric-v11/config/crypto-config",
+ "cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 10000,
diff --git a/network/fabric-v11/3-org-1-peer/composer.json b/network/fabric/3-org-1-peer/composer.json
similarity index 98%
rename from network/fabric-v11/3-org-1-peer/composer.json
rename to network/fabric/3-org-1-peer/composer.json
index 26a5103ac..8de3b63c6 100755
--- a/network/fabric-v11/3-org-1-peer/composer.json
+++ b/network/fabric/3-org-1-peer/composer.json
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2", "Org3"], "loglevel": "INFO"}],
- "cryptodir": "network/fabric-v11/config/crypto-config",
+ "cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 10000,
diff --git a/network/fabric-v11/3-org-1-peer/docker-compose-tls.yaml b/network/fabric/3-org-1-peer/docker-compose-tls.yaml
similarity index 100%
rename from network/fabric-v11/3-org-1-peer/docker-compose-tls.yaml
rename to network/fabric/3-org-1-peer/docker-compose-tls.yaml
diff --git a/network/fabric-v11/3-org-1-peer/docker-compose.yaml b/network/fabric/3-org-1-peer/docker-compose.yaml
similarity index 100%
rename from network/fabric-v11/3-org-1-peer/docker-compose.yaml
rename to network/fabric/3-org-1-peer/docker-compose.yaml
diff --git a/network/fabric-v11/3-org-2-peer/README.md b/network/fabric/3-org-2-peer/README.md
similarity index 100%
rename from network/fabric-v11/3-org-2-peer/README.md
rename to network/fabric/3-org-2-peer/README.md
diff --git a/network/fabric-v11/3-org-2-peer/composer-tls.json b/network/fabric/3-org-2-peer/composer-tls.json
similarity index 98%
rename from network/fabric-v11/3-org-2-peer/composer-tls.json
rename to network/fabric/3-org-2-peer/composer-tls.json
index 36e6aae3b..bde52a00d 100755
--- a/network/fabric-v11/3-org-2-peer/composer-tls.json
+++ b/network/fabric/3-org-2-peer/composer-tls.json
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2", "Org3"], "loglevel": "INFO"}],
- "cryptodir": "network/fabric-v11/config/crypto-config",
+ "cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 3000,
diff --git a/network/fabric-v11/3-org-2-peer/composer.json b/network/fabric/3-org-2-peer/composer.json
similarity index 98%
rename from network/fabric-v11/3-org-2-peer/composer.json
rename to network/fabric/3-org-2-peer/composer.json
index c2896bb4b..adbdd5058 100755
--- a/network/fabric-v11/3-org-2-peer/composer.json
+++ b/network/fabric/3-org-2-peer/composer.json
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2", "Org3"], "loglevel": "INFO"}],
- "cryptodir": "network/fabric-v11/config/crypto-config",
+ "cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 3000,
diff --git a/network/fabric-v11/3-org-2-peer/docker-compose-tls.yaml b/network/fabric/3-org-2-peer/docker-compose-tls.yaml
similarity index 100%
rename from network/fabric-v11/3-org-2-peer/docker-compose-tls.yaml
rename to network/fabric/3-org-2-peer/docker-compose-tls.yaml
diff --git a/network/fabric-v11/3-org-2-peer/docker-compose.yaml b/network/fabric/3-org-2-peer/docker-compose.yaml
similarity index 100%
rename from network/fabric-v11/3-org-2-peer/docker-compose.yaml
rename to network/fabric/3-org-2-peer/docker-compose.yaml
diff --git a/network/fabric-v11/3-org-3-peer/README.md b/network/fabric/3-org-3-peer/README.md
similarity index 100%
rename from network/fabric-v11/3-org-3-peer/README.md
rename to network/fabric/3-org-3-peer/README.md
diff --git a/network/fabric-v11/3-org-3-peer/composer-tls.json b/network/fabric/3-org-3-peer/composer-tls.json
similarity index 99%
rename from network/fabric-v11/3-org-3-peer/composer-tls.json
rename to network/fabric/3-org-3-peer/composer-tls.json
index 893f07153..7e6a7d11a 100755
--- a/network/fabric-v11/3-org-3-peer/composer-tls.json
+++ b/network/fabric/3-org-3-peer/composer-tls.json
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2", "Org3"], "loglevel": "INFO"}],
- "cryptodir": "network/fabric-v11/config/crypto-config",
+ "cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 3000,
diff --git a/network/fabric-v11/3-org-3-peer/composer.json b/network/fabric/3-org-3-peer/composer.json
similarity index 98%
rename from network/fabric-v11/3-org-3-peer/composer.json
rename to network/fabric/3-org-3-peer/composer.json
index ecc95b35d..6a7c100e4 100755
--- a/network/fabric-v11/3-org-3-peer/composer.json
+++ b/network/fabric/3-org-3-peer/composer.json
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2", "Org3"], "loglevel": "INFO"}],
- "cryptodir": "network/fabric-v11/config/crypto-config",
+ "cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 3000,
diff --git a/network/fabric-v11/3-org-3-peer/docker-compose-tls.yaml b/network/fabric/3-org-3-peer/docker-compose-tls.yaml
similarity index 100%
rename from network/fabric-v11/3-org-3-peer/docker-compose-tls.yaml
rename to network/fabric/3-org-3-peer/docker-compose-tls.yaml
diff --git a/network/fabric-v11/3-org-3-peer/docker-compose.yaml b/network/fabric/3-org-3-peer/docker-compose.yaml
similarity index 100%
rename from network/fabric-v11/3-org-3-peer/docker-compose.yaml
rename to network/fabric/3-org-3-peer/docker-compose.yaml
diff --git a/network/fabric-v11/config/configtx.yaml b/network/fabric/config/configtx.yaml
similarity index 100%
rename from network/fabric-v11/config/configtx.yaml
rename to network/fabric/config/configtx.yaml
diff --git a/network/fabric-v11/config/crypto-config.yaml b/network/fabric/config/crypto-config.yaml
similarity index 100%
rename from network/fabric-v11/config/crypto-config.yaml
rename to network/fabric/config/crypto-config.yaml
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem b/network/fabric/config/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/ca/key.pem b/network/fabric/config/crypto-config/ordererOrganizations/example.com/ca/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/ca/key.pem
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/ca/key.pem
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem b/network/fabric/config/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem b/network/fabric/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/network/fabric/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem b/network/fabric/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem b/network/fabric/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/key.pem b/network/fabric/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/key.pem
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/key.pem
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem b/network/fabric/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/network/fabric/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt b/network/fabric/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt b/network/fabric/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key b/network/fabric/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/tlsca/key.pem b/network/fabric/config/crypto-config/ordererOrganizations/example.com/tlsca/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/tlsca/key.pem
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/tlsca/key.pem
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem b/network/fabric/config/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem b/network/fabric/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem b/network/fabric/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/key.pem b/network/fabric/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/key.pem
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/key.pem
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem b/network/fabric/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/network/fabric/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt b/network/fabric/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.crt b/network/fabric/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.crt
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.crt
diff --git a/network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.key b/network/fabric/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.key
similarity index 100%
rename from network/fabric-v11/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.key
rename to network/fabric/config/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/server.key
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/ca/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/ca/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/ca/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/ca/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/keystore/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/keystore/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/keystore/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/keystore/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/signcerts/peer1.org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/signcerts/peer1.org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/signcerts/peer1.org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/signcerts/peer1.org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.crt b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.key b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.key
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.key
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/server.key
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/msp/keystore/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/msp/keystore/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/msp/keystore/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/msp/keystore/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/msp/signcerts/peer2.org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/msp/signcerts/peer2.org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/msp/signcerts/peer2.org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/msp/signcerts/peer2.org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/tls/ca.crt b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/tls/ca.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/tls/ca.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/tls/ca.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/tls/server.crt b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/tls/server.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/tls/server.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/tls/server.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/tls/server.key b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/tls/server.key
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/tls/server.key
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/peers/peer2.org1.example.com/tls/server.key
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/tlsca/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/tlsca/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/tlsca/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/tlsca/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.crt b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.key b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.key
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.key
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/server.key
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.crt b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.key b/network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.key
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.key
rename to network/fabric/config/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/server.key
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/ca/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/ca/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/ca/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/ca/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/keystore/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/keystore/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/keystore/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/keystore/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/signcerts/peer0.org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/signcerts/peer0.org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/signcerts/peer0.org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/signcerts/peer0.org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.crt b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.key b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.key
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.key
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/server.key
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/keystore/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/keystore/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/keystore/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/keystore/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/signcerts/peer1.org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/signcerts/peer1.org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/signcerts/peer1.org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/signcerts/peer1.org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.crt b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.key b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.key
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.key
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/server.key
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/msp/keystore/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/msp/keystore/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/msp/keystore/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/msp/keystore/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/msp/signcerts/peer2.org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/msp/signcerts/peer2.org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/msp/signcerts/peer2.org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/msp/signcerts/peer2.org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/tls/ca.crt b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/tls/ca.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/tls/ca.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/tls/ca.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/tls/server.crt b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/tls/server.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/tls/server.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/tls/server.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/tls/server.key b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/tls/server.key
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/tls/server.key
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/peers/peer2.org2.example.com/tls/server.key
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/tlsca/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/tlsca/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/tlsca/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/tlsca/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/admincerts/Admin@org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts/Admin@org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/ca.crt b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/ca.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/ca.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/ca.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/server.crt b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/server.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/server.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/server.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/server.key b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/server.key
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/server.key
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/tls/server.key
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/admincerts/User1@org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/admincerts/User1@org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/admincerts/User1@org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/admincerts/User1@org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/cacerts/ca.org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/keystore/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/keystore/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/keystore/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/keystore/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/signcerts/User1@org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/signcerts/User1@org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/signcerts/User1@org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/signcerts/User1@org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/ca.crt b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/ca.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/ca.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/ca.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/server.crt b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/server.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/server.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/server.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/server.key b/network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/server.key
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/server.key
rename to network/fabric/config/crypto-config/peerOrganizations/org2.example.com/users/User1@org2.example.com/tls/server.key
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/ca/ca.org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/ca/ca.org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/ca/ca.org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/ca/ca.org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/ca/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/ca/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/ca/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/ca/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/msp/admincerts/Admin@org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/msp/admincerts/Admin@org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/msp/admincerts/Admin@org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/msp/admincerts/Admin@org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/admincerts/Admin@org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/admincerts/Admin@org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/admincerts/Admin@org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/admincerts/Admin@org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/keystore/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/keystore/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/keystore/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/keystore/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/signcerts/peer0.org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/signcerts/peer0.org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/signcerts/peer0.org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/signcerts/peer0.org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/ca.crt b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/ca.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/ca.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/ca.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/server.crt b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/server.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/server.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/server.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/server.key b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/server.key
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/server.key
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/server.key
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp/admincerts/Admin@org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp/admincerts/Admin@org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp/admincerts/Admin@org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp/admincerts/Admin@org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp/keystore/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp/keystore/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp/keystore/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp/keystore/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp/signcerts/peer1.org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp/signcerts/peer1.org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp/signcerts/peer1.org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp/signcerts/peer1.org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/tls/ca.crt b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/tls/ca.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/tls/ca.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/tls/ca.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/tls/server.crt b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/tls/server.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/tls/server.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/tls/server.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/tls/server.key b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/tls/server.key
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/tls/server.key
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/tls/server.key
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/msp/admincerts/Admin@org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/msp/admincerts/Admin@org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/msp/admincerts/Admin@org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/msp/admincerts/Admin@org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/msp/keystore/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/msp/keystore/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/msp/keystore/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/msp/keystore/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/msp/signcerts/peer2.org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/msp/signcerts/peer2.org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/msp/signcerts/peer2.org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/msp/signcerts/peer2.org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/tls/ca.crt b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/tls/ca.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/tls/ca.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/tls/ca.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/tls/server.crt b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/tls/server.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/tls/server.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/tls/server.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/tls/server.key b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/tls/server.key
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/tls/server.key
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/peers/peer2.org3.example.com/tls/server.key
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/tlsca/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/tlsca/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/tlsca/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/tlsca/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/tlsca/tlsca.org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/tlsca/tlsca.org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/tlsca/tlsca.org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/tlsca/tlsca.org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp/admincerts/Admin@org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp/admincerts/Admin@org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp/admincerts/Admin@org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp/admincerts/Admin@org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp/keystore/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp/keystore/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp/keystore/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp/keystore/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp/signcerts/Admin@org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp/signcerts/Admin@org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp/signcerts/Admin@org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp/signcerts/Admin@org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/tls/ca.crt b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/tls/ca.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/tls/ca.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/tls/ca.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/tls/server.crt b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/tls/server.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/tls/server.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/tls/server.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/tls/server.key b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/tls/server.key
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/tls/server.key
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/Admin@org3.example.com/tls/server.key
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/admincerts/User1@org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/admincerts/User1@org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/admincerts/User1@org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/admincerts/User1@org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/cacerts/ca.org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/keystore/key.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/keystore/key.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/keystore/key.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/keystore/key.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/signcerts/User1@org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/signcerts/User1@org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/signcerts/User1@org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/signcerts/User1@org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/msp/tlscacerts/tlsca.org3.example.com-cert.pem
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/tls/ca.crt b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/tls/ca.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/tls/ca.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/tls/ca.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/tls/server.crt b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/tls/server.crt
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/tls/server.crt
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/tls/server.crt
diff --git a/network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/tls/server.key b/network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/tls/server.key
similarity index 100%
rename from network/fabric-v11/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/tls/server.key
rename to network/fabric/config/crypto-config/peerOrganizations/org3.example.com/users/User1@org3.example.com/tls/server.key
diff --git a/network/fabric-v11/config/generate.sh b/network/fabric/config/generate.sh
similarity index 100%
rename from network/fabric-v11/config/generate.sh
rename to network/fabric/config/generate.sh
diff --git a/network/fabric-v11/config/mychannel.tx b/network/fabric/config/mychannel.tx
similarity index 100%
rename from network/fabric-v11/config/mychannel.tx
rename to network/fabric/config/mychannel.tx
diff --git a/network/fabric-v11/config/orgs.genesis.block b/network/fabric/config/orgs.genesis.block
similarity index 100%
rename from network/fabric-v11/config/orgs.genesis.block
rename to network/fabric/config/orgs.genesis.block