Tweaked the structure.

And made it just officers again. I have to rethink this. Basing it on
Aurora for now.