Began decoupling global tableStructure and tables