Re-organizing some stuff.
Beginning of recent changes.
Preliminary version with git history complete.