One more reorganization in ./schema.

schema/data/data-aiMain.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd"/>
+  <xs:include schemaLocation="../spec/spec-model.xsd"/>
   <xs:include schemaLocation="data-goods.xsd"/>
 
   <xs:element name="aiMain">

schema/data/data-building.xsd

@@ -23,8 +23,8 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
-  <xs:include schemaLocation="../common/spec-common.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-common.xsd" />
   <xs:include schemaLocation="data-unit.xsd" />
 
   <xs:element name="building">

schema/data/data-colony.xsd

@@ -23,8 +23,8 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
-  <xs:include schemaLocation="../common/spec-common.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-common.xsd" />
   <xs:include schemaLocation="data-colonyTile.xsd" />
   <xs:include schemaLocation="data-building.xsd" />
   <xs:include schemaLocation="data-goodsContainer.xsd" />

schema/data/data-colonyTile.xsd

@@ -23,8 +23,8 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
-  <xs:include schemaLocation="../common/spec-common.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-common.xsd" />
   <xs:include schemaLocation="data-unit.xsd" />
 
   <xs:element name="colonyTile">

schema/data/data-equipment.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd"/>
+  <xs:include schemaLocation="../spec/spec-model.xsd"/>
 
   <xs:element name="equipment">
     <xs:annotation>

schema/data/data-europe.xsd

@@ -22,8 +22,8 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
-  <xs:include schemaLocation="../common/spec-common.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-common.xsd" />
   <xs:include schemaLocation="data-unit.xsd" />
 
   <xs:element name="europe">

schema/data/data-exportData.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
 
   <xs:element name="exportData">
     <xs:complexType>

schema/data/data-game.xsd

@@ -23,7 +23,7 @@
   </xs:annotation>
 
 
-  <xs:include schemaLocation="data-specification.xsd" />
+  <xs:include schemaLocation="../spec/spec.xsd" />
   
   <xs:include schemaLocation="data-nationOptions.xsd" />
   <xs:include schemaLocation="data-player.xsd" />

schema/data/data-goods.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd"/>
+  <xs:include schemaLocation="../spec/spec-model.xsd"/>
 
   <xs:element name="goods">
     <xs:complexType>

schema/data/data-goodsContainer.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd"/>
+  <xs:include schemaLocation="../spec/spec-model.xsd"/>
   <xs:include schemaLocation="data-goods.xsd" />
 
   <xs:element name="goodsContainer">

schema/data/data-historyEvent.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
   <xs:include schemaLocation="data-stringTemplate.xsd" />
 
   <xs:element name="historyEvent">

schema/data/data-indianSettlement.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
   <xs:include schemaLocation="data-unit.xsd" />
 
   <xs:element name="indianSettlement">

schema/data/data-lostCityRumour.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
 
   <xs:element name="lostCityRumour">
     <xs:annotation>

schema/data/data-map.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd"/>
+  <xs:include schemaLocation="../spec/spec-model.xsd"/>
   <xs:include schemaLocation="data-common.xsd" />
   <xs:include schemaLocation="data-region.xsd" />
   <xs:include schemaLocation="data-tile.xsd"/>

schema/data/data-market.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
 
   <xs:element name="market">
     <xs:complexType>

schema/data/data-modelMessage.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
 
   <xs:element name="modelMessage">
     <xs:annotation>

schema/data/data-monarch.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
   <xs:include schemaLocation="data-unit.xsd" />
 
   <xs:element name="monarch">

schema/data/data-nationOptions.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
 
   <xs:element name="nationOptions">
     <xs:annotation>

schema/data/data-player.xsd

@@ -22,8 +22,8 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
-  <xs:include schemaLocation="../common/spec-common.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-common.xsd" />
   <xs:include schemaLocation="data-historyEvent.xsd" />
   <xs:include schemaLocation="data-unit.xsd" />
   <xs:include schemaLocation="data-market.xsd" />

schema/data/data-playerExploredTile.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
   <xs:include schemaLocation="data-unit.xsd" />
   <xs:include schemaLocation="data-resource.xsd" />
 

schema/data/data-region.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
 
   <xs:element name="region">
     <xs:annotation>

schema/data/data-resource.xsd

@@ -22,7 +22,7 @@
  		</xs:documentation>
 	</xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
 
   <xs:element name="resource">
     <xs:annotation>

schema/data/data-serverObjects.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
 
   <xs:element name="serverObjects">
     <xs:annotation>

schema/data/data-stringTemplate.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
 
   <xs:element name="stringTemplate" type="StringTemplateType">
     <xs:annotation>

