Lots of renaming to better show hierarchy of sections.