Changed to match Spark IDE library pattern

Files consolidated, renames, moved and updated to support the Spark
Core IDE format.