Started refactor of Kafka stream design.