Here's an easy one to start with...

We have a situation similar to this:
FeatureA
--Component1
--Component2
--Component3
FeatureB
--Component4
--Component5
--Component6
and we have changed our installer (InstallScript MSI Project) to this:
FeatureA
--FeatureC
----Component1
--FeatureD
----Component2
--Component3
FeatureB
--Component4
--Component5
--Component6
We have had to add multiple new features and move previously existing components into them.
How do I go about authoring an upgrade for this ? I've tried the simple stuff (setting the REINSTALLMODE, REINSTALL & ADDLOCAL properties) but this doesn't work