Move DI to separate solution
Make try to make DI workable