Many changes to move sections into a subdirectory.