Added more classes to basic game struture