MODE-2248: Move specific descriptors to deploy directory

Combined PR which moves specific files to deploy and fixes context name