added service registration & decoupled w/ storage entry; refactored service registry;