Restructure sections