Rejigged spark source directory structure

It matches the other libraries now