chore: Change factory>service and pub/sub search