moved struct back to original header files