By sgl: move file in own group
By sgl: prepare for feature-migration
By sgl: adding more code feature-migration