rearranged files and fixed jf.tr.table