LPS-49778 Simplify repository creation strategy and remove some redundant classes.