Fixed path to data images

svn path=/trunk/; revision=2514

8 files changed, 268 insertions, 268 deletions

diff --git a/boards/geography_country/board1_0.xml.in b/boards/geography_country/board1_0.xml.in
index b0cdc0d..ac0e41d 100644
--- a/boards/geography_country/board1_0.xml.in
+++ b/boards/geography_country/board1_0.xml.in
@@ -5,71 +5,71 @@
          <_name>Regions of France</_name>
     </Title>
 
-<Shape name="A" pixmapfile="geography/france_region/alsace.png" sound="sounds/$LOCALE/geography/france_region/alsace.ogg" x="585" y="149" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="A" pixmapfile="geography_country/france_region/alsace.png" sound="sounds/$LOCALE/geography_country/france_region/alsace.ogg" x="585" y="149" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Alsace</tooltip>
 </Shape>
-<Shape name="B" pixmapfile="geography/france_region/aquitaine.png" sound="sounds/$LOCALE/geography/france_region/aquitaine.ogg" x="317" y="371" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="B" pixmapfile="geography_country/france_region/aquitaine.png" sound="sounds/$LOCALE/geography_country/france_region/aquitaine.ogg" x="317" y="371" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Aquitaine</tooltip>
 </Shape>
-<Shape name="C" pixmapfile="geography/france_region/auvergne.png" sound="sounds/$LOCALE/geography/france_region/auvergne.ogg" x="443" y="293" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="C" pixmapfile="geography_country/france_region/auvergne.png" sound="sounds/$LOCALE/geography_country/france_region/auvergne.ogg" x="443" y="293" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Auvergne</tooltip>
 </Shape>
-<Shape name="D" pixmapfile="geography/france_region/basse-normandie.png" sound="sounds/$LOCALE/geography/france_region/basse-normandie.ogg" x="315" y="115" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="D" pixmapfile="geography_country/france_region/basse-normandie.png" sound="sounds/$LOCALE/geography_country/france_region/basse-normandie.ogg" x="315" y="115" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Basse Normandie</tooltip>
 </Shape>
-<Shape name="E" pixmapfile="geography/france_region/bourgogne.png" sound="sounds/$LOCALE/geography/france_region/bourgogne.ogg" x="473" y="207" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="E" pixmapfile="geography_country/france_region/bourgogne.png" sound="sounds/$LOCALE/geography_country/france_region/bourgogne.ogg" x="473" y="207" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Bourgogne</tooltip>
 </Shape>
-<Shape name="F" pixmapfile="geography/france_region/bretagne.png" sound="sounds/$LOCALE/geography/france_region/bretagne.ogg" x="226" y="158" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="F" pixmapfile="geography_country/france_region/bretagne.png" sound="sounds/$LOCALE/geography_country/france_region/bretagne.ogg" x="226" y="158" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Bretagne</tooltip>
 </Shape>
-<Shape name="G" pixmapfile="geography/france_region/centre.png" sound="sounds/$LOCALE/geography/france_region/centre.ogg" x="383" y="188" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="G" pixmapfile="geography_country/france_region/centre.png" sound="sounds/$LOCALE/geography_country/france_region/centre.ogg" x="383" y="188" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Centre</tooltip>
 </Shape>
-<Shape name="H" pixmapfile="geography/france_region/champagne-ardenne.png" sound="sounds/$LOCALE/geography/france_region/champagne-ardenne.ogg" x="487" y="120" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="H" pixmapfile="geography_country/france_region/champagne-ardenne.png" sound="sounds/$LOCALE/geography_country/france_region/champagne-ardenne.ogg" x="487" y="120" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Champagne Ardenne</tooltip>
 </Shape>
-<Shape name="I" pixmapfile="geography/france_region/corse.png" sound="sounds/$LOCALE/geography/france_region/corse.ogg" x="662" y="472" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="I" pixmapfile="geography_country/france_region/corse.png" sound="sounds/$LOCALE/geography_country/france_region/corse.ogg" x="662" y="472" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Corse</tooltip>
 </Shape>
-<Shape name="J" pixmapfile="geography/france_region/franche-conte.png" sound="sounds/$LOCALE/geography/france_region/franche-conte.ogg" x="542" y="212" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="J" pixmapfile="geography_country/france_region/franche-conte.png" sound="sounds/$LOCALE/geography_country/france_region/franche-conte.ogg" x="542" y="212" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Franche Comté</tooltip>
 </Shape>
-<Shape name="K" pixmapfile="geography/france_region/haute-normandie.png" sound="sounds/$LOCALE/geography/france_region/haute-normandie.ogg" x="363" y="95" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="K" pixmapfile="geography_country/france_region/haute-normandie.png" sound="sounds/$LOCALE/geography_country/france_region/haute-normandie.ogg" x="363" y="95" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Normandie</tooltip>
 </Shape>
-<Shape name="L" pixmapfile="geography/france_region/ile-de-france.png" sound="sounds/$LOCALE/geography/france_region/ile-de-france.ogg" x="415" y="132" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="L" pixmapfile="geography_country/france_region/ile-de-france.png" sound="sounds/$LOCALE/geography_country/france_region/ile-de-france.ogg" x="415" y="132" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Ile de France</tooltip>
 </Shape>
-<Shape name="M" pixmapfile="geography/france_region/languedoc-roussillon.png" sound="sounds/$LOCALE/geography/france_region/languedoc-roussillon.ogg" x="443" y="404" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="M" pixmapfile="geography_country/france_region/languedoc-roussillon.png" sound="sounds/$LOCALE/geography_country/france_region/languedoc-roussillon.ogg" x="443" y="404" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Languedoc Roussillon</tooltip>
 </Shape>
-<Shape name="N" pixmapfile="geography/france_region/limousin.png" sound="sounds/$LOCALE/geography/france_region/limousin.ogg" x="384" y="294" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="N" pixmapfile="geography_country/france_region/limousin.png" sound="sounds/$LOCALE/geography_country/france_region/limousin.ogg" x="384" y="294" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Limousin</tooltip>
 </Shape>
-<Shape name="O" pixmapfile="geography/france_region/lorraine.png" sound="sounds/$LOCALE/geography/france_region/lorraine.ogg" x="540" y="127" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="O" pixmapfile="geography_country/france_region/lorraine.png" sound="sounds/$LOCALE/geography_country/france_region/lorraine.ogg" x="540" y="127" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Lorraine</tooltip>
 </Shape>
-<Shape name="P" pixmapfile="geography/france_region/midi-pyrenees.png" sound="sounds/$LOCALE/geography/france_region/midi-pyrenees.ogg" x="380" y="396" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="P" pixmapfile="geography_country/france_region/midi-pyrenees.png" sound="sounds/$LOCALE/geography_country/france_region/midi-pyrenees.ogg" x="380" y="396" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Midi Pyrénées</tooltip>
 </Shape>
-<Shape name="Q" pixmapfile="geography/france_region/nord-pas-de-calais.png" sound="sounds/$LOCALE/geography/france_region/nord-pas-de-calais.ogg" x="427" y="33" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="Q" pixmapfile="geography_country/france_region/nord-pas-de-calais.png" sound="sounds/$LOCALE/geography_country/france_region/nord-pas-de-calais.ogg" x="427" y="33" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Nord Pas de Calais</tooltip>
 </Shape>
-<Shape name="R" pixmapfile="geography/france_region/pays-de-la-loire.png" sound="sounds/$LOCALE/geography/france_region/pays-de-la-loire.ogg" x="300" y="199" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="R" pixmapfile="geography_country/france_region/pays-de-la-loire.png" sound="sounds/$LOCALE/geography_country/france_region/pays-de-la-loire.ogg" x="300" y="199" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Pays de la Loire</tooltip>
 </Shape>
-<Shape name="S" pixmapfile="geography/france_region/picardie.png" sound="sounds/$LOCALE/geography/france_region/picardie.ogg" x="424" y="83" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="S" pixmapfile="geography_country/france_region/picardie.png" sound="sounds/$LOCALE/geography_country/france_region/picardie.ogg" x="424" y="83" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Picardie</tooltip>
 </Shape>
-<Shape name="T" pixmapfile="geography/france_region/poitou-charentes.png" sound="sounds/$LOCALE/geography/france_region/poitou-charentes.ogg" x="321" y="269" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="T" pixmapfile="geography_country/france_region/poitou-charentes.png" sound="sounds/$LOCALE/geography_country/france_region/poitou-charentes.ogg" x="321" y="269" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Poitou Charentes</tooltip>
 </Shape>
-<Shape name="U" pixmapfile="geography/france_region/provence-alpes-cote_d_azur.png" sound="sounds/$LOCALE/geography/france_region/provence-alpes-cote_d_azur.ogg" x="543" y="379" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="U" pixmapfile="geography_country/france_region/provence-alpes-cote_d_azur.png" sound="sounds/$LOCALE/geography_country/france_region/provence-alpes-cote_d_azur.ogg" x="543" y="379" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Provence Alpes Côte d'Azur</tooltip>
 </Shape>
-<Shape name="V" pixmapfile="geography/france_region/rhone-alpes.png" sound="sounds/$LOCALE/geography/france_region/rhone-alpes.ogg" x="520" y="312" zoomx="0.660000" zoomy="0.660000" position="0">
+<Shape name="V" pixmapfile="geography_country/france_region/rhone-alpes.png" sound="sounds/$LOCALE/geography_country/france_region/rhone-alpes.ogg" x="520" y="312" zoomx="0.660000" zoomy="0.660000" position="0">
 	<tooltip>Rhône Alpes</tooltip>
 </Shape>
-<Shape name="1" pixmapfile="geography/france_region/france-regions.png" type="SHAPE_BACKGROUND" x="420" y="260" zoomx="0.660000" zoomy="0.660000" position="0"/>
+<Shape name="1" pixmapfile="geography_country/france_region/france-regions.png" type="SHAPE_BACKGROUND" x="420" y="260" zoomx="0.660000" zoomy="0.660000" position="0"/>
 </ShapeGame>
diff --git a/boards/geography_country/board2_0.xml.in b/boards/geography_country/board2_0.xml.in
index 28d566c..abf65a1 100644
--- a/boards/geography_country/board2_0.xml.in
+++ b/boards/geography_country/board2_0.xml.in
@@ -3,21 +3,21 @@
   <Title x="600" y="495" justification="GTK_JUSTIFY_CENTER">
     <_name>Deutschland Bundesländer</_name>
   </Title>
