Ninject handling improved by using separate classes with required configuration; some code clean-up