Move metadata classes under their own MetaData namespace