Moved out some structs to common