Minor Design: Metadata and Descriptor

[echavemann]

We have two pretty connected classes right now, being Metadata and DataDescriptor. They are not 100% redundant, but definitely could be simplified together to make the code more efficient.