Major refactor, reduce DI duplicate between each instances.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1'