Restructure to make Azure happy