Copy changes from v3 to v1 and v2

Created by: Protofall

This includes the extra_structs.h change and the sconstruct file (Plus eventual removal of the makefile)