Changed structure to incorporate gamecomponent architecture