definitely not, I would leave it as is... rather a disjoint schema than broken system.... need to understand that this is a truely massive system in terms of interaction.... whilst somethings should be general in principle it is a simple matter of shear workload to get to that point in practice because of the amount of code involved.... and frankly the name of the core is way down the list of priorities!