More changes towards getting Zenject to be more distributable