moved some files around, added uri helper