Modified thief structure in gamecpp.
Merged complete.
Even more merging.