Continue refactor of broker and activation flows
first migration done.