Clean up a lot of import path issues.