Moved alternative structs to Substitutes namespace.