Moved gamestone code into subfolder to make new includes possible; fixed up code