added tables, redefine table file structure