Changes to make it smaller size for zenject sample
Refactoring/clean up in preparation for distribution