Test branch
Dependency injection
Deleted not used files
Fat merge
Fat merge