some refactoring, created ComponentsLocator and added PseudoCQRS