Update deployment scripts to support new directory structure introduced by recent refactorings