Updates, file relocations, prep for packaging.
Packaging WIP.