Cleanup: Move all imports to top of module