further refactorings to allow uri resource locations throughout the app