rename All type_trait helper to And; move property_hierarchy module definition into separate file