Consolidate trait Attribute and case class RawAttribute

there appears to be no need to separate the two