Reorganization to clarify dependencies

We're not consistent about whether Imports should all be on one line or split onto multiple ones.  I've been generally trying to separate them by group: basics, then types, then other.  But I don't have strong feelings, I'd be happy to follow any style convention we set out.