Moved the rest of the defs to correct headers

Hopefully will make it easer to ecapsulate and clean up burner.