Renamed some folders. There is only one SPARK.
Some work updating the samples to SPARK 2014.