Moved the struct declarations to a separate file, utils/types.h