Add better errors gem

Also moved around a couple gems