Move subtarget dependent features into the subtarget from the target