moved components into merge modules to allow them to be re-used across installers