added second table, renamed some files