Restructure to make it work in azure