Reorginize structure