I think having a separate repository for messages would definitely help here. Having the interface (messages) separate from the behavior (nodes) tends to be a good pattern for loosely coupled architectures.
2 Likes