diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 1b2211d..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build*
diff --git a/Makefile b/descriptor-packages/Makefile
similarity index 100%
rename from Makefile
rename to descriptor-packages/Makefile
diff --git a/README b/descriptor-packages/README
similarity index 100%
rename from README
rename to descriptor-packages/README
diff --git a/src/gen_nsd_pkg.sh b/descriptor-packages/src/gen_nsd_pkg.sh
similarity index 100%
rename from src/gen_nsd_pkg.sh
rename to descriptor-packages/src/gen_nsd_pkg.sh
diff --git a/src/gen_vnfd_pkg.sh b/descriptor-packages/src/gen_vnfd_pkg.sh
similarity index 100%
rename from src/gen_vnfd_pkg.sh
rename to descriptor-packages/src/gen_vnfd_pkg.sh
diff --git a/src/generate_descriptor_pkg.sh b/descriptor-packages/src/generate_descriptor_pkg.sh
similarity index 100%
rename from src/generate_descriptor_pkg.sh
rename to descriptor-packages/src/generate_descriptor_pkg.sh
diff --git a/src/nsd/VyOS_ns/VyOS_nsd.yaml b/descriptor-packages/src/nsd/VyOS_ns/VyOS_nsd.yaml
similarity index 100%
rename from src/nsd/VyOS_ns/VyOS_nsd.yaml
rename to descriptor-packages/src/nsd/VyOS_ns/VyOS_nsd.yaml
diff --git a/src/nsd/VyOS_ns/icons/osm_2x.png b/descriptor-packages/src/nsd/VyOS_ns/icons/osm_2x.png
similarity index 100%
rename from src/nsd/VyOS_ns/icons/osm_2x.png
rename to descriptor-packages/src/nsd/VyOS_ns/icons/osm_2x.png
Binary files differ
diff --git a/src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml b/descriptor-packages/src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml
similarity index 100%
rename from src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml
rename to descriptor-packages/src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml
diff --git a/src/nsd/cirros_2vnf_ns/icons/osm_2x.png b/descriptor-packages/src/nsd/cirros_2vnf_ns/icons/osm_2x.png
similarity index 100%
rename from src/nsd/cirros_2vnf_ns/icons/osm_2x.png
rename to descriptor-packages/src/nsd/cirros_2vnf_ns/icons/osm_2x.png
Binary files differ
diff --git a/src/nsd/cirros_ns/cirros_nsd.yaml b/descriptor-packages/src/nsd/cirros_ns/cirros_nsd.yaml
similarity index 100%
rename from src/nsd/cirros_ns/cirros_nsd.yaml
rename to descriptor-packages/src/nsd/cirros_ns/cirros_nsd.yaml
diff --git a/src/nsd/cirros_ns/icons/osm_2x.png b/descriptor-packages/src/nsd/cirros_ns/icons/osm_2x.png
similarity index 100%
rename from src/nsd/cirros_ns/icons/osm_2x.png
rename to descriptor-packages/src/nsd/cirros_ns/icons/osm_2x.png
Binary files differ
diff --git a/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml b/descriptor-packages/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml
similarity index 100%
rename from src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml
rename to descriptor-packages/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml
diff --git a/src/nsd/ims_allin1_corpa/icons/osm_2x.png b/descriptor-packages/src/nsd/ims_allin1_corpa/icons/osm_2x.png
similarity index 100%
rename from src/nsd/ims_allin1_corpa/icons/osm_2x.png
rename to descriptor-packages/src/nsd/ims_allin1_corpa/icons/osm_2x.png
Binary files differ
diff --git a/src/nsd/ims_allin1_corpa/vnf_config/IMS-ALLIN1_2p__1.yaml b/descriptor-packages/src/nsd/ims_allin1_corpa/vnf_config/IMS-ALLIN1_2p__1.yaml
similarity index 100%
rename from src/nsd/ims_allin1_corpa/vnf_config/IMS-ALLIN1_2p__1.yaml
rename to descriptor-packages/src/nsd/ims_allin1_corpa/vnf_config/IMS-ALLIN1_2p__1.yaml
diff --git a/src/nsd/ping_pong_ns/icons/rift_logo.png b/descriptor-packages/src/nsd/ping_pong_ns/icons/rift_logo.png
similarity index 100%
rename from src/nsd/ping_pong_ns/icons/rift_logo.png
rename to descriptor-packages/src/nsd/ping_pong_ns/icons/rift_logo.png
Binary files differ
diff --git a/src/nsd/ping_pong_ns/ping_pong_nsd.yaml b/descriptor-packages/src/nsd/ping_pong_ns/ping_pong_nsd.yaml
similarity index 100%
rename from src/nsd/ping_pong_ns/ping_pong_nsd.yaml
rename to descriptor-packages/src/nsd/ping_pong_ns/ping_pong_nsd.yaml
diff --git a/src/nsd/ping_pong_ns/scripts/start_traffic.py b/descriptor-packages/src/nsd/ping_pong_ns/scripts/start_traffic.py
similarity index 100%
rename from src/nsd/ping_pong_ns/scripts/start_traffic.py
rename to descriptor-packages/src/nsd/ping_pong_ns/scripts/start_traffic.py
diff --git a/src/nsd/ref1_ns/ref1_nsd.yaml b/descriptor-packages/src/nsd/ref1_ns/ref1_nsd.yaml
similarity index 100%
rename from src/nsd/ref1_ns/ref1_nsd.yaml
rename to descriptor-packages/src/nsd/ref1_ns/ref1_nsd.yaml
diff --git a/src/nsd/ref2_ns/ref2_nsd.yaml b/descriptor-packages/src/nsd/ref2_ns/ref2_nsd.yaml
similarity index 100%
rename from src/nsd/ref2_ns/ref2_nsd.yaml
rename to descriptor-packages/src/nsd/ref2_ns/ref2_nsd.yaml
diff --git a/src/nsd/ubuntu_cirros_multidisk_ns/icons/osm_2x.png b/descriptor-packages/src/nsd/ubuntu_cirros_multidisk_ns/icons/osm_2x.png
similarity index 100%
rename from src/nsd/ubuntu_cirros_multidisk_ns/icons/osm_2x.png
rename to descriptor-packages/src/nsd/ubuntu_cirros_multidisk_ns/icons/osm_2x.png
Binary files differ
diff --git a/src/nsd/ubuntu_cirros_multidisk_ns/ubuntu_cirros_multidisk_nsd.yaml b/descriptor-packages/src/nsd/ubuntu_cirros_multidisk_ns/ubuntu_cirros_multidisk_nsd.yaml
similarity index 100%
rename from src/nsd/ubuntu_cirros_multidisk_ns/ubuntu_cirros_multidisk_nsd.yaml
rename to descriptor-packages/src/nsd/ubuntu_cirros_multidisk_ns/ubuntu_cirros_multidisk_nsd.yaml
diff --git a/src/nsd/ubuntu_xenial_ns/icons/osm_2x.png b/descriptor-packages/src/nsd/ubuntu_xenial_ns/icons/osm_2x.png
similarity index 100%
rename from src/nsd/ubuntu_xenial_ns/icons/osm_2x.png
rename to descriptor-packages/src/nsd/ubuntu_xenial_ns/icons/osm_2x.png
Binary files differ
diff --git a/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml b/descriptor-packages/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml
similarity index 100%
rename from src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml
rename to descriptor-packages/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml
diff --git a/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml b/descriptor-packages/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml
similarity index 100%
rename from src/vnfd/VyOS_vnf/VyOS__vnfd.yaml
rename to descriptor-packages/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml
diff --git a/src/vnfd/VyOS_vnf/icons/osm_2x.png b/descriptor-packages/src/vnfd/VyOS_vnf/icons/osm_2x.png
similarity index 100%
rename from src/vnfd/VyOS_vnf/icons/osm_2x.png
rename to descriptor-packages/src/vnfd/VyOS_vnf/icons/osm_2x.png
Binary files differ
diff --git a/src/vnfd/cirros_vnf/cirros_vnfd.yaml b/descriptor-packages/src/vnfd/cirros_vnf/cirros_vnfd.yaml
similarity index 100%
rename from src/vnfd/cirros_vnf/cirros_vnfd.yaml
rename to descriptor-packages/src/vnfd/cirros_vnf/cirros_vnfd.yaml
diff --git a/src/vnfd/cirros_vnf/icons/cirros-64.png b/descriptor-packages/src/vnfd/cirros_vnf/icons/cirros-64.png
similarity index 100%
rename from src/vnfd/cirros_vnf/icons/cirros-64.png
rename to descriptor-packages/src/vnfd/cirros_vnf/icons/cirros-64.png
Binary files differ
diff --git a/src/vnfd/ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml b/descriptor-packages/src/vnfd/ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml
similarity index 100%
rename from src/vnfd/ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml
rename to descriptor-packages/src/vnfd/ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml
diff --git a/src/vnfd/ims_allin1_2p_vnf/icons/metaswitch_2x.png b/descriptor-packages/src/vnfd/ims_allin1_2p_vnf/icons/metaswitch_2x.png
similarity index 100%
rename from src/vnfd/ims_allin1_2p_vnf/icons/metaswitch_2x.png
rename to descriptor-packages/src/vnfd/ims_allin1_2p_vnf/icons/metaswitch_2x.png
Binary files differ
diff --git a/src/vnfd/ping_vnf/cloud_init/ping_cloud_init.cfg b/descriptor-packages/src/vnfd/ping_vnf/cloud_init/ping_cloud_init.cfg
similarity index 100%
rename from src/vnfd/ping_vnf/cloud_init/ping_cloud_init.cfg
rename to descriptor-packages/src/vnfd/ping_vnf/cloud_init/ping_cloud_init.cfg
diff --git a/src/vnfd/ping_vnf/icons/rift_logo.png b/descriptor-packages/src/vnfd/ping_vnf/icons/rift_logo.png
similarity index 100%
rename from src/vnfd/ping_vnf/icons/rift_logo.png
rename to descriptor-packages/src/vnfd/ping_vnf/icons/rift_logo.png
Binary files differ
diff --git a/src/vnfd/ping_vnf/ping_vnfd.yaml b/descriptor-packages/src/vnfd/ping_vnf/ping_vnfd.yaml
similarity index 100%
rename from src/vnfd/ping_vnf/ping_vnfd.yaml
rename to descriptor-packages/src/vnfd/ping_vnf/ping_vnfd.yaml
diff --git a/src/vnfd/pong_vnf/cloud_init/pong_cloud_init.cfg b/descriptor-packages/src/vnfd/pong_vnf/cloud_init/pong_cloud_init.cfg
similarity index 100%
rename from src/vnfd/pong_vnf/cloud_init/pong_cloud_init.cfg
rename to descriptor-packages/src/vnfd/pong_vnf/cloud_init/pong_cloud_init.cfg
diff --git a/src/vnfd/pong_vnf/icons/rift_logo.png b/descriptor-packages/src/vnfd/pong_vnf/icons/rift_logo.png
similarity index 100%
rename from src/vnfd/pong_vnf/icons/rift_logo.png
rename to descriptor-packages/src/vnfd/pong_vnf/icons/rift_logo.png
Binary files differ
diff --git a/src/vnfd/pong_vnf/pong_vnfd.yaml b/descriptor-packages/src/vnfd/pong_vnf/pong_vnfd.yaml
similarity index 100%
rename from src/vnfd/pong_vnf/pong_vnfd.yaml
rename to descriptor-packages/src/vnfd/pong_vnf/pong_vnfd.yaml
diff --git a/src/vnfd/ref11_vnf/ref11_vnfd.yaml b/descriptor-packages/src/vnfd/ref11_vnf/ref11_vnfd.yaml
similarity index 100%
rename from src/vnfd/ref11_vnf/ref11_vnfd.yaml
rename to descriptor-packages/src/vnfd/ref11_vnf/ref11_vnfd.yaml
diff --git a/src/vnfd/ref12_vnf/ref12_vnfd.yaml b/descriptor-packages/src/vnfd/ref12_vnf/ref12_vnfd.yaml
similarity index 100%
rename from src/vnfd/ref12_vnf/ref12_vnfd.yaml
rename to descriptor-packages/src/vnfd/ref12_vnf/ref12_vnfd.yaml
diff --git a/src/vnfd/ref21_vnf/ref21_vnfd.yaml b/descriptor-packages/src/vnfd/ref21_vnf/ref21_vnfd.yaml
similarity index 100%
rename from src/vnfd/ref21_vnf/ref21_vnfd.yaml
rename to descriptor-packages/src/vnfd/ref21_vnf/ref21_vnfd.yaml
diff --git a/src/vnfd/ref22_vnf/ref22_vnfd.yaml b/descriptor-packages/src/vnfd/ref22_vnf/ref22_vnfd.yaml
similarity index 100%
rename from src/vnfd/ref22_vnf/ref22_vnfd.yaml
rename to descriptor-packages/src/vnfd/ref22_vnf/ref22_vnfd.yaml
diff --git a/src/vnfd/ubuntu_cirros_multidisk_vnf/cloud_init/cloud_init.cfg b/descriptor-packages/src/vnfd/ubuntu_cirros_multidisk_vnf/cloud_init/cloud_init.cfg
similarity index 100%
rename from src/vnfd/ubuntu_cirros_multidisk_vnf/cloud_init/cloud_init.cfg
rename to descriptor-packages/src/vnfd/ubuntu_cirros_multidisk_vnf/cloud_init/cloud_init.cfg
diff --git a/src/vnfd/ubuntu_cirros_multidisk_vnf/ubuntu_cirros_multidisk_vnfd.yaml b/descriptor-packages/src/vnfd/ubuntu_cirros_multidisk_vnf/ubuntu_cirros_multidisk_vnfd.yaml
similarity index 100%
rename from src/vnfd/ubuntu_cirros_multidisk_vnf/ubuntu_cirros_multidisk_vnfd.yaml
rename to descriptor-packages/src/vnfd/ubuntu_cirros_multidisk_vnf/ubuntu_cirros_multidisk_vnfd.yaml
diff --git a/src/vnfd/ubuntu_xenial_vnf/cloud_init/cloud_init.cfg b/descriptor-packages/src/vnfd/ubuntu_xenial_vnf/cloud_init/cloud_init.cfg
similarity index 100%
rename from src/vnfd/ubuntu_xenial_vnf/cloud_init/cloud_init.cfg
rename to descriptor-packages/src/vnfd/ubuntu_xenial_vnf/cloud_init/cloud_init.cfg
diff --git a/src/vnfd/ubuntu_xenial_vnf/icons/ubuntu-logo14.png b/descriptor-packages/src/vnfd/ubuntu_xenial_vnf/icons/ubuntu-logo14.png
similarity index 100%
rename from src/vnfd/ubuntu_xenial_vnf/icons/ubuntu-logo14.png
rename to descriptor-packages/src/vnfd/ubuntu_xenial_vnf/icons/ubuntu-logo14.png
Binary files differ
diff --git a/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml b/descriptor-packages/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml
similarity index 100%
rename from src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml
rename to descriptor-packages/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml