Fix project infrastructure for resolve dependency injection problem.