fully re-worked the system to move it to spring framework.
This significantly improved dependency management from the different components.