Began refactoring deployment tasks
Refactored remaining tasks to use new format