Minor changes. Re-order structures.
Update interfaces into emacs output.