Revert "Working on implementing a more OO version of the SongPlayer to make it more testable."

This reverts commit de03860f1f8d79146c95f524b8cd72c143c5c7f9.