re-orging some yt player code, no functionality changes