[Api] Finalize first step of IoC wiring and appropriated refactoring