Move remaining methods inside the Attributes class. Merge the 'Attribute' namespaces.