More tweaks to deployment structure