Move features to features-parent