Remove IService
Reorganize Interfaces project
Better whitespace for lambdas
Merge interfaces into ServiceLocator assembly