- Changed name of common-structs to common-defs
 for the addition of condition to it.