I find it best to create the new architecture from scratch including the new B4XPages modules, without much regard for the original design. Once the bones are in place and you begin to flesh out the functionality, you can look for opportunities to adapt the old subs to fit into the new architecture.
It's like moving from an old house to a new one. The new one will have a completely different floor plan, perhaps more rooms or fewer rooms, maybe two floors instead of one, perhaps one has a garage but not a back deck, and the other was the reverse. If you try to move the content from the old home to the new one in the same configuration, it will just be a mess. Instead, you adapt your existing furniture to fit the new architecture, and maybe throw out some pieces and add some new ones.