Moved lumps structs into Lumps.h