Added fluent and autofac contrib and did a lot of organization changes