Move two structs to the original files. Not needed elsewhere.