further autofac modules refactorings