Spark-915 segregate scripts