Initial updates to convert to Spark / Composer Package.