Adapting to the Spark Lib structure.

See: https://github.com/spark/uber-library-example