Added Player and Scene. some refactoring.