Move some things around

Made an attempt to start cleaning up burner
still too many statements per line in places
started to make additional .h files so it's not all just thrown in one
place. May or may not have been a good idea.