Moved struct from C file to H