diff --git a/descriptor-packages/vnfd/dns_aws_ns/Makefile b/descriptor-packages/nsd/dns_aws_ns/Makefile
similarity index 100%
rename from descriptor-packages/vnfd/dns_aws_ns/Makefile
rename to descriptor-packages/nsd/dns_aws_ns/Makefile
diff --git a/descriptor-packages/vnfd/dns_aws_ns/src/dns_aws_nsd.yaml b/descriptor-packages/nsd/dns_aws_ns/src/dns_aws_nsd.yaml
similarity index 100%
rename from descriptor-packages/vnfd/dns_aws_ns/src/dns_aws_nsd.yaml
rename to descriptor-packages/nsd/dns_aws_ns/src/dns_aws_nsd.yaml
diff --git a/descriptor-packages/vnfd/dns_aws_ns/src/icons/dns.jpg b/descriptor-packages/nsd/dns_aws_ns/src/icons/dns.jpg
similarity index 100%
rename from descriptor-packages/vnfd/dns_aws_ns/src/icons/dns.jpg
rename to descriptor-packages/nsd/dns_aws_ns/src/icons/dns.jpg
Binary files differ
diff --git a/descriptor-packages/vnfd/ubuntu_cloudinit_ns/Makefile b/descriptor-packages/nsd/ubuntu_cloudinit_ns/Makefile
similarity index 100%
rename from descriptor-packages/vnfd/ubuntu_cloudinit_ns/Makefile
rename to descriptor-packages/nsd/ubuntu_cloudinit_ns/Makefile
diff --git a/descriptor-packages/vnfd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml b/descriptor-packages/nsd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml
similarity index 100%
rename from descriptor-packages/vnfd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml
rename to descriptor-packages/nsd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml
diff --git a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/Makefile b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/Makefile
similarity index 100%
rename from descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/Makefile
rename to descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/Makefile
diff --git a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/cloud_init/cloud_init.cfg b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/cloud_init/cloud_init.cfg
similarity index 100%
rename from descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/cloud_init/cloud_init.cfg
rename to descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/cloud_init/cloud_init.cfg
diff --git a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/icons/ubuntu-logo14.png b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/icons/ubuntu-logo14.png
similarity index 100%
rename from descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/icons/ubuntu-logo14.png
rename to descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/icons/ubuntu-logo14.png
Binary files differ
diff --git a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pem b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pem
similarity index 100%
rename from descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pem
rename to descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pem
diff --git a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pub b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pub
similarity index 100%
rename from descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pub
rename to descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pub
diff --git a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml
similarity index 100%
rename from descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml
rename to descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml