added calvalus bundle-descriptor and updated modules assembly