Rename main library files
Remove non-Spark includes