Updated project to use the uri submodule; updated some code in order to handle the new changes.