Rearrange file and package per convention.

WIP - Please review but do not merge.

My recommendation for review:

``make documentation`` and point your browser to localhost:6060 to review.