-  <Shape name="A1" pixmapfile="geography/germany_region/baden-wuerttemberg.png" targetfile="geography/germany_region/target_baden-wuerttemberg.png" x="240.5" y="422.5" zoomx="1" zoomy="1" position="0"><tooltip>Baden-Württemberg</tooltip></Shape>
-  <Shape name="A2" pixmapfile="geography/germany_region/bayern.png" targetfile="geography/germany_region/target_bayern.png" x="342" y="406.5" zoomx="1" zoomy="1" position="0"><tooltip>Bayern</tooltip></Shape>
-  <Shape name="A3" pixmapfile="geography/germany_region/berlin.png" targetfile="geography/germany_region/target_berlin.png" x="429" y="175.5" zoomx="1" zoomy="1" position="0"><tooltip>Berlin</tooltip></Shape>
-  <Shape name="A4" pixmapfile="geography/germany_region/brandenburg.png" targetfile="geography/germany_region/target_brandenburg.png" x="403" y="178" zoomx="1" zoomy="1" position="0"><tooltip>Brandenburg</tooltip></Shape>
-  <Shape name="A5" pixmapfile="geography/germany_region/bremen.png" targetfile="geography/germany_region/target_bremen.png" x="215.5" y="130.5" zoomx="1" zoomy="1" position="0"><tooltip>Bremen</tooltip></Shape>
-  <Shape name="A6" pixmapfile="geography/germany_region/hamburg.png" targetfile="geography/germany_region/target_hamburg.png" x="285" y="121.5" zoomx="1" zoomy="1" position="0"><tooltip>Hamburg</tooltip></Shape>
-  <Shape name="A7" pixmapfile="geography/germany_region/hessen.png" targetfile="geography/germany_region/target_hessen.png" x="242.5" y="303.5" zoomx="1" zoomy="1" position="0"><tooltip>Hessen</tooltip></Shape>
-  <Shape name="A8" pixmapfile="geography/germany_region/mecklenburg-vorpommern.png" targetfile="geography/germany_region/target_mecklenburg-vorpommern.png" x="379.5" y="91" zoomx="1" zoomy="1" position="0"><tooltip>Mecklenburg-Vorpommern</tooltip></Shape>
-  <Shape name="A9" pixmapfile="geography/germany_region/niedersachsen.png" targetfile="geography/germany_region/target_niedersachsen.png" x="248.5" y="151" zoomx="1" zoomy="1" position="0"><tooltip>Niedersachsen</tooltip></Shape>
-  <Shape name="A10" pixmapfile="geography/germany_region/nordrhein-westfalen.png" targetfile="geography/germany_region/target_nordrhein-westfalen.png" x="188.5" y="244.5" zoomx="1" zoomy="1" position="0"><tooltip>Nordrhein-Westfalen</tooltip></Shape>
-  <Shape name="A11" pixmapfile="geography/germany_region/rheinland-pfalz.png" targetfile="geography/germany_region/target_rheinland-pfalz.png" x="171" y="339" zoomx="1" zoomy="1" position="0"><tooltip>Rheinland-Pfalz</tooltip></Shape>
-  <Shape name="A12" pixmapfile="geography/germany_region/saarland.png" targetfile="geography/germany_region/target_saarland.png" x="152" y="377" zoomx="1" zoomy="1" position="0"><tooltip>Saarland</tooltip></Shape>
-  <Shape name="A13" pixmapfile="geography/germany_region/sachsen-anhalt.png" targetfile="geography/germany_region/target_sachsen-anhalt.png" x="358" y="211.5" zoomx="1" zoomy="1" position="0"><tooltip>Sachsen-Anhalt</tooltip></Shape>
-  <Shape name="A14" pixmapfile="geography/germany_region/sachsen.png" targetfile="geography/germany_region/target_sachsen.png" x="422" y="277" zoomx="1" zoomy="1" position="0"><tooltip>Sachsen</tooltip></Shape>
-  <Shape name="A15" pixmapfile="geography/germany_region/schleswig_holstein.png" targetfile="geography/germany_region/target_schleswig_holstein.png" x="274.5" y="72.5" zoomx="1" zoomy="1" position="0"><tooltip>Schleswig-Holstein</tooltip></Shape>
-  <Shape name="A16" pixmapfile="geography/germany_region/thueringen.png" targetfile="geography/germany_region/target_thueringen.png" x="333.5" y="277" zoomx="1" zoomy="1" position="0"><tooltip>Thüringen</tooltip></Shape>
-  <Shape name="1" pixmapfile="geography/germany_region/back.png" type="SHAPE_BACKGROUND" x="300" y="258.5" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="A1" pixmapfile="geography_country/germany_region/baden-wuerttemberg.png" targetfile="geography_country/germany_region/target_baden-wuerttemberg.png" x="240.5" y="422.5" zoomx="1" zoomy="1" position="0"><tooltip>Baden-Württemberg</tooltip></Shape>
+  <Shape name="A2" pixmapfile="geography_country/germany_region/bayern.png" targetfile="geography_country/germany_region/target_bayern.png" x="342" y="406.5" zoomx="1" zoomy="1" position="0"><tooltip>Bayern</tooltip></Shape>
+  <Shape name="A3" pixmapfile="geography_country/germany_region/berlin.png" targetfile="geography_country/germany_region/target_berlin.png" x="429" y="175.5" zoomx="1" zoomy="1" position="0"><tooltip>Berlin</tooltip></Shape>
+  <Shape name="A4" pixmapfile="geography_country/germany_region/brandenburg.png" targetfile="geography_country/germany_region/target_brandenburg.png" x="403" y="178" zoomx="1" zoomy="1" position="0"><tooltip>Brandenburg</tooltip></Shape>
+  <Shape name="A5" pixmapfile="geography_country/germany_region/bremen.png" targetfile="geography_country/germany_region/target_bremen.png" x="215.5" y="130.5" zoomx="1" zoomy="1" position="0"><tooltip>Bremen</tooltip></Shape>
+  <Shape name="A6" pixmapfile="geography_country/germany_region/hamburg.png" targetfile="geography_country/germany_region/target_hamburg.png" x="285" y="121.5" zoomx="1" zoomy="1" position="0"><tooltip>Hamburg</tooltip></Shape>
+  <Shape name="A7" pixmapfile="geography_country/germany_region/hessen.png" targetfile="geography_country/germany_region/target_hessen.png" x="242.5" y="303.5" zoomx="1" zoomy="1" position="0"><tooltip>Hessen</tooltip></Shape>
+  <Shape name="A8" pixmapfile="geography_country/germany_region/mecklenburg-vorpommern.png" targetfile="geography_country/germany_region/target_mecklenburg-vorpommern.png" x="379.5" y="91" zoomx="1" zoomy="1" position="0"><tooltip>Mecklenburg-Vorpommern</tooltip></Shape>
+  <Shape name="A9" pixmapfile="geography_country/germany_region/niedersachsen.png" targetfile="geography_country/germany_region/target_niedersachsen.png" x="248.5" y="151" zoomx="1" zoomy="1" position="0"><tooltip>Niedersachsen</tooltip></Shape>
+  <Shape name="A10" pixmapfile="geography_country/germany_region/nordrhein-westfalen.png" targetfile="geography_country/germany_region/target_nordrhein-westfalen.png" x="188.5" y="244.5" zoomx="1" zoomy="1" position="0"><tooltip>Nordrhein-Westfalen</tooltip></Shape>
+  <Shape name="A11" pixmapfile="geography_country/germany_region/rheinland-pfalz.png" targetfile="geography_country/germany_region/target_rheinland-pfalz.png" x="171" y="339" zoomx="1" zoomy="1" position="0"><tooltip>Rheinland-Pfalz</tooltip></Shape>
+  <Shape name="A12" pixmapfile="geography_country/germany_region/saarland.png" targetfile="geography_country/germany_region/target_saarland.png" x="152" y="377" zoomx="1" zoomy="1" position="0"><tooltip>Saarland</tooltip></Shape>
+  <Shape name="A13" pixmapfile="geography_country/germany_region/sachsen-anhalt.png" targetfile="geography_country/germany_region/target_sachsen-anhalt.png" x="358" y="211.5" zoomx="1" zoomy="1" position="0"><tooltip>Sachsen-Anhalt</tooltip></Shape>
+  <Shape name="A14" pixmapfile="geography_country/germany_region/sachsen.png" targetfile="geography_country/germany_region/target_sachsen.png" x="422" y="277" zoomx="1" zoomy="1" position="0"><tooltip>Sachsen</tooltip></Shape>
+  <Shape name="A15" pixmapfile="geography_country/germany_region/schleswig_holstein.png" targetfile="geography_country/germany_region/target_schleswig_holstein.png" x="274.5" y="72.5" zoomx="1" zoomy="1" position="0"><tooltip>Schleswig-Holstein</tooltip></Shape>
+  <Shape name="A16" pixmapfile="geography_country/germany_region/thueringen.png" targetfile="geography_country/germany_region/target_thueringen.png" x="333.5" y="277" zoomx="1" zoomy="1" position="0"><tooltip>Thüringen</tooltip></Shape>
+  <Shape name="1" pixmapfile="geography_country/germany_region/back.png" type="SHAPE_BACKGROUND" x="300" y="258.5" zoomx="1" zoomy="1" position="0"/>
 </ShapeGame>
diff --git a/boards/geography_country/board3_0.xml.in b/boards/geography_country/board3_0.xml.in
index 5646f2c..f777074 100644
--- a/boards/geography_country/board3_0.xml.in
+++ b/boards/geography_country/board3_0.xml.in
@@ -3,118 +3,118 @@
 <Title y="495" x="600" justification="GTK_JUSTIFY_CENTER">
       <name>Provincias Argentinas</name>
 </Title>        
-<Shape name="1" pixmapfile="geography/argentina/argentina.png" type="SHAPE_BACKGROUND"
+<Shape name="1" pixmapfile="geography_country/argentina/argentina.png" type="SHAPE_BACKGROUND"
 sound="Undefined" x="400,000000" y="270,000000" zoomx="1,000000" zoomy="1,000000" position="0"/>
-<Shape name="2" pixmapfile="geography/argentina/buenos_aires.png"
+<Shape name="2" pixmapfile="geography_country/argentina/buenos_aires.png"
 sound="Undefined" x="427,000000" y="244,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Buenos Aires</tooltip>
 </Shape>
-<Shape name="3" pixmapfile="geography/argentina/catamarca.png" 
+<Shape name="3" pixmapfile="geography_country/argentina/catamarca.png" 
 sound="Undefined" x="361,000000" y="137,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Catamarca</tooltip>
 </Shape>
 
-<Shape name="4" pixmapfile="geography/argentina/chaco.png"
+<Shape name="4" pixmapfile="geography_country/argentina/chaco.png"
 sound="Undefined" x="422,000000" y="121,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Chaco</tooltip>
 </Shape>
 
-<Shape name="5" pixmapfile="geography/argentina/chubut.png"
+<Shape name="5" pixmapfile="geography_country/argentina/chubut.png"
 sound="Undefined" x="361,000000" y="320,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Chubut</tooltip>
 </Shape>
 
-<Shape name="6" pixmapfile="geography/argentina/cordoba.png" 
+<Shape name="6" pixmapfile="geography_country/argentina/cordoba.png" 
 sound="Undefined" x="392,000000" y="189,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Cordoba</tooltip>
 </Shape>
 
-<Shape name="7" pixmapfile="geography/argentina/corrientes.png" 
+<Shape name="7" pixmapfile="geography_country/argentina/corrientes.png" 
 sound="Undefined" x="452,000000" y="153,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Corrientes</tooltip>
 </Shape>
 
-<Shape name="8" pixmapfile="geography/argentina/entre_rios.png" 
+<Shape name="8" pixmapfile="geography_country/argentina/entre_rios.png" 
 sound="Undefined" x="435,000000" y="188,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Entre Rios</tooltip>
 </Shape>
 
-<Shape name="9" pixmapfile="geography/argentina/formosa.png" 
+<Shape name="9" pixmapfile="geography_country/argentina/formosa.png" 
 sound="Undefined" x="431,000000" y="106,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Formosa</tooltip>
 </Shape>
 
