Reorganize deployment

**work in progress**

Upgrade deployment method to latest template (easier to incorporate future changes)