diff --git a/descriptor-packages/nsd/cirros_2vnf_ns/src/cirros_2vnf_nsd.yaml b/descriptor-packages/nsd/cirros_2vnf_ns/src/cirros_2vnf_nsd.yaml
index 200f153821e3511377c46825406c9c3b2c505411..298b834433b3af5440a83ca4d9f3581aa2cbd3e2 100644
--- a/descriptor-packages/nsd/cirros_2vnf_ns/src/cirros_2vnf_nsd.yaml
+++ b/descriptor-packages/nsd/cirros_2vnf_ns/src/cirros_2vnf_nsd.yaml
@@ -27,6 +27,7 @@ nsd:nsd-catalog:
                 name: cirros_2vnf_nsd_vld1
                 short-name: cirros_2vnf_nsd_vld1
                 type: ELAN
+                mgmt-network: 'true'
                 # vim-network-name: <update>
                 # provider-network:
                 #     overlay-type: VLAN
diff --git a/descriptor-packages/nsd/cirros_noportsecurity_2vnf_ns/src/cirros_noportsecurity_2vnf_nsd.yaml b/descriptor-packages/nsd/cirros_noportsecurity_2vnf_ns/src/cirros_noportsecurity_2vnf_nsd.yaml
index 5f048abd7c381ede5877080e5ca09a060a06154e..57ec12b2da1bb03d0a48edcf361d028fa5f6868d 100644
--- a/descriptor-packages/nsd/cirros_noportsecurity_2vnf_ns/src/cirros_noportsecurity_2vnf_nsd.yaml
+++ b/descriptor-packages/nsd/cirros_noportsecurity_2vnf_ns/src/cirros_noportsecurity_2vnf_nsd.yaml
@@ -27,6 +27,7 @@ nsd:nsd-catalog:
                 name: cirros_2vnf_nsd_vld1
                 short-name: cirros_2vnf_nsd_vld1
                 type: ELAN
+                mgmt-network: 'true'
                 # vim-network-name: <update>
                 # provider-network:
                 #     overlay-type: VLAN
diff --git a/descriptor-packages/nsd/cirros_set_vim_network_ns/src/cirros_set_vim_network_nsd.yaml b/descriptor-packages/nsd/cirros_set_vim_network_ns/src/cirros_set_vim_network_nsd.yaml
index e87d4f2f14cd85fa4d2148c9aa4ae283dfc0656e..e3468308bbfc7cae817517dbbbd0a65982590c47 100755
--- a/descriptor-packages/nsd/cirros_set_vim_network_ns/src/cirros_set_vim_network_nsd.yaml
+++ b/descriptor-packages/nsd/cirros_set_vim_network_ns/src/cirros_set_vim_network_nsd.yaml
@@ -34,6 +34,7 @@ nsd:nsd-catalog:
             -   id: cirros_nsd_vld1
                 name: cirros_nsd_vld1
                 type: ELAN
+                mgmt-network: 'true'
                 # vim-network-name: <update>
                 # provider-network:
                 #     overlay-type: VLAN
diff --git a/descriptor-packages/nsd/ubuntu_cirros_multidisk_ns/src/ubuntu_cirros_multidisk_nsd.yaml b/descriptor-packages/nsd/ubuntu_cirros_multidisk_ns/src/ubuntu_cirros_multidisk_nsd.yaml
index cbbe6a20afbb10edfddf385acfe632b451734fe0..5f1a8d5c86b1700b7f255759a1bc1373ecffe503 100644
--- a/descriptor-packages/nsd/ubuntu_cirros_multidisk_ns/src/ubuntu_cirros_multidisk_nsd.yaml
+++ b/descriptor-packages/nsd/ubuntu_cirros_multidisk_ns/src/ubuntu_cirros_multidisk_nsd.yaml
@@ -24,6 +24,7 @@ nsd:nsd-catalog:
                 name: management
                 short-name: management
                 type: ELAN
+                mgmt-network: 'true'
                 vnfd-connection-point-ref:
                 # Specify the constituent VNFs
                 -   member-vnf-index-ref: 1
diff --git a/descriptor-packages/nsd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml b/descriptor-packages/nsd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml
index 9b442824da1d147b80b3a288d0ffb7231269111b..e768c778bf011751e37ed35f8a3da8ff0f0872a1 100755
--- a/descriptor-packages/nsd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml
+++ b/descriptor-packages/nsd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml
@@ -12,6 +12,7 @@ nsd:nsd-catalog:
             nsd:mgmt-network: 'false'
             nsd:name: mgmt
             nsd:short-name: mgmt
+            mgmt-network: 'true'
             nsd:vnfd-connection-point-ref:
             -   nsd:member-vnf-index-ref: '1'
                 nsd:vnfd-connection-point-ref: eth0
diff --git a/descriptor-packages/nsd/ubuntu_epa_virtio_ns/src/ubuntu_epa_virtio_nsd.yaml b/descriptor-packages/nsd/ubuntu_epa_virtio_ns/src/ubuntu_epa_virtio_nsd.yaml
index b8ae75b084e57e95c709a09537c46dfe4a94729d..82e55b94ce440f850e5f83984a335682dfe43a58 100755
--- a/descriptor-packages/nsd/ubuntu_epa_virtio_ns/src/ubuntu_epa_virtio_nsd.yaml
+++ b/descriptor-packages/nsd/ubuntu_epa_virtio_ns/src/ubuntu_epa_virtio_nsd.yaml
@@ -17,6 +17,7 @@ nsd:nsd-catalog:
             name: mgmt
             short-name: mgmt
             type: ELAN
+            mgmt-network: 'true'
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: 1
                 vnfd-id-ref: ubuntu_epa_virtio_vnf
diff --git a/descriptor-packages/nsd/dns_aws_vnfd/Makefile b/descriptor-packages/vnfd/dns_aws_vnfd/Makefile
similarity index 100%
rename from descriptor-packages/nsd/dns_aws_vnfd/Makefile
rename to descriptor-packages/vnfd/dns_aws_vnfd/Makefile
diff --git a/descriptor-packages/nsd/dns_aws_vnfd/src/cloud_init/cloud_init.cfg b/descriptor-packages/vnfd/dns_aws_vnfd/src/cloud_init/cloud_init.cfg
similarity index 100%
rename from descriptor-packages/nsd/dns_aws_vnfd/src/cloud_init/cloud_init.cfg
rename to descriptor-packages/vnfd/dns_aws_vnfd/src/cloud_init/cloud_init.cfg
diff --git a/descriptor-packages/nsd/dns_aws_vnfd/src/dns_aws_vnfd.yaml b/descriptor-packages/vnfd/dns_aws_vnfd/src/dns_aws_vnfd.yaml
similarity index 100%
rename from descriptor-packages/nsd/dns_aws_vnfd/src/dns_aws_vnfd.yaml
rename to descriptor-packages/vnfd/dns_aws_vnfd/src/dns_aws_vnfd.yaml
diff --git a/descriptor-packages/nsd/dns_aws_vnfd/src/icons/dns.jpg b/descriptor-packages/vnfd/dns_aws_vnfd/src/icons/dns.jpg
similarity index 100%
rename from descriptor-packages/nsd/dns_aws_vnfd/src/icons/dns.jpg
rename to descriptor-packages/vnfd/dns_aws_vnfd/src/icons/dns.jpg