c++: rename classes file for consistensy
ruby: fix id bug with Sharks
ruby: Why do I have all that code repetition in the subclasses?

I'm talking about the place of the orgs in the map
Maybe there was a reason, and I don't remember it.. :P
c++: major cleaning of code towards new stadards