Merge pull request #146 from NimbusAPI/dependency-resolution-refactor

Dependency resolution refactor
Merge branch 'master' of github.com:NimbusAPI/Nimbus into remove-explicit-null-checks