Converting to Azure RM from Amazon

Updated