Allow library to be specified using an env variable
Add helper function to raise exception
Combine files
Removed unused import
Renamed file