-<Shape name="10" pixmapfile="geography/argentina/jujuy.png" 
+<Shape name="10" pixmapfile="geography_country/argentina/jujuy.png" 
 sound="Undefined" x="372,000000" y="88,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Jujuy</tooltip>
 </Shape>
 
-<Shape name="11" pixmapfile="geography/argentina/la_pampa.png" 
+<Shape name="11" pixmapfile="geography_country/argentina/la_pampa.png" 
 sound="Undefined" x="376,000000" y="243,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>La Pampa</tooltip>
 </Shape>
 
-<Shape name="12" pixmapfile="geography/argentina/la_rioja.png" 
+<Shape name="12" pixmapfile="geography_country/argentina/la_rioja.png" 
 sound="Undefined" x="357,000000" y="163,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>La Rioja</tooltip>
 </Shape>
 
-<Shape name="13" pixmapfile="geography/argentina/mendoza.png"
+<Shape name="13" pixmapfile="geography_country/argentina/mendoza.png"
 sound="Undefined" x="351,000000" y="218,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Mendoza</tooltip>
 </Shape>
 
-<Shape name="14" pixmapfile="geography/argentina/misiones.png" 
+<Shape name="14" pixmapfile="geography_country/argentina/misiones.png" 
 sound="Undefined" x="482,000000" y="132,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Misiones</tooltip>
 </Shape>
 
-<Shape name="15" pixmapfile="geography/argentina/neuquen.png" 
+<Shape name="15" pixmapfile="geography_country/argentina/neuquen.png" 
 sound="Undefined" x="341,000000" y="262,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Neuquen</tooltip>
 </Shape>
 
-<Shape name="16" pixmapfile="geography/argentina/rio_negro.png" 
+<Shape name="16" pixmapfile="geography_country/argentina/rio_negro.png" 
 sound="Undefined" x="365,000000" y="273,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Rio Negro</tooltip>
 </Shape>
 
-<Shape name="17" pixmapfile="geography/argentina/salta.png"
+<Shape name="17" pixmapfile="geography_country/argentina/salta.png"
 sound="Undefined" x="376,000000" y="100,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Salta</tooltip>
 </Shape>
 
-<Shape name="18" pixmapfile="geography/argentina/san_juan.png" 
+<Shape name="18" pixmapfile="geography_country/argentina/san_juan.png" 
 sound="Undefined" x="346,000000" y="171,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>San Juan</tooltip>
 </Shape>
 
-<Shape name="19" pixmapfile="geography/argentina/san_luis.png" 
+<Shape name="19" pixmapfile="geography_country/argentina/san_luis.png" 
 sound="Undefined" x="370,000000" y="208,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>San Luis</tooltip>
 </Shape>
 
-<Shape name="20" pixmapfile="geography/argentina/santa_cruz.png" 
+<Shape name="20" pixmapfile="geography_country/argentina/santa_cruz.png" 
 sound="Undefined" x="352,000000" y="378,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Santa Cruz</tooltip>
 </Shape>
 
-<Shape name="21" pixmapfile="geography/argentina/santa_fe.png" 
+<Shape name="21" pixmapfile="geography_country/argentina/santa_fe.png" 
 sound="Undefined" x="421,000000" y="177,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Santa Fe</tooltip>
 </Shape>
 
-<Shape name="22" pixmapfile="geography/argentina/santiago_del_estero.png" 
+<Shape name="22" pixmapfile="geography_country/argentina/santiago_del_estero.png" 
 sound="Undefined" x="396,000000" y="138,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Santiago del Estero</tooltip>
 </Shape>
 
-<Shape name="23" pixmapfile="geography/argentina/tierra_del_fuego.png" 
+<Shape name="23" pixmapfile="geography_country/argentina/tierra_del_fuego.png" 
 sound="Undefined" x="378,000000" y="433,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Tierra del Fuego</tooltip>
 </Shape>
 
-<Shape name="24" pixmapfile="geography/argentina/tucuman.png" 
+<Shape name="24" pixmapfile="geography_country/argentina/tucuman.png" 
 sound="Undefined" x="377,000000" y="132,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Tucuman</tooltip>
 </Shape>
diff --git a/boards/geography_country/board4_0.xml.in b/boards/geography_country/board4_0.xml.in
index 5c3f6e4..450f132 100644
--- a/boards/geography_country/board4_0.xml.in
+++ b/boards/geography_country/board4_0.xml.in
@@ -3,85 +3,85 @@
 <Title y="495" x="600" justification="GTK_JUSTIFY_CENTER">
       <name>Polish Voivodship</name>
 </Title>        
-<Shape name="1" pixmapfile="geography/poland_voivodship/poland.png" type="SHAPE_BACKGROUND"
+<Shape name="1" pixmapfile="geography_country/poland_voivodship/poland.png" type="SHAPE_BACKGROUND"
 sound="Undefined" x="400,000000" y="250,000000" zoomx="1,000000" zoomy="1,000000" position="0"/>
 
-<Shape name="2" pixmapfile="geography/poland_voivodship/kujawsko-pomorskie.png"
+<Shape name="2" pixmapfile="geography_country/poland_voivodship/kujawsko-pomorskie.png"
 sound="Undefined" x="363,000000" y="159,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Kujawsko-Pomorskie</tooltip>
 </Shape>
 
-<Shape name="3" pixmapfile="geography/poland_voivodship/lubelskie.png" 
+<Shape name="3" pixmapfile="geography_country/poland_voivodship/lubelskie.png" 
 sound="Undefined" x="584,000000" y="300,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Lubelskie</tooltip>
 </Shape>
 
-<Shape name="4" pixmapfile="geography/poland_voivodship/lubuskie.png"
+<Shape name="4" pixmapfile="geography_country/poland_voivodship/lubuskie.png"
 sound="Undefined" x="212,000000" y="220,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Lubuskie</tooltip>
 </Shape>
 
-<Shape name="5" pixmapfile="geography/poland_voivodship/lodzkie.png"
+<Shape name="5" pixmapfile="geography_country/poland_voivodship/lodzkie.png"
 sound="Undefined" x="406,000000" y="277,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Łódzkie</tooltip>
 </Shape>
 
-<Shape name="6" pixmapfile="geography/poland_voivodship/malopolskie.png" 
+<Shape name="6" pixmapfile="geography_country/poland_voivodship/malopolskie.png" 
 sound="Undefined" x="452,000000" y="422,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Małopolskie</tooltip>
 </Shape>
 
-<Shape name="7" pixmapfile="geography/poland_voivodship/mazowieckie.png" 
+<Shape name="7" pixmapfile="geography_country/poland_voivodship/mazowieckie.png" 
 sound="Undefined" x="496,000000" y="225,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Mazowieckie</tooltip>
 </Shape>
 
-<Shape name="8" pixmapfile="geography/poland_voivodship/opolskie.png" 
+<Shape name="8" pixmapfile="geography_country/poland_voivodship/opolskie.png" 
 sound="Undefined" x="325,000000" y="361,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Opolskie</tooltip>
 </Shape>
 
-<Shape name="9" pixmapfile="geography/poland_voivodship/podkarpackie.png" 
+<Shape name="9" pixmapfile="geography_country/poland_voivodship/podkarpackie.png" 
 sound="Undefined" x="559,000000" y="412,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Podkarpackie</tooltip>
 </Shape>
 
-<Shape name="10" pixmapfile="geography/poland_voivodship/podlaskie.png" 
+<Shape name="10" pixmapfile="geography_country/poland_voivodship/podlaskie.png" 
 sound="Undefined" x="571,000000" y="130,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Podlaskie</tooltip>
 </Shape>
 
-<Shape name="11" pixmapfile="geography/poland_voivodship/pomorskie.png" 
+<Shape name="11" pixmapfile="geography_country/poland_voivodship/pomorskie.png" 
 sound="Undefined" x="348,000000" y="66,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Pomorskie</tooltip>
 </Shape>
 
-<Shape name="12" pixmapfile="geography/poland_voivodship/slaskie.png" 
+<Shape name="12" pixmapfile="geography_country/poland_voivodship/slaskie.png" 
 sound="Undefined" x="385,000000" y="390,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Śląskie</tooltip>
 </Shape>
 
-<Shape name="13" pixmapfile="geography/poland_voivodship/swietokrzyskie.png"
+<Shape name="13" pixmapfile="geography_country/poland_voivodship/swietokrzyskie.png"
 sound="Undefined" x="478,000000" y="346,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Świętokrzyskie</tooltip>
 </Shape>
 
-<Shape name="14" pixmapfile="geography/poland_voivodship/warminsko-mazurskie.png" 
+<Shape name="14" pixmapfile="geography_country/poland_voivodship/warminsko-mazurskie.png" 
 sound="Undefined" x="480,000000" y="98,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Warmińsko-Mazurskie</tooltip>
 </Shape>
 
-<Shape name="15" pixmapfile="geography/poland_voivodship/wielkopolskie.png" 
+<Shape name="15" pixmapfile="geography_country/poland_voivodship/wielkopolskie.png" 
 sound="Undefined" x="310,000000" y="213,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Wielkopolskie</tooltip>
 </Shape>
 
-<Shape name="16" pixmapfile="geography/poland_voivodship/zachodnio-pomorskie.png" 
+<Shape name="16" pixmapfile="geography_country/poland_voivodship/zachodnio-pomorskie.png" 
 sound="Undefined" x="220,000000" y="109,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Zachodnio Pomorskie</tooltip>
 </Shape>
 
-<Shape name="16" pixmapfile="geography/poland_voivodship/dolnoslaskie.png" 
+<Shape name="16" pixmapfile="geography_country/poland_voivodship/dolnoslaskie.png" 
 sound="Undefined" x="251,000000" y="328,000000" zoomx="1,000000" zoomy="1,000000" position="0">
 <tooltip>Dolnośląskie</tooltip>
 </Shape>
diff --git a/boards/geography_country/board5_0.xml.in b/boards/geography_country/board5_0.xml.in
index a974c82..7b78882 100644
--- a/boards/geography_country/board5_0.xml.in
+++ b/boards/geography_country/board5_0.xml.in
@@ -6,198 +6,198 @@
 
 
 <Shape zoomy="1" zoomx="1" y="333" x="587" sound="adana.ogg" position="0"
-	 pixmapfile="geography/turkey_district/adana.png" name="adana">
+	 pixmapfile="geography_country/turkey_district/adana.png" name="adana">
 	 <tooltip>Adana</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="274" x="377" sound="afyon.ogg" position="0"
-	 pixmapfile="geography/turkey_district/afyon.png" name="afyon">
+	 pixmapfile="geography_country/turkey_district/afyon.png" name="afyon">
 	 <tooltip>Afyon</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="280" x="515" sound="aksaray.ogg" position="0"
-	 pixmapfile="geography/turkey_district/aksaray.png" name="aksaray">
+	 pixmapfile="geography_country/turkey_district/aksaray.png" name="aksaray">
 	 <tooltip>Aksaray</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="163" x="598" sound="amasya.ogg" position="0"
-	 pixmapfile="geography/turkey_district/amasya.png" name="amasya">
+	 pixmapfile="geography_country/turkey_district/amasya.png" name="amasya">
 	 <tooltip>Amasya</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="214" x="455" sound="ankara.ogg" position="0"
