Move tables to separate file