Detypedefing part I
finished removing typedefs and will rework table