Move all providers to respective components