@kettch: Unfortunately no.  Part of the rework involves a lot of reorg as well.  The reorg is in the reverse direction.  The solution projects were too granular and now the overall solution is being simplified, name spacing reworked, and made into saas.