Reorganization

Moved material around as per email; removed division into subsections;
archived old file as main-oct17th.