Architecture

Reorganized sections.
Housekeeping