adapted the files for an independent library