Reorganization to clarify dependencies

I'm in favor of hard line breaks with conceptual groups on a single line, so that it's easier to merge multiple changes to the same file that touch the imports.