Move around imports to avoid setup.py import issues.