Ninject added and some  other changes