Refactoring ResourceManager and Player