General improvements to handling media content.  Added ability to config...

...ure where media lives.