Rearrangement

Too many changes to mention