old_contents: from .features import Giraffe_Feature_Base
  from .features import Aligned_Feature
  
new_contents: from .features import Giraffe_Feature_Base
  from .features import Aligned_Feature
  from .features import Feature_Type_Choices
  
subject: Move Feature_Type_Choices to toplevel name sapce