[SPARK-4409] Organized imports