how to merge 2 modules into 1?

[Brocha Strous]

Hello,
I would like to merge 2 different modules into a single module but
without loosing any of the history on the individual files/modules and
without loosing tags/branches - is there a way to do this? (either
client or server side)
Ideally I would like to add a "parent directory" and make each of the
modules a subdirectory in there.

Thanks,
Brocha