Restructure for 1.7