Complete Service component refactor.