restructuring of GamePlay and removed testingcode