right this is a huge update, loads of moving stuff around, deleting and
reordering, hopefully for a good cause. We'll see.
See last commit. Another large batch of changes (this time mainly new
files or moved files)