Consolidating Ninject modules, even more simplifications