set Key class' visibility back to package scope
rename DaoImpl file
remove UriUtil class
clean up some comments