Refactor the PlayerModule and Player classes