Prep work for holiday development push

Minor structural/organizational changes and lots of comments in
preparation for (hopefully) coding during the coming holidays.