Restructuring hsSyn