Clean-Up, NuGet Updates and StructureMap API changes