begin refactoring for tests
move player to world to make it easier to test without building all the scene stuff