Add a few extra details and move some files.
Merge branch 'master' into MNF