Restructure for split