Moved some files, fixed deadlock in ImageProvider and added basic Now Playing information to UI