While waiting on SWADE, I'm working on separating the Rifts data from the SFC (creating Rifts specific versions of the components such as cyberware, robot vehicles, power armor, etc...).
The SWADE version I will hopefully have completely separate from the start. However, for the regular SW, it may mean rebuilding characters.