slight reorg.  Need to set it up so that I can have a YouTube type with the path/name/version functions.
More cleanup and stuff.