-	 pixmapfile="geography/turkey_district/ankara.png" name="ankara">
+	 pixmapfile="geography_country/turkey_district/ankara.png" name="ankara">
 	 <tooltip>Ankara</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="369" x="383" sound="antalya.ogg" position="0"
-	 pixmapfile="geography/turkey_district/antalya.png" name="antalya">
+	 pixmapfile="geography_country/turkey_district/antalya.png" name="antalya">
 	 <tooltip>Antalya</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="303" x="259" sound="aydin.ogg" position="0"
-	 pixmapfile="geography/turkey_district/aydin.png" name="aydin">
+	 pixmapfile="geography_country/turkey_district/aydin.png" name="aydin">
 	 <tooltip>Aydın</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="190" x="263" sound="balikesir.ogg" position="0"
-	 pixmapfile="geography/turkey_district/balikesir.png" name="balikesir">
+	 pixmapfile="geography_country/turkey_district/balikesir.png" name="balikesir">
 	 <tooltip>Balıkesir</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="109" x="466" sound="bartin.ogg" position="0"
-	 pixmapfile="geography/turkey_district/bartin.png" name="bartin">
+	 pixmapfile="geography_country/turkey_district/bartin.png" name="bartin">
 	 <tooltip>Bartın</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="186" x="362" sound="bilecik.ogg" position="0"
-	 pixmapfile="geography/turkey_district/bilecik.png" name="bilecik">
+	 pixmapfile="geography_country/turkey_district/bilecik.png" name="bilecik">
 	 <tooltip>Bilecik</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="159" x="420" sound="bolu.ogg" position="0"
-	 pixmapfile="geography/turkey_district/bolu.png" name="bolu">
+	 pixmapfile="geography_country/turkey_district/bolu.png" name="bolu">
 	 <tooltip>Bolu</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="331" x="349" sound="burdur.ogg" position="0"
-	 pixmapfile="geography/turkey_district/burdur.png" name="burdur">
+	 pixmapfile="geography_country/turkey_district/burdur.png" name="burdur">
 	 <tooltip>Burdur</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="184" x="320" sound="bursa.ogg" position="0"
-	 pixmapfile="geography/turkey_district/bursa.png" name="bursa">
+	 pixmapfile="geography_country/turkey_district/bursa.png" name="bursa">
 	 <tooltip>Bursa</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="170" x="216" sound="canakkale.ogg" position="0"
-	 pixmapfile="geography/turkey_district/canakkale.png" name="canakkale">
+	 pixmapfile="geography_country/turkey_district/canakkale.png" name="canakkale">
 	 <tooltip>Çanakkale</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="160" x="501" sound="cankiri.ogg" position="0"
-	 pixmapfile="geography/turkey_district/cankiri.png" name="cankiri">
+	 pixmapfile="geography_country/turkey_district/cankiri.png" name="cankiri">
 	 <tooltip>Çankırı</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="168" x="557" sound="corum.ogg" position="0"
-	 pixmapfile="geography/turkey_district/corum.png" name="corum">
+	 pixmapfile="geography_country/turkey_district/corum.png" name="corum">
 	 <tooltip>Çorum</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="312" x="317" sound="denizli.ogg" position="0"
-	 pixmapfile="geography/turkey_district/denizli.png" name="denizli">
+	 pixmapfile="geography_country/turkey_district/denizli.png" name="denizli">
 	 <tooltip>Denizli</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="143" x="408" sound="duzce.ogg" position="0"
-	 pixmapfile="geography/turkey_district/duzce.png" name="duzce">
+	 pixmapfile="geography_country/turkey_district/duzce.png" name="duzce">
 	 <tooltip>Düzce</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="105" x="222" sound="edirne.ogg" position="0"
-	 pixmapfile="geography/turkey_district/edirne.png" name="edirne">
+	 pixmapfile="geography_country/turkey_district/edirne.png" name="edirne">
 	 <tooltip>Edirne</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="213" x="399" sound="eskisehir.ogg" position="0"
-	 pixmapfile="geography/turkey_district/eskisehir.png" name="eskisehir">
+	 pixmapfile="geography_country/turkey_district/eskisehir.png" name="eskisehir">
 	 <tooltip>Eskişehir</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="391" x="624" sound="hatay.ogg" position="0"
-	 pixmapfile="geography/turkey_district/hatay.png" name="hatay">
+	 pixmapfile="geography_country/turkey_district/hatay.png" name="hatay">
 	 <tooltip>Hatay</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="306" x="381" sound="isparta.ogg" position="0"
-	 pixmapfile="geography/turkey_district/isparta.png" name="isparta">
+	 pixmapfile="geography_country/turkey_district/isparta.png" name="isparta">
 	 <tooltip>Isparta</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="126" x="318" sound="istanbul.ogg" position="0"
-	 pixmapfile="geography/turkey_district/istanbul.png" name="istanbul">
+	 pixmapfile="geography_country/turkey_district/istanbul.png" name="istanbul">
 	 <tooltip>İstanbul</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="254" x="238" sound="izmir.ogg" position="0"
-	 pixmapfile="geography/turkey_district/izmir.png" name="izmir">
+	 pixmapfile="geography_country/turkey_district/izmir.png" name="izmir">
 	 <tooltip>İzmir</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="138" x="464" sound="karabuk.ogg" position="0"
-	 pixmapfile="geography/turkey_district/karabuk.png" name="karabuk">
+	 pixmapfile="geography_country/turkey_district/karabuk.png" name="karabuk">
 	 <tooltip>Karabük</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="357" x="482" sound="karaman.ogg" position="0"
-	 pixmapfile="geography/turkey_district/karaman.png" name="karaman">
+	 pixmapfile="geography_country/turkey_district/karaman.png" name="karaman">
 	 <tooltip>Karaman</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="120" x="513" sound="kastamonu.ogg" position="0"
-	 pixmapfile="geography/turkey_district/kastamonu.png" name="kastamonu">
+	 pixmapfile="geography_country/turkey_district/kastamonu.png" name="kastamonu">
 	 <tooltip>Kastamonu</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="277" x="601" sound="kayseri.ogg" position="0"
-	 pixmapfile="geography/turkey_district/kayseri.png" name="kayseri">
+	 pixmapfile="geography_country/turkey_district/kayseri.png" name="kayseri">
 	 <tooltip>Kayseri</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="206" x="511" sound="kirikkale.ogg" position="0"
-	 pixmapfile="geography/turkey_district/kirikkale.png" name="kirikkale">
+	 pixmapfile="geography_country/turkey_district/kirikkale.png" name="kirikkale">
 	 <tooltip>Kırıkkale</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="92" x="262" sound="kirklareli.ogg" position="0"
-	 pixmapfile="geography/turkey_district/kirklareli.png" name="kirklareli">
+	 pixmapfile="geography_country/turkey_district/kirklareli.png" name="kirklareli">
 	 <tooltip>Kırklareli</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="233" x="527" sound="kirsehir.ogg" position="0"
-	 pixmapfile="geography/turkey_district/kirsehir.png" name="kirsehir">
+	 pixmapfile="geography_country/turkey_district/kirsehir.png" name="kirsehir">
 	 <tooltip>Kırşehir</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="142" x="355" sound="kocaeli.ogg" position="0"
-	 pixmapfile="geography/turkey_district/kocaeli.png" name="kocaeli">
+	 pixmapfile="geography_country/turkey_district/kocaeli.png" name="kocaeli">
 	 <tooltip>Kocaeli</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="307" x="470" sound="konya.ogg" position="0"
-	 pixmapfile="geography/turkey_district/konya.png" name="konya">
+	 pixmapfile="geography_country/turkey_district/konya.png" name="konya">
 	 <tooltip>Konya</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="226" x="332" sound="kutahya.ogg" position="0"
-	 pixmapfile="geography/turkey_district/kutahya.png" name="kutahya">
+	 pixmapfile="geography_country/turkey_district/kutahya.png" name="kutahya">
 	 <tooltip>Kütahya</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="251" x="271" sound="manisa.ogg" position="0"
-	 pixmapfile="geography/turkey_district/manisa.png" name="manisa">
+	 pixmapfile="geography_country/turkey_district/manisa.png" name="manisa">
 	 <tooltip>Manisa</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="375" x="512" sound="mersin.ogg" position="0"
-	 pixmapfile="geography/turkey_district/mersin.png" name="mersin">
+	 pixmapfile="geography_country/turkey_district/mersin.png" name="mersin">
 	 <tooltip>Mersin</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="351" x="276" sound="mugla.ogg" position="0"
-	 pixmapfile="geography/turkey_district/mugla.png" name="mugla">
+	 pixmapfile="geography_country/turkey_district/mugla.png" name="mugla">
 	 <tooltip>Muğla</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="260" x="550" sound="nevsehir.ogg" position="0"
-	 pixmapfile="geography/turkey_district/nevsehir.png" name="nevsehir">
+	 pixmapfile="geography_country/turkey_district/nevsehir.png" name="nevsehir">
 	 <tooltip>Nevşehir</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="314" x="550" sound="nigde.ogg" position="0"
-	 pixmapfile="geography/turkey_district/nigde.png" name="nigde">
+	 pixmapfile="geography_country/turkey_district/nigde.png" name="nigde">
 	 <tooltip>Niğde</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="335" x="621" sound="osmaniye.ogg" position="0"
-         pixmapfile="geography/turkey_district/osmaniye.png" name="osmaniye">
+         pixmapfile="geography_country/turkey_district/osmaniye.png" name="osmaniye">
 	 <tooltip>Osmaniye</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="151" x="378" sound="sakarya.ogg" position="0"
-	 pixmapfile="geography/turkey_district/sakarya.png" name="sakarya">
+	 pixmapfile="geography_country/turkey_district/sakarya.png" name="sakarya">
 	 <tooltip>Sakarya</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="128" x="609" sound="samsun.ogg" position="0"
-	 pixmapfile="geography/turkey_district/samsun.png" name="samsun">
+	 pixmapfile="geography_country/turkey_district/samsun.png" name="samsun">
 	 <tooltip>Samsun</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="109" x="564" sound="sinop.ogg" position="0"
-	 pixmapfile="geography/turkey_district/sinop.png" name="sinop">
+	 pixmapfile="geography_country/turkey_district/sinop.png" name="sinop">
 	 <tooltip>Sinop</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="125" x="257" sound="tekirdag.ogg" position="0"
-	 pixmapfile="geography/turkey_district/tekirdag.png" name="tekirdag">
+	 pixmapfile="geography_country/turkey_district/tekirdag.png" name="tekirdag">
 	 <tooltip>Tekirdağ</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="266" x="322" sound="usak.ogg" position="0"
-	 pixmapfile="geography/turkey_district/usak.png" name="usak">
+	 pixmapfile="geography_country/turkey_district/usak.png" name="usak">
 	 <tooltip>Uşak</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="158" x="320" sound="yalova.ogg" position="0"
-	 pixmapfile="geography/turkey_district/yalova.png" name="yalova">
+	 pixmapfile="geography_country/turkey_district/yalova.png" name="yalova">
 	 <tooltip>Yalova</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="220" x="570" sound="yozgat.ogg" position="0"
