added PlayerTest, reorganized package structure