Cleanup DI & reduce required declaration of every resource owner
Merge pull request #492 from stloyd/feature/di_cleanup

[PoC] Reduce required declaration of every resource owner