Updated file structure, changed library naming, and removed reliance on @bko's Spark Time library