moving incomplete sample in a dedicated group
refactoring name continued...