some more Table restructuring, made it moveable