Reorganized Player Module