Fixed Provider dir and added ContainerProviderFactory