Minor style changes
URIDict to _utils, fixed naming, package test