Another bunch of re-orgs, plus work on offworld behaviours and smuggling.  I am really terrible about splitting up my commits.