Re-arrange and cleanup of import stuff.