Moved struct and default struct data into .c file