-	 pixmapfile="geography/turkey_district/yozgat.png" name="yozgat">
+	 pixmapfile="geography_country/turkey_district/yozgat.png" name="yozgat">
 	 <tooltip>Yozgat</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="123" x="436" sound="zonguldak.ogg" position="0"
-	 pixmapfile="geography/turkey_district/zonguldak.png" name="zonguldak">
+	 pixmapfile="geography_country/turkey_district/zonguldak.png" name="zonguldak">
 	 <tooltip>Zonguldak</tooltip>
 </Shape>
 
-<Shape zoomy="1" zoomx="1" y="260" x="420" type="SHAPE_BACKGROUND" sound="Undefined" position="0" pixmapfile="geography/turkey_district/turkey-west.png" name="1">
+<Shape zoomy="1" zoomx="1" y="260" x="420" type="SHAPE_BACKGROUND" sound="Undefined" position="0" pixmapfile="geography_country/turkey_district/turkey-west.png" name="1">
 </Shape>
 </ShapeGame>
diff --git a/boards/geography_country/board5_1.xml.in b/boards/geography_country/board5_1.xml.in
index 533a65e..94048df 100644
--- a/boards/geography_country/board5_1.xml.in
+++ b/boards/geography_country/board5_1.xml.in
@@ -6,146 +6,146 @@
 
 
 <Shape zoomy="1" zoomx="1" y="309" x="290" sound="adiyaman.ogg" position="0"
-	 pixmapfile="geography/turkey_district/adiyaman.png" name="adiyaman">
+	 pixmapfile="geography_country/turkey_district/adiyaman.png" name="adiyaman">
 	 <tooltip>Adıyaman</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="209" x="502" sound="agri.ogg" position="0"
-	 pixmapfile="geography/turkey_district/agri.png" name="agri">
+	 pixmapfile="geography_country/turkey_district/agri.png" name="agri">
 	 <tooltip>Ağrı</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="119" x="471" sound="ardahan.ogg" position="0"
-	 pixmapfile="geography/turkey_district/ardahan.png" name="ardahan">
+	 pixmapfile="geography_country/turkey_district/ardahan.png" name="ardahan">
 	 <tooltip>Ardahan</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="128" x="429" sound="artvin.ogg" position="0"
-	 pixmapfile="geography/turkey_district/artvin.png" name="artvin">
+	 pixmapfile="geography_country/turkey_district/artvin.png" name="artvin">
 	 <tooltip>Artvin</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="291" x="422" sound="batman.ogg" position="0"
-	 pixmapfile="geography/turkey_district/batman.png" name="batman">
+	 pixmapfile="geography_country/turkey_district/batman.png" name="batman">
 	 <tooltip>Batman</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="174" x="366" sound="bayburt.ogg" position="0"
-	 pixmapfile="geography/turkey_district/bayburt.png" name="bayburt">
+	 pixmapfile="geography_country/turkey_district/bayburt.png" name="bayburt">
 	 <tooltip>Bayburt</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="240" x="385" sound="bingol.ogg" position="0"
-	 pixmapfile="geography/turkey_district/bingol.png" name="bingol">
+	 pixmapfile="geography_country/turkey_district/bingol.png" name="bingol">
 	 <tooltip>Bingöl</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="262" x="461" sound="bitlis.ogg" position="0"
-	 pixmapfile="geography/turkey_district/bitlis.png" name="bitlis">
+	 pixmapfile="geography_country/turkey_district/bitlis.png" name="bitlis">
 	 <tooltip>Bitlis</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="290" x="372" sound="diyarbakir.ogg" position="0"
-	 pixmapfile="geography/turkey_district/diyarbakir.png" name="diyarbakir">
+	 pixmapfile="geography_country/turkey_district/diyarbakir.png" name="diyarbakir">
 	 <tooltip>Diyarbakır</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="256" x="331" sound="elazig.ogg" position="0"
-	 pixmapfile="geography/turkey_district/elazig.png" name="elazig">
+	 pixmapfile="geography_country/turkey_district/elazig.png" name="elazig">
 	 <tooltip>Elazığ</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="214" x="333" sound="erzincan.ogg" position="0"
-	 pixmapfile="geography/turkey_district/erzincan.png" name="erzincan">
+	 pixmapfile="geography_country/turkey_district/erzincan.png" name="erzincan">
 	 <tooltip>Erzincan</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="178" x="417" sound="erzurum.ogg" position="0"
-	 pixmapfile="geography/turkey_district/erzurum.png" name="erzurum">
+	 pixmapfile="geography_country/turkey_district/erzurum.png" name="erzurum">
 	 <tooltip>Erzurum</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="355" x="244" sound="gaziantep.ogg" position="0"
-	 pixmapfile="geography/turkey_district/gaziantep.png" name="gaziantep">
+	 pixmapfile="geography_country/turkey_district/gaziantep.png" name="gaziantep">
 	 <tooltip>Gaziantep</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="163" x="294" sound="giresun.ogg" position="0"
-	 pixmapfile="geography/turkey_district/giresun.png" name="giresun">
+	 pixmapfile="geography_country/turkey_district/giresun.png" name="giresun">
 	 <tooltip>Giresun</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="173" x="327" sound="gumushane.ogg" position="0"
-	 pixmapfile="geography/turkey_district/gumushane.png" name="gumushane">
+	 pixmapfile="geography_country/turkey_district/gumushane.png" name="gumushane">
 	 <tooltip>Gümüşhane</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="312" x="536" sound="hakkari.ogg" position="0"
-	 pixmapfile="geography/turkey_district/hakkari.png" name="hakkari">
+	 pixmapfile="geography_country/turkey_district/hakkari.png" name="hakkari">
 	 <tooltip>Hakkari</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="391" x="204" sound="hatay.ogg" position="0"
-	 pixmapfile="geography/turkey_district/hatay.png" name="hatay">
+	 pixmapfile="geography_country/turkey_district/hatay.png" name="hatay">
 	 <tooltip>Hatay</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="181" x="525" sound="igdir.ogg" position="0"
-	 pixmapfile="geography/turkey_district/igdir.png" name="igdir">
+	 pixmapfile="geography_country/turkey_district/igdir.png" name="igdir">
 	 <tooltip>Iğdır</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="307" x="231" sound="kahramanmaras.ogg" position="0"
-	 pixmapfile="geography/turkey_district/kahramanmaras.png" name="kahramanmaras">
+	 pixmapfile="geography_country/turkey_district/kahramanmaras.png" name="kahramanmaras">
 	 <tooltip>Kahramanmaraş</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="152" x="479" sound="kars.ogg" position="0"
-	 pixmapfile="geography/turkey_district/kars.png" name="kars">
+	 pixmapfile="geography_country/turkey_district/kars.png" name="kars">
 	 <tooltip>Kars</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="367" x="238" sound="kilis.ogg" position="0"
-	 pixmapfile="geography/turkey_district/kilis.png" name="kilis">
+	 pixmapfile="geography_country/turkey_district/kilis.png" name="kilis">
 	 <tooltip>Kilis</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="271" x="283" sound="malatya.ogg" position="0"
-	 pixmapfile="geography/turkey_district/malatya.png" name="malatya">
+	 pixmapfile="geography_country/turkey_district/malatya.png" name="malatya">
 	 <tooltip>Malatya</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="332" x="401" sound="mardin.ogg" position="0"
-	 pixmapfile="geography/turkey_district/mardin.png" name="mardin">
+	 pixmapfile="geography_country/turkey_district/mardin.png" name="mardin">
 	 <tooltip>Mardin</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="238" x="443" sound="mus.ogg" position="0"
-	 pixmapfile="geography/turkey_district/mus.png" name="mus">
+	 pixmapfile="geography_country/turkey_district/mus.png" name="mus">
 	 <tooltip>Muş</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="155" x="250" sound="ordu.ogg" position="0"
-	 pixmapfile="geography/turkey_district/ordu.png" name="ordu">
+	 pixmapfile="geography_country/turkey_district/ordu.png" name="ordu">
 	 <tooltip>Ordu</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="336" x="201" sound="osmaniye.ogg" position="0"
-	 pixmapfile="geography/turkey_district/osmaniye.png" name="osmaniye">
+	 pixmapfile="geography_country/turkey_district/osmaniye.png" name="osmaniye">
 	 <tooltip>Osmaniye</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="134" x="392" sound="rize.ogg" position="0"
-	 pixmapfile="geography/turkey_district/rize.png" name="rize">
+	 pixmapfile="geography_country/turkey_district/rize.png" name="rize">
 	 <tooltip>Rize</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="334" x="322" sound="sanliurfa.ogg" position="0"
-	 pixmapfile="geography/turkey_district/sanliurfa.png" name="sanliurfa">
+	 pixmapfile="geography_country/turkey_district/sanliurfa.png" name="sanliurfa">
 	 <tooltip>Şanlıurfa</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="298" x="455" sound="siirt.ogg" position="0"
-	 pixmapfile="geography/turkey_district/siirt.png" name="siirt">
+	 pixmapfile="geography_country/turkey_district/siirt.png" name="siirt">
 	 <tooltip>Siirt</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="323" x="468" sound="sirnak.ogg" position="0"
-	 pixmapfile="geography/turkey_district/sirnak.png" name="sirnak">
+	 pixmapfile="geography_country/turkey_district/sirnak.png" name="sirnak">
 	 <tooltip>Şırnak</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="223" x="240" sound="sivas.ogg" position="0"
-	 pixmapfile="geography/turkey_district/sivas.png" name="sivas">
+	 pixmapfile="geography_country/turkey_district/sivas.png" name="sivas">
 	 <tooltip>Sivas</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="177" x="214" sound="tokat.ogg" position="0"
-	 pixmapfile="geography/turkey_district/tokat.png" name="tokat">
+	 pixmapfile="geography_country/turkey_district/tokat.png" name="tokat">
 	 <tooltip>Tokat</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="147" x="349" sound="trabzon.ogg" position="0"
-	 pixmapfile="geography/turkey_district/trabzon.png" name="trabzon">
+	 pixmapfile="geography_country/turkey_district/trabzon.png" name="trabzon">
 	 <tooltip>Trabzon</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="234" x="340" sound="tunceli.ogg" position="0"
-	 pixmapfile="geography/turkey_district/tunceli.png" name="tunceli">
+	 pixmapfile="geography_country/turkey_district/tunceli.png" name="tunceli">
 	 <tooltip>Tunceli</tooltip>
 </Shape>
 <Shape zoomy="1" zoomx="1" y="257" x="515" sound="van.ogg" position="0"
-	 pixmapfile="geography/turkey_district/van.png" name="van">
+	 pixmapfile="geography_country/turkey_district/van.png" name="van">
 	 <tooltip>Van</tooltip>
 </Shape>
 
-<Shape zoomy="1" zoomx="1" y="260" x="375" type="SHAPE_BACKGROUND" sound="Undefined" position="0" pixmapfile="geography/turkey_district/turkey-east.png" name="1">
+<Shape zoomy="1" zoomx="1" y="260" x="375" type="SHAPE_BACKGROUND" sound="Undefined" position="0" pixmapfile="geography_country/turkey_district/turkey-east.png" name="1">
 </Shape>
 </ShapeGame>
