MusicPlayer + Buffer

A bunch of renames, and some added music class stuff and junk.