schema/data/data-template.xsd

@@ -22,6 +22,6 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
 
 </xs:schema>

schema/data/data-tile.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
   <xs:include schemaLocation="data-colony.xsd" />
   <xs:include schemaLocation="data-indianSettlement.xsd" />
   <xs:include schemaLocation="data-tileitemcontainer.xsd" />

schema/data/data-tileimprovement.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd"/>
+  <xs:include schemaLocation="../spec/spec-model.xsd"/>
 
   <!-- @compat 0.11.3 -->
   <xs:simpleType name="tileimprovementId">

schema/data/data-tileitemcontainer.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
   <xs:include schemaLocation="data-resource.xsd" />
   <xs:include schemaLocation="data-tileimprovement.xsd" />
   <xs:include schemaLocation="data-lostCityRumour.xsd" />

schema/data/data-tradeRoute.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
+  <xs:include schemaLocation="../spec/spec-model.xsd" />
 
   <xs:element name="tradeRoute">
     <xs:complexType>

schema/data/data-unit.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd"/>
+  <xs:include schemaLocation="../spec/spec-model.xsd"/>
   <xs:include schemaLocation="data-goodsContainer.xsd"/>
   <xs:include schemaLocation="data-equipment.xsd"/>
   <xs:include schemaLocation="data-tileimprovement.xsd"/>

schema/data/data.xsd

@@ -22,7 +22,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="data-specification.xsd" />
+  <xs:include schemaLocation="../spec/spec.xsd" />
 
   <xs:include schemaLocation="data-building.xsd" />
   <xs:include schemaLocation="data-colony.xsd" />

schema/spec/spec.xsd

@@ -114,25 +114,25 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:include schemaLocation="../common/spec-model.xsd" />
-  <xs:include schemaLocation="../common/spec-building-types.xsd"/>
-  <xs:include schemaLocation="../common/spec-disasters.xsd"/>
+  <xs:include schemaLocation="spec-model.xsd" />
+  <xs:include schemaLocation="spec-building-types.xsd"/>
+  <xs:include schemaLocation="spec-disasters.xsd"/>
   <!-- @compat 0.10.x -->
-  <xs:include schemaLocation="../common/spec-equipment-types.xsd"/>
+  <xs:include schemaLocation="spec-equipment-types.xsd"/>
   <!-- end @compat 0.10.x -->
-  <xs:include schemaLocation="../common/spec-events.xsd"/>
-  <xs:include schemaLocation="../common/spec-founding-fathers.xsd"/>
-  <xs:include schemaLocation="../common/spec-goods-types.xsd"/>
-  <xs:include schemaLocation="../common/spec-modifiers.xsd"/>
-  <xs:include schemaLocation="../common/spec-nations.xsd"/>
-  <xs:include schemaLocation="../common/spec-options.xsd"/>
-  <xs:include schemaLocation="../common/spec-resource-types.xsd"/>
-  <xs:include schemaLocation="../common/spec-roles.xsd"/>
-  <xs:include schemaLocation="../common/spec-tile-improvement.xsd"/>
-  <xs:include schemaLocation="../common/spec-tile-types.xsd"/>
-  <xs:include schemaLocation="../common/spec-unit-change-types.xsd"/>
-  <xs:include schemaLocation="../common/spec-unit-types.xsd"/>
-  <xs:include schemaLocation="../common/spec-common.xsd"/>
+  <xs:include schemaLocation="spec-events.xsd"/>
+  <xs:include schemaLocation="spec-founding-fathers.xsd"/>
+  <xs:include schemaLocation="spec-goods-types.xsd"/>
+  <xs:include schemaLocation="spec-modifiers.xsd"/>
+  <xs:include schemaLocation="spec-nations.xsd"/>
+  <xs:include schemaLocation="spec-options.xsd"/>
+  <xs:include schemaLocation="spec-resource-types.xsd"/>
+  <xs:include schemaLocation="spec-roles.xsd"/>
+  <xs:include schemaLocation="spec-tile-improvement.xsd"/>
+  <xs:include schemaLocation="spec-tile-types.xsd"/>
+  <xs:include schemaLocation="spec-unit-change-types.xsd"/>
+  <xs:include schemaLocation="spec-unit-types.xsd"/>
+  <xs:include schemaLocation="spec-common.xsd"/>
 
   <xs:element name="freecol-specification">
     <xs:complexType>

schema/specification-schema.xsd

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-  <xs:include schemaLocation="data/data-specification.xsd"/>
+  <xs:include schemaLocation="spec/spec.xsd"/>
 </xs:schema>