diff --git a/boards/geography_country/board5_2.xml.in b/boards/geography_country/board5_2.xml.in
index c546eab..86b0a3e 100644
--- a/boards/geography_country/board5_2.xml.in
+++ b/boards/geography_country/board5_2.xml.in
@@ -5,331 +5,331 @@
     </Title>
 
 <Shape zoomy=".8" zoomx=".8" y="319" x="404" sound="adana.ogg" position="0"
-	 pixmapfile="geography/turkey_district/adana.png" name="adana">
+	 pixmapfile="geography_country/turkey_district/adana.png" name="adana">
 	 <tooltip>Adana</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="272" x="236" sound="afyon.ogg" position="0"
-	 pixmapfile="geography/turkey_district/afyon.png" name="afyon">
+	 pixmapfile="geography_country/turkey_district/afyon.png" name="afyon">
 	 <tooltip>Afyon</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="277" x="347" sound="aksaray.ogg" position="0"
-	 pixmapfile="geography/turkey_district/aksaray.png" name="aksaray">
+	 pixmapfile="geography_country/turkey_district/aksaray.png" name="aksaray">
 	 <tooltip>Aksaray</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="183" x="413" sound="amasya.ogg" position="0"
-	 pixmapfile="geography/turkey_district/amasya.png" name="amasya">
+	 pixmapfile="geography_country/turkey_district/amasya.png" name="amasya">
 	 <tooltip>Amasya</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="224" x="299" sound="ankara.ogg" position="0"
-	 pixmapfile="geography/turkey_district/ankara.png" name="ankara">
+	 pixmapfile="geography_country/turkey_district/ankara.png" name="ankara">
 	 <tooltip>Ankara</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="348" x="241" sound="antalya.ogg" position="0"
-	 pixmapfile="geography/turkey_district/antalya.png" name="antalya">
+	 pixmapfile="geography_country/turkey_district/antalya.png" name="antalya">
 	 <tooltip>Antalya</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="295" x="142" sound="aydin.ogg" position="0"
-	 pixmapfile="geography/turkey_district/aydin.png" name="aydin">
+	 pixmapfile="geography_country/turkey_district/aydin.png" name="aydin">
 	 <tooltip>Aydın</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="205" x="145" sound="balikesir.ogg" position="0"
-	 pixmapfile="geography/turkey_district/balikesir.png" name="balikesir">
+	 pixmapfile="geography_country/turkey_district/balikesir.png" name="balikesir">
 	 <tooltip>Balikesir</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="140" x="307" sound="bartin.ogg" position="0"
-	 pixmapfile="geography/turkey_district/bartin.png" name="bartin">
+	 pixmapfile="geography_country/turkey_district/bartin.png" name="bartin">
 	 <tooltip>Bartın</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="201" x="224" sound="bilecik.ogg" position="0"
-	 pixmapfile="geography/turkey_district/bilecik.png" name="bilecik">
+	 pixmapfile="geography_country/turkey_district/bilecik.png" name="bilecik">
 	 <tooltip>Bilecik</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="180" x="271" sound="bolu.ogg" position="0"
-	 pixmapfile="geography/turkey_district/bolu.png" name="bolu">
+	 pixmapfile="geography_country/turkey_district/bolu.png" name="bolu">
 	 <tooltip>Bolu</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="317" x="214" sound="burdur.ogg" position="0"
-	 pixmapfile="geography/turkey_district/burdur.png" name="burdur">
+	 pixmapfile="geography_country/turkey_district/burdur.png" name="burdur">
 	 <tooltip>Burdur</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="200" x="191" sound="bursa.ogg" position="0"
-	 pixmapfile="geography/turkey_district/bursa.png" name="bursa">
+	 pixmapfile="geography_country/turkey_district/bursa.png" name="bursa">
 	 <tooltip>Bursa</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="189" x="107" sound="canakkale.ogg" position="0"
-	 pixmapfile="geography/turkey_district/canakkale.png" name="canakkale">
+	 pixmapfile="geography_country/turkey_district/canakkale.png" name="canakkale">
 	 <tooltip>Çanakkale</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="181" x="335" sound="cankiri.ogg" position="0"
-	 pixmapfile="geography/turkey_district/cankiri.png" name="cankiri">
+	 pixmapfile="geography_country/turkey_district/cankiri.png" name="cankiri">
 	 <tooltip>Çankırı</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="187" x="380" sound="corum.ogg" position="0"
-	 pixmapfile="geography/turkey_district/corum.png" name="corum">
+	 pixmapfile="geography_country/turkey_district/corum.png" name="corum">
 	 <tooltip>Çorum</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="302" x="188" sound="denizli.ogg" position="0"
-	 pixmapfile="geography/turkey_district/denizli.png" name="denizli">
+	 pixmapfile="geography_country/turkey_district/denizli.png" name="denizli">
 	 <tooltip>Denizli</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="167" x="261" sound="duzce.ogg" position="0"
-	 pixmapfile="geography/turkey_district/duzce.png" name="duzce">
+	 pixmapfile="geography_country/turkey_district/duzce.png" name="duzce">
 	 <tooltip>Düzce</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="137" x="112" sound="edirne.ogg" position="0"
-	 pixmapfile="geography/turkey_district/edirne.png" name="edirne">
+	 pixmapfile="geography_country/turkey_district/edirne.png" name="edirne">
 	 <tooltip>Edirne</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="223" x="254" sound="eskisehir.ogg" position="0"
-	 pixmapfile="geography/turkey_district/eskisehir.png" name="eskisehir">
+	 pixmapfile="geography_country/turkey_district/eskisehir.png" name="eskisehir">
 	 <tooltip>Eskişehir</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="297" x="239" sound="isparta.ogg" position="0"
-	 pixmapfile="geography/turkey_district/isparta.png" name="isparta">
+	 pixmapfile="geography_country/turkey_district/isparta.png" name="isparta">
 	 <tooltip>Isparta</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="153" x="189" sound="istanbul.ogg" position="0"
-	 pixmapfile="geography/turkey_district/istanbul.png" name="istanbul">
+	 pixmapfile="geography_country/turkey_district/istanbul.png" name="istanbul">
 	 <tooltip>İstanbul</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="256" x="125" sound="izmir.ogg" position="0"
-	 pixmapfile="geography/turkey_district/izmir.png" name="izmir">
+	 pixmapfile="geography_country/turkey_district/izmir.png" name="izmir">
 	 <tooltip>İzmir</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="163" x="306" sound="karabuk.ogg" position="0"
-	 pixmapfile="geography/turkey_district/karabuk.png" name="karabuk">
+	 pixmapfile="geography_country/turkey_district/karabuk.png" name="karabuk">
 	 <tooltip>Karabuk</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="338" x="320" sound="karaman.ogg" position="0"
-	 pixmapfile="geography/turkey_district/karaman.png" name="karaman">
+	 pixmapfile="geography_country/turkey_district/karaman.png" name="karaman">
 	 <tooltip>Karaman</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="149" x="345" sound="kastamonu.ogg" position="0"
-	 pixmapfile="geography/turkey_district/kastamonu.png" name="kastamonu">
+	 pixmapfile="geography_country/turkey_district/kastamonu.png" name="kastamonu">
 	 <tooltip>Kastamonu</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="274" x="415" sound="kayseri.ogg" position="0"
-	 pixmapfile="geography/turkey_district/kayseri.png" name="kayseri">
+	 pixmapfile="geography_country/turkey_district/kayseri.png" name="kayseri">
 	 <tooltip>Kayseri</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="217" x="343" sound="kirikkale.ogg" position="0"
-	 pixmapfile="geography/turkey_district/kirikkale.png" name="kirikkale">
+	 pixmapfile="geography_country/turkey_district/kirikkale.png" name="kirikkale">
 	 <tooltip>Kırıkkale</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="126" x="144" sound="kirklareli.ogg" position="0"
-	 pixmapfile="geography/turkey_district/kirklareli.png" name="kirklareli">
+	 pixmapfile="geography_country/turkey_district/kirklareli.png" name="kirklareli">
 	 <tooltip>Kırklareli</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="239" x="356" sound="kirsehir.ogg" position="0"
-	 pixmapfile="geography/turkey_district/kirsehir.png" name="kirsehir">
+	 pixmapfile="geography_country/turkey_district/kirsehir.png" name="kirsehir">
 	 <tooltip>Kırşehir</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="166" x="219" sound="kocaeli.ogg" position="0"
-	 pixmapfile="geography/turkey_district/kocaeli.png" name="kocaeli">
+	 pixmapfile="geography_country/turkey_district/kocaeli.png" name="kocaeli">
 	 <tooltip>Kocaeli</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="298" x="311" sound="konya.ogg" position="0"
-	 pixmapfile="geography/turkey_district/konya.png" name="konya">
+	 pixmapfile="geography_country/turkey_district/konya.png" name="konya">
 	 <tooltip>Konya</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="233" x="200" sound="kutahya.ogg" position="0"
-	 pixmapfile="geography/turkey_district/kutahya.png" name="kutahya">
+	 pixmapfile="geography_country/turkey_district/kutahya.png" name="kutahya">
 	 <tooltip>Kütahya</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="253" x="151" sound="manisa.ogg" position="0"
-	 pixmapfile="geography/turkey_district/manisa.png" name="manisa">
+	 pixmapfile="geography_country/turkey_district/manisa.png" name="manisa">
 	 <tooltip>Manisa</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="353" x="344" sound="mersin.ogg" position="0"
-	 pixmapfile="geography/turkey_district/mersin.png" name="mersin">
+	 pixmapfile="geography_country/turkey_district/mersin.png" name="mersin">
 	 <tooltip>Mersin</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="333" x="155" sound="mugla.ogg" position="0"
-	 pixmapfile="geography/turkey_district/mugla.png" name="mugla">
+	 pixmapfile="geography_country/turkey_district/mugla.png" name="mugla">
 	 <tooltip>Muğla</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="261" x="375" sound="nevsehir.ogg" position="0"
-	 pixmapfile="geography/turkey_district/nevsehir.png" name="nevsehir">
+	 pixmapfile="geography_country/turkey_district/nevsehir.png" name="nevsehir">
 	 <tooltip>Nevşehir</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="304" x="375" sound="nigde.ogg" position="0"
-	 pixmapfile="geography/turkey_district/nigde.png" name="nigde">
+	 pixmapfile="geography_country/turkey_district/nigde.png" name="nigde">
 	 <tooltip>Niğde</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="321" x="431" sound="osmaniye.ogg" position="0"
-	 pixmapfile="geography/turkey_district/osmaniye.png" name="osmaniye">
+	 pixmapfile="geography_country/turkey_district/osmaniye.png" name="osmaniye">
 	 <tooltip>Osmaniye</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="173" x="237" sound="sakarya.ogg" position="0"
-	 pixmapfile="geography/turkey_district/sakarya.png" name="sakarya">
+	 pixmapfile="geography_country/turkey_district/sakarya.png" name="sakarya">
 	 <tooltip>Sakarya</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="155" x="422" sound="samsun.ogg" position="0"
-	 pixmapfile="geography/turkey_district/samsun.png" name="samsun">
+	 pixmapfile="geography_country/turkey_district/samsun.png" name="samsun">
 	 <tooltip>Samsun</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="140" x="386" sound="sinop.ogg" position="0"
