Structring role/profile better
Various and sundry restructuring

A few minor updates based on conventions used in nepho-iam, removed some
cruft, some tweaks -- nothing too important.