Module structure and import cleanups

Trying to make things more approachable for readers of the codebase