Moving awareness to a proper service and component.