House keeping/Organizing sections

Numbers are set to change.