restructuring again the sections/subsections