Moved some dependencies, all init now using Autofac