Make various architecture improvements and modernizations
This is the parent ticket for further architecture improvements and modernization of the CollecTor code-base.
This is the parent ticket for further architecture improvements and modernization of the CollecTor code-base.