Adjust imports in files