Document improvement and file rearrangement

Moved some files around and changed some document/preamble logic and
setup.