To be clear, I don't think anything should be pulled out. Likely needs a lot of re-working and thought given to clean up the dependency graph such that you hav

To be clear, I don't think anything should be pulled out. Likely needs a lot of re-working and thought given to clean up the dependency graph such that you have primarily abstract interfaces across logical boundaries. Edit: Here's an example, anything along the lines of "clean domain-driven design" will hopefully be enlightening. https://hackernoon.com/clean-domain-driven-design-in-10-minutes-6037a59c8b7b https://hackernoon.com/clean-domain-driven-design-in-10-minu... Best wishes and good luck!