Restructure after split