Removing Diff and Builder, modifying Media

Diff and Media have both been moved into the Resource data structure.
The use of Void has been removed as a result.  As this results in a big
change for Builder, it has been removed for now.