- Changed util.h naming to something more unique, changed includes