Structure change.
Partly deals with #1 (closed) and #2 (closed). This is still WIP, but should be merged to allow concurrent development.
Partly deals with #1 (closed) and #2 (closed). This is still WIP, but should be merged to allow concurrent development.