Azure deployment re-factored to be extendable