Consolidated Gameplay Classes

Did some additional fiddling. Got rid of my test classes.