converted Discipline to embedded; moved all Tables to table package