-	 pixmapfile="geography/turkey_district/sinop.png" name="sinop">
+	 pixmapfile="geography_country/turkey_district/sinop.png" name="sinop">
 	 <tooltip>Sinop</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="153" x="140" sound="tekirdag.ogg" position="0"
-	 pixmapfile="geography/turkey_district/tekirdag.png" name="tekirdag">
+	 pixmapfile="geography_country/turkey_district/tekirdag.png" name="tekirdag">
 	 <tooltip>Tekirdağ</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="265" x="192" sound="usak.ogg" position="0"
-	 pixmapfile="geography/turkey_district/usak.png" name="usak">
+	 pixmapfile="geography_country/turkey_district/usak.png" name="usak">
 	 <tooltip>Uşak</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="179" x="191" sound="yalova.ogg" position="0"
-	 pixmapfile="geography/turkey_district/yalova.png" name="yalova">
+	 pixmapfile="geography_country/turkey_district/yalova.png" name="yalova">
 	 <tooltip>Yalova</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="229" x="391" sound="yozgat.ogg" position="0"
-	 pixmapfile="geography/turkey_district/yozgat.png" name="yozgat">
+	 pixmapfile="geography_country/turkey_district/yozgat.png" name="yozgat">
 	 <tooltip>Yozgat</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="151" x="283" sound="zonguldak.ogg" position="0"
-	 pixmapfile="geography/turkey_district/zonguldak.png" name="zonguldak">
+	 pixmapfile="geography_country/turkey_district/zonguldak.png" name="zonguldak">
 	 <tooltip>Zonguldak</tooltip>
 </Shape>
 
 <Shape zoomy=".8" zoomx=".8" y="300" x="504" sound="adiyaman.ogg" position="0"
-	 pixmapfile="geography/turkey_district/adiyaman.png" name="adiyaman">
+	 pixmapfile="geography_country/turkey_district/adiyaman.png" name="adiyaman">
 	 <tooltip>Adıyaman</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="220" x="673" sound="agri.ogg" position="0"
-	 pixmapfile="geography/turkey_district/agri.png" name="agri">
+	 pixmapfile="geography_country/turkey_district/agri.png" name="agri">
 	 <tooltip>Ağrı</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="148" x="648" sound="ardahan.ogg" position="0"
-	 pixmapfile="geography/turkey_district/ardahan.png" name="ardahan">
+	 pixmapfile="geography_country/turkey_district/ardahan.png" name="ardahan">
 	 <tooltip>Ardahan</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="155" x="615" sound="artvin.ogg" position="0"
-	 pixmapfile="geography/turkey_district/artvin.png" name="artvin">
+	 pixmapfile="geography_country/turkey_district/artvin.png" name="artvin">
 	 <tooltip>Artvin</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="285" x="609" sound="batman.ogg" position="0"
-	 pixmapfile="geography/turkey_district/batman.png" name="batman">
+	 pixmapfile="geography_country/turkey_district/batman.png" name="batman">
 	 <tooltip>Batman</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="192" x="564" sound="bayburt.ogg" position="0"
-	 pixmapfile="geography/turkey_district/bayburt.png" name="bayburt">
+	 pixmapfile="geography_country/turkey_district/bayburt.png" name="bayburt">
 	 <tooltip>Bayburt</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="245" x="580" sound="bingol.ogg" position="0"
-	 pixmapfile="geography/turkey_district/bingol.png" name="bingol">
+	 pixmapfile="geography_country/turkey_district/bingol.png" name="bingol">
 	 <tooltip>Bingöl</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="262" x="640" sound="bitlis.ogg" position="0"
-	 pixmapfile="geography/turkey_district/bitlis.png" name="bitlis">
+	 pixmapfile="geography_country/turkey_district/bitlis.png" name="bitlis">
 	 <tooltip>Bitlis</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="285" x="569" sound="diyarbakir.ogg" position="0"
-	 pixmapfile="geography/turkey_district/diyarbakir.png" name="diyarbakir">
+	 pixmapfile="geography_country/turkey_district/diyarbakir.png" name="diyarbakir">
 	 <tooltip>Diyarbakır</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="257" x="536" sound="elazig.ogg" position="0"
-	 pixmapfile="geography/turkey_district/elazig.png" name="elazig">
+	 pixmapfile="geography_country/turkey_district/elazig.png" name="elazig">
 	 <tooltip>Elazığ</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="224" x="538" sound="erzincan.ogg" position="0"
-	 pixmapfile="geography/turkey_district/erzincan.png" name="erzincan">
+	 pixmapfile="geography_country/turkey_district/erzincan.png" name="erzincan">
 	 <tooltip>Erzincan</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="195" x="605" sound="erzurum.ogg" position="0"
-	 pixmapfile="geography/turkey_district/erzurum.png" name="erzurum">
+	 pixmapfile="geography_country/turkey_district/erzurum.png" name="erzurum">
 	 <tooltip>Erzurum</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="337" x="467" sound="gaziantep.ogg" position="0"
-	 pixmapfile="geography/turkey_district/gaziantep.png" name="gaziantep">
+	 pixmapfile="geography_country/turkey_district/gaziantep.png" name="gaziantep">
 	 <tooltip>Gaziantep</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="183" x="507" sound="giresun.ogg" position="0"
-	 pixmapfile="geography/turkey_district/giresun.png" name="giresun">
+	 pixmapfile="geography_country/turkey_district/giresun.png" name="giresun">
 	 <tooltip>Giresun</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="191" x="533" sound="gumushane.ogg" position="0"
-	 pixmapfile="geography/turkey_district/gumushane.png" name="gumushane">
+	 pixmapfile="geography_country/turkey_district/gumushane.png" name="gumushane">
 	 <tooltip>gümüşhane</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="302" x="700" sound="hakkari.ogg" position="0"
-	 pixmapfile="geography/turkey_district/hakkari.png" name="hakkari">
+	 pixmapfile="geography_country/turkey_district/hakkari.png" name="hakkari">
 	 <tooltip>Hakkari</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="365" x="435" sound="hatay.ogg" position="0"
-	 pixmapfile="geography/turkey_district/hatay.png" name="hatay">
+	 pixmapfile="geography_country/turkey_district/hatay.png" name="hatay">
 	 <tooltip>Hatay</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="197" x="692" sound="igdir.ogg" position="0"
-	 pixmapfile="geography/turkey_district/igdir.png" name="igdir">
+	 pixmapfile="geography_country/turkey_district/igdir.png" name="igdir">
 	 <tooltip>Iğdır</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="298" x="456" sound="kahramanmaras.ogg" position="0"
-	 pixmapfile="geography/turkey_district/kahramanmaras.png" name="kahramanmaras">
+	 pixmapfile="geography_country/turkey_district/kahramanmaras.png" name="kahramanmaras">
 	 <tooltip>Kahramanmaraş</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="174" x="655" sound="kars.ogg" position="0"
-	 pixmapfile="geography/turkey_district/kars.png" name="kars">
+	 pixmapfile="geography_country/turkey_district/kars.png" name="kars">
 	 <tooltip>Kars</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="346" x="462" sound="kilis.ogg" position="0"
-	 pixmapfile="geography/turkey_district/kilis.png" name="kilis">
+	 pixmapfile="geography_country/turkey_district/kilis.png" name="kilis">
 	 <tooltip>Kilis</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="269" x="498" sound="malatya.ogg" position="0"
-	 pixmapfile="geography/turkey_district/malatya.png" name="malatya">
+	 pixmapfile="geography_country/turkey_district/malatya.png" name="malatya">
 	 <tooltip>Malatya</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="318" x="592" sound="mardin.ogg" position="0"
-	 pixmapfile="geography/turkey_district/mardin.png" name="mardin">
+	 pixmapfile="geography_country/turkey_district/mardin.png" name="mardin">
 	 <tooltip>Mardin</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="243" x="626" sound="mus.ogg" position="0"
-	 pixmapfile="geography/turkey_district/mus.png" name="mus">
+	 pixmapfile="geography_country/turkey_district/mus.png" name="mus">
 	 <tooltip>Muş</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="177" x="472" sound="ordu.ogg" position="0"
-	 pixmapfile="geography/turkey_district/ordu.png" name="ordu">
+	 pixmapfile="geography_country/turkey_district/ordu.png" name="ordu">
 	 <tooltip>Ordu</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="160" x="585" sound="rize.ogg" position="0"
-	 pixmapfile="geography/turkey_district/rize.png" name="rize">
+	 pixmapfile="geography_country/turkey_district/rize.png" name="rize">
 	 <tooltip>Rize</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="320" x="529" sound="sanliurfa.ogg" position="0"
-	 pixmapfile="geography/turkey_district/sanliurfa.png" name="sanliurfa">
+	 pixmapfile="geography_country/turkey_district/sanliurfa.png" name="sanliurfa">
 	 <tooltip>Şanlıurfa</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="291" x="636" sound="siirt.ogg" position="0"
-	 pixmapfile="geography/turkey_district/siirt.png" name="siirt">
+	 pixmapfile="geography_country/turkey_district/siirt.png" name="siirt">
 	 <tooltip>Siirt</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="311" x="646" sound="sirnak.ogg" position="0"
-	 pixmapfile="geography/turkey_district/sirnak.png" name="sirnak">
+	 pixmapfile="geography_country/turkey_district/sirnak.png" name="sirnak">
 	 <tooltip>Şırnak</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="231" x="464" sound="sivas.ogg" position="0"
-	 pixmapfile="geography/turkey_district/sivas.png" name="sivas">
+	 pixmapfile="geography_country/turkey_district/sivas.png" name="sivas">
 	 <tooltip>Sivas</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="194" x="443" sound="tokat.ogg" position="0"
-	 pixmapfile="geography/turkey_district/tokat.png" name="tokat">
+	 pixmapfile="geography_country/turkey_district/tokat.png" name="tokat">
 	 <tooltip>Tokat</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="170" x="551" sound="trabzon.ogg" position="0"
-	 pixmapfile="geography/turkey_district/trabzon.png" name="trabzon">
+	 pixmapfile="geography_country/turkey_district/trabzon.png" name="trabzon">
 	 <tooltip>Trabzon</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="240" x="544" sound="tunceli.ogg" position="0"
-	 pixmapfile="geography/turkey_district/tunceli.png" name="tunceli">
+	 pixmapfile="geography_country/turkey_district/tunceli.png" name="tunceli">
 	 <tooltip>Tunceli</tooltip>
 </Shape>
 <Shape zoomy=".8" zoomx=".8" y="258" x="684" sound="van.ogg" position="0"
-	 pixmapfile="geography/turkey_district/van.png" name="van">
+	 pixmapfile="geography_country/turkey_district/van.png" name="van">
 	 <tooltip>Van</tooltip>
 </Shape>
 
-<Shape zoomy=".8" zoomx=".8" y="260" x="400" type="SHAPE_BACKGROUND" sound="Undefined" position="0" pixmapfile="geography/turkey_district/turkey.png" name="1">
+<Shape zoomy=".8" zoomx=".8" y="260" x="400" type="SHAPE_BACKGROUND" sound="Undefined" position="0" pixmapfile="geography_country/turkey_district/turkey.png" name="1">
 </Shape>
 </ShapeGame>
diff --git a/boards/geography_country/board6_0.xml.in b/boards/geography_country/board6_0.xml.in
index a9676f9..2f8a2c9 100644
--- a/boards/geography_country/board6_0.xml.in
+++ b/boards/geography_country/board6_0.xml.in
@@ -3,24 +3,24 @@
   <Title x="600" y="495" justification="GTK_JUSTIFY_CENTER">
     <_name>Counties of Norway</_name>
   </Title>
-  <Shape name="A1" pixmapfile="geography/norway_counties/akershus.png" targetfile="geography/norway_counties/target_akershus.png" x="232,5" y="408,5" zoomx="1" zoomy="1" position="0"><tooltip>Akershus</tooltip></Shape>
-  <Shape name="A2" pixmapfile="geography/norway_counties/hedmark.png" targetfile="geography/norway_counties/target_hedmark.png" x="236,5" y="368,5" zoomx="1" zoomy="1" position="0"><tooltip>Hedmark</tooltip></Shape>
-  <Shape name="A3" pixmapfile="geography/norway_counties/nord-trondelag.png" targetfile="geography/norway_counties/target_nord-trondelag.png" x="254" y="274,5" zoomx="1" zoomy="1" position="0"><tooltip>Nord-Trøndelag</tooltip></Shape>
-  <Shape name="A4" pixmapfile="geography/norway_counties/rogaland.png" targetfile="geography/norway_counties/target_rogaland.png" x="147" y="433.5" zoomx="1" zoomy="1" position="0"><tooltip>Rogaland</tooltip></Shape>
-  <Shape name="A5" pixmapfile="geography/norway_counties/troms.png" targetfile="geography/norway_counties/target_troms.png" x="346,5" y="100,5" zoomx="1" zoomy="1" position="0"><tooltip>Troms</tooltip></Shape>
-  <Shape name="A6" pixmapfile="geography/norway_counties/aust-agder.png" targetfile="geography/norway_counties/target_aust-agder.png" x="177" y="440,5" zoomx="1" zoomy="1" position="0"><tooltip>Aust-Agder</tooltip></Shape>
-  <Shape name="A7" pixmapfile="geography/norway_counties/hordaland.png" targetfile="geography/norway_counties/target_hordaland.png" x="154" y="392.5" zoomx="1" zoomy="1" position="0"><tooltip>Hordaland</tooltip></Shape>
-  <Shape name="A8" pixmapfile="geography/norway_counties/oppland.png" targetfile="geography/norway_counties/target_oppland.png" x="204,5" y="366.5" zoomx="1" zoomy="1" position="0"><tooltip>Oppland</tooltip></Shape>
-  <Shape name="A9" pixmapfile="geography/norway_counties/sogn-og-fjordane.png" targetfile="geography/norway_counties/target_sogn-og-fjordane.png" x="162" y="355.5" zoomx="1" zoomy="1" position="0"><tooltip>Sogn og Fjordane</tooltip></Shape>
-  <Shape name="A10" pixmapfile="geography/norway_counties/vest-agder.png" targetfile="geography/norway_counties/target_vest-agder.png" x="162" y="450,5" zoomx="1" zoomy="1" position="0"><tooltip>Vest-Agder</tooltip></Shape>
-  <Shape name="A11" pixmapfile="geography/norway_counties/buskerud.png" targetfile="geography/norway_counties/target_buskerud.png" x="197" y="399,5" zoomx="1" zoomy="1" position="0"><tooltip>Buskerud</tooltip></Shape>
-  <Shape name="A12" pixmapfile="geography/norway_counties/more-og-romsdal.png" targetfile="geography/norway_counties/target_more-og-romsdal.png" x="181" y="315.5" zoomx="1" zoomy="1" position="0"><tooltip>Møre og Romsdal</tooltip></Shape>
-  <Shape name="A13" pixmapfile="geography/norway_counties/oslo.png" targetfile="geography/norway_counties/target_oslo.png" x="226" y="418.5" zoomx="1" zoomy="1" position="0"><tooltip>Oslo</tooltip></Shape>
-  <Shape name="A14" pixmapfile="geography/norway_counties/sor-trondelag.png" targetfile="geography/norway_counties/target_sor-trondelag.png" x="224,5" y="300,5" zoomx="1" zoomy="1" position="0"><tooltip>Sør-Trøndelag</tooltip></Shape>
-  <Shape name="A15" pixmapfile="geography/norway_counties/vestfold.png" targetfile="geography/norway_counties/target_vestfold.png" x="214" y="430.5" zoomx="1" zoomy="1" position="0"><tooltip>Vestfold</tooltip></Shape>
-  <Shape name="A16" pixmapfile="geography/norway_counties/finnmark.png" targetfile="geography/norway_counties/target_finnmark.png" x="426,5" y="75.5" zoomx="1" zoomy="1" position="0"><tooltip>Finnmark</tooltip></Shape>
-  <Shape name="A17" pixmapfile="geography/norway_counties/nordland.png" targetfile="geography/norway_counties/target_nordland.png" x="294" y="175.5" zoomx="1" zoomy="1" position="0"><tooltip>Nordland</tooltip></Shape>
-  <Shape name="A18" pixmapfile="geography/norway_counties/ostfold.png" targetfile="geography/norway_counties/target_ostfold.png" x="232,5" y="435,5" zoomx="1" zoomy="1" position="0"><tooltip>Østfold</tooltip></Shape>
-  <Shape name="A19" pixmapfile="geography/norway_counties/telemark.png" targetfile="geography/norway_counties/target_telemark.png" x="186" y="424,5" zoomx="1" zoomy="1" position="0"><tooltip>Telemark</tooltip></Shape>
-  <Shape name="1" pixmapfile="geography/norway_counties/norway.png" type="SHAPE_BACKGROUND" x="307" y="249.5" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="A1" pixmapfile="geography_country/norway_counties/akershus.png" targetfile="geography_country/norway_counties/target_akershus.png" x="232,5" y="408,5" zoomx="1" zoomy="1" position="0"><tooltip>Akershus</tooltip></Shape>
+  <Shape name="A2" pixmapfile="geography_country/norway_counties/hedmark.png" targetfile="geography_country/norway_counties/target_hedmark.png" x="236,5" y="368,5" zoomx="1" zoomy="1" position="0"><tooltip>Hedmark</tooltip></Shape>
+  <Shape name="A3" pixmapfile="geography_country/norway_counties/nord-trondelag.png" targetfile="geography_country/norway_counties/target_nord-trondelag.png" x="254" y="274,5" zoomx="1" zoomy="1" position="0"><tooltip>Nord-Trøndelag</tooltip></Shape>
+  <Shape name="A4" pixmapfile="geography_country/norway_counties/rogaland.png" targetfile="geography_country/norway_counties/target_rogaland.png" x="147" y="433.5" zoomx="1" zoomy="1" position="0"><tooltip>Rogaland</tooltip></Shape>
+  <Shape name="A5" pixmapfile="geography_country/norway_counties/troms.png" targetfile="geography_country/norway_counties/target_troms.png" x="346,5" y="100,5" zoomx="1" zoomy="1" position="0"><tooltip>Troms</tooltip></Shape>
+  <Shape name="A6" pixmapfile="geography_country/norway_counties/aust-agder.png" targetfile="geography_country/norway_counties/target_aust-agder.png" x="177" y="440,5" zoomx="1" zoomy="1" position="0"><tooltip>Aust-Agder</tooltip></Shape>
+  <Shape name="A7" pixmapfile="geography_country/norway_counties/hordaland.png" targetfile="geography_country/norway_counties/target_hordaland.png" x="154" y="392.5" zoomx="1" zoomy="1" position="0"><tooltip>Hordaland</tooltip></Shape>
+  <Shape name="A8" pixmapfile="geography_country/norway_counties/oppland.png" targetfile="geography_country/norway_counties/target_oppland.png" x="204,5" y="366.5" zoomx="1" zoomy="1" position="0"><tooltip>Oppland</tooltip></Shape>
+  <Shape name="A9" pixmapfile="geography_country/norway_counties/sogn-og-fjordane.png" targetfile="geography_country/norway_counties/target_sogn-og-fjordane.png" x="162" y="355.5" zoomx="1" zoomy="1" position="0"><tooltip>Sogn og Fjordane</tooltip></Shape>
+  <Shape name="A10" pixmapfile="geography_country/norway_counties/vest-agder.png" targetfile="geography_country/norway_counties/target_vest-agder.png" x="162" y="450,5" zoomx="1" zoomy="1" position="0"><tooltip>Vest-Agder</tooltip></Shape>
+  <Shape name="A11" pixmapfile="geography_country/norway_counties/buskerud.png" targetfile="geography_country/norway_counties/target_buskerud.png" x="197" y="399,5" zoomx="1" zoomy="1" position="0"><tooltip>Buskerud</tooltip></Shape>
+  <Shape name="A12" pixmapfile="geography_country/norway_counties/more-og-romsdal.png" targetfile="geography_country/norway_counties/target_more-og-romsdal.png" x="181" y="315.5" zoomx="1" zoomy="1" position="0"><tooltip>Møre og Romsdal</tooltip></Shape>
+  <Shape name="A13" pixmapfile="geography_country/norway_counties/oslo.png" targetfile="geography_country/norway_counties/target_oslo.png" x="226" y="418.5" zoomx="1" zoomy="1" position="0"><tooltip>Oslo</tooltip></Shape>
+  <Shape name="A14" pixmapfile="geography_country/norway_counties/sor-trondelag.png" targetfile="geography_country/norway_counties/target_sor-trondelag.png" x="224,5" y="300,5" zoomx="1" zoomy="1" position="0"><tooltip>Sør-Trøndelag</tooltip></Shape>
+  <Shape name="A15" pixmapfile="geography_country/norway_counties/vestfold.png" targetfile="geography_country/norway_counties/target_vestfold.png" x="214" y="430.5" zoomx="1" zoomy="1" position="0"><tooltip>Vestfold</tooltip></Shape>
+  <Shape name="A16" pixmapfile="geography_country/norway_counties/finnmark.png" targetfile="geography_country/norway_counties/target_finnmark.png" x="426,5" y="75.5" zoomx="1" zoomy="1" position="0"><tooltip>Finnmark</tooltip></Shape>
+  <Shape name="A17" pixmapfile="geography_country/norway_counties/nordland.png" targetfile="geography_country/norway_counties/target_nordland.png" x="294" y="175.5" zoomx="1" zoomy="1" position="0"><tooltip>Nordland</tooltip></Shape>
+  <Shape name="A18" pixmapfile="geography_country/norway_counties/ostfold.png" targetfile="geography_country/norway_counties/target_ostfold.png" x="232,5" y="435,5" zoomx="1" zoomy="1" position="0"><tooltip>Østfold</tooltip></Shape>
+  <Shape name="A19" pixmapfile="geography_country/norway_counties/telemark.png" targetfile="geography_country/norway_counties/target_telemark.png" x="186" y="424,5" zoomx="1" zoomy="1" position="0"><tooltip>Telemark</tooltip></Shape>
+  <Shape name="1" pixmapfile="geography_country/norway_counties/norway.png" type="SHAPE_BACKGROUND" x="307" y="249.5" zoomx="1" zoomy="1" position="0"/>
 </ShapeGame>