Moved all resource references into app-level resources, not DB entities.