Branching for flat multi-module fixes

[Deng Ching]

Hi All,

I'm working on some of the issues dealing with flat multi-module structures
in Continuum (CONTINUUM-1569, 2193). I'll be creating a separate branch for
this since the changes are getting pretty big.

Thanks,
Deng