Add feature structuring elements; start reformat of old Marccup type classes