Rework dependency injection approach, slightly update unit tests
Remove redundant readme file