Tried to merge the player into a single file, I'll work on it when I'll have more time