Move abstract classes to helper to prepare for CreateBundle integration