Tv refactored

You may want to pull this second or just this one since it contains the first pull request as well.

I think I got all the references to Movie now; its now Media.

Maybe you should get someone who is familiar with cp to test it to make sure nothing is broken.

May be a good idea to study the diffs before merge?