Fixed makefile and struct def for randomly generating structs