Many thanks for the clarification and discussion of the structure of your code base.