Moved struct definition to header file