Code refactoring to move Geographic Names and Centes lookup from org.eclipse.stem.data.geography plug-in to new org.eclipse.stem.geography plug-in.

git-svn-id: http://dev.eclipse.org/svnroot/technology/org.eclipse.stem/trunk@3590 92a21009-5b66-0410-b83a-dc787c41c6e9

89 files changed, 81 insertions, 167 deletions

diff --git a/analysis/org.eclipse.stem.util.analysis/META-INF/MANIFEST.MF b/analysis/org.eclipse.stem.util.analysis/META-INF/MANIFEST.MF
index f064a3277..76e0595d3 100644
--- a/analysis/org.eclipse.stem.util.analysis/META-INF/MANIFEST.MF
+++ b/analysis/org.eclipse.stem.util.analysis/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.birt.chart.engine;visibility:=reexport,
  org.eclipse.birt.core.ui,
  org.eclipse.stem.ui,
  org.eclipse.stem.definitions,
- org.eclipse.stem.data.geography,
+ org.eclipse.stem.geography,
  org.eclipse.stem.analysis
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.stem.util.analysis,
diff --git a/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/ScenarioParameterEstimator.java b/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/ScenarioParameterEstimator.java
index 126a739e5..4359dad24 100644
--- a/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/ScenarioParameterEstimator.java
+++ b/analysis/org.eclipse.stem.util.analysis/src/org/eclipse/stem/util/analysis/ScenarioParameterEstimator.java
@@ -26,6 +26,7 @@ import org.eclipse.stem.core.common.Identifiable;
 import org.eclipse.stem.core.graph.Graph;
 import org.eclipse.stem.definitions.labels.AreaLabel;
 import org.eclipse.stem.definitions.labels.PopulationLabel;
+import org.eclipse.stem.geography.names.GeographicMapper;
 import org.eclipse.stem.ui.Utility;
 import org.eclipse.stem.util.analysis.views.EstimatorControl;
 import org.eclipse.stem.util.analysis.views.Messages;
@@ -458,7 +459,7 @@ public class ScenarioParameterEstimator {
 			countryCode = id;
 		} else {
 			String twoLetterCode = id.substring(0,2);
-			countryCode = org.eclipse.stem.data.geography.GeographicMapper.getAlpha3(twoLetterCode);
+			countryCode = GeographicMapper.getAlpha3(twoLetterCode);
 		}
 		String composite = "stem://org.eclipse.stem/"+AREA_URI_PREFIX + "/" + countryCode +"/"+getLevel(id)+"/"+id;
 		URI uri = URI.createURI(composite);	
@@ -479,7 +480,7 @@ public class ScenarioParameterEstimator {
 			countryCode = id;
 		} else {
 			String twoLetterCode = id.substring(0,2);
-			countryCode = org.eclipse.stem.data.geography.GeographicMapper.getAlpha3(twoLetterCode);
+			countryCode = GeographicMapper.getAlpha3(twoLetterCode);
 		}
 		// syntax is
 		// stem://org.eclipse.stem/label/population/ISR/2/human/2006/IL-05-623
diff --git a/core/org.eclipse.stem.definitions/META-INF/MANIFEST.MF b/core/org.eclipse.stem.definitions/META-INF/MANIFEST.MF
index 08268caa3..97d6f132b 100644
--- a/core/org.eclipse.stem.definitions/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.definitions/META-INF/MANIFEST.MF
@@ -36,7 +36,7 @@ Export-Package: org.eclipse.stem.definitions,
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;visibility:=reexport,
  org.eclipse.stem.core;visibility:=reexport,
- org.eclipse.stem.data.geography,
+ org.eclipse.stem.geography,
  org.eclipse.ui.ide;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/provider/MigrationEdgeLabelItemProvider.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/provider/MigrationEdgeLabelItemProvider.java
index 718d493f1..39b050823 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/provider/MigrationEdgeLabelItemProvider.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/provider/MigrationEdgeLabelItemProvider.java
@@ -27,8 +27,8 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.stem.core.graph.Edge;
 import org.eclipse.stem.core.graph.EdgeLabel;
 import org.eclipse.stem.core.graph.provider.EdgeLabelItemProvider;
-import org.eclipse.stem.data.geography.GeographicNames;
 import org.eclipse.stem.definitions.edges.MigrationEdgeLabel;
+import org.eclipse.stem.geography.names.GeographicNames;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.stem.definitions.edges.MigrationEdgeLabel} object.
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/provider/MixingEdgeLabelItemProvider.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/provider/MixingEdgeLabelItemProvider.java
index 58ccc9c24..0b464be05 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/provider/MixingEdgeLabelItemProvider.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/provider/MixingEdgeLabelItemProvider.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.stem.core.graph.Edge;

 import org.eclipse.stem.core.graph.EdgeLabel;

 import org.eclipse.stem.core.graph.provider.EdgeLabelItemProvider;

-import org.eclipse.stem.data.geography.GeographicNames;

+import org.eclipse.stem.geography.names.GeographicNames;

 

 /**

  * This is the item provider adapter for a {@link org.eclipse.stem.definitions.edges.MixingEdgeLabel} object.

diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/AreaLabelItemProvider.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/AreaLabelItemProvider.java
index df73536e0..896ceaaf8 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/AreaLabelItemProvider.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/AreaLabelItemProvider.java
@@ -27,10 +27,10 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.stem.core.graph.provider.StaticNodeLabelItemProvider;
-import org.eclipse.stem.data.geography.GeographicNames;
 import org.eclipse.stem.definitions.edges.provider.DefinitionsEditPlugin;
 import org.eclipse.stem.definitions.labels.AreaLabel;
 import org.eclipse.stem.definitions.labels.LabelsPackage;
+import org.eclipse.stem.geography.names.GeographicNames;
 
 /**
  * This is the item provider adapter for a
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/CommonBorderRelationshipLabelItemProvider.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/CommonBorderRelationshipLabelItemProvider.java
index 2fdce5b00..3c210d063 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/CommonBorderRelationshipLabelItemProvider.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/CommonBorderRelationshipLabelItemProvider.java
@@ -25,8 +25,8 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.stem.core.graph.Edge;
 import org.eclipse.stem.core.graph.EdgeLabel;
-import org.eclipse.stem.data.geography.GeographicNames;
 import org.eclipse.stem.definitions.labels.CommonBorderRelationshipLabel;
+import org.eclipse.stem.geography.names.GeographicNames;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.stem.definitions.labels.CommonBorderRelationshipLabel} object.
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/PhysicalRelationshipLabelItemProvider.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/PhysicalRelationshipLabelItemProvider.java
index 7559fabcd..eb96375e3 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/PhysicalRelationshipLabelItemProvider.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/PhysicalRelationshipLabelItemProvider.java
@@ -27,9 +27,9 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.stem.core.graph.Edge;
 import org.eclipse.stem.core.graph.EdgeLabel;
 import org.eclipse.stem.core.graph.provider.StaticEdgeLabelItemProvider;
-import org.eclipse.stem.data.geography.GeographicNames;
 import org.eclipse.stem.definitions.edges.provider.DefinitionsEditPlugin;
 import org.eclipse.stem.definitions.labels.PhysicalRelationshipLabel;
+import org.eclipse.stem.geography.names.GeographicNames;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.stem.definitions.labels.PhysicalRelationshipLabel} object.
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/PopulationLabelItemProvider.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/PopulationLabelItemProvider.java
index d359c34a5..677f88d6f 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/PopulationLabelItemProvider.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/PopulationLabelItemProvider.java
@@ -28,10 +28,10 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.stem.core.graph.provider.StaticNodeLabelItemProvider;
-import org.eclipse.stem.data.geography.GeographicNames;
 import org.eclipse.stem.definitions.edges.provider.DefinitionsEditPlugin;
 import org.eclipse.stem.definitions.labels.LabelsPackage;
 import org.eclipse.stem.definitions.labels.PopulationLabel;
+import org.eclipse.stem.geography.names.GeographicNames;
 
 /**
  * This is the item provider adapter for a
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/RoadTransportRelationshipLabelItemProvider.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/RoadTransportRelationshipLabelItemProvider.java
index 26a18b6e2..8dc889025 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/RoadTransportRelationshipLabelItemProvider.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/RoadTransportRelationshipLabelItemProvider.java
@@ -25,8 +25,8 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.stem.core.graph.Edge;
 import org.eclipse.stem.core.graph.EdgeLabel;
-import org.eclipse.stem.data.geography.GeographicNames;
 import org.eclipse.stem.definitions.labels.RoadTransportRelationshipLabel;
+import org.eclipse.stem.geography.names.GeographicNames;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.stem.definitions.labels.RoadTransportRelationshipLabel} object.
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/TransportRelationshipLabelItemProvider.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/TransportRelationshipLabelItemProvider.java
index d2b88e7e3..96dfed879 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/TransportRelationshipLabelItemProvider.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/TransportRelationshipLabelItemProvider.java
@@ -30,10 +30,10 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.stem.core.graph.Edge;
 import org.eclipse.stem.core.graph.EdgeLabel;
 import org.eclipse.stem.core.graph.provider.DynamicEdgeLabelItemProvider;
-import org.eclipse.stem.data.geography.GeographicNames;
 import org.eclipse.stem.definitions.edges.provider.DefinitionsEditPlugin;
 import org.eclipse.stem.definitions.labels.LabelsPackage;
 import org.eclipse.stem.definitions.labels.TransportRelationshipLabel;
+import org.eclipse.stem.geography.names.GeographicNames;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.stem.definitions.labels.TransportRelationshipLabel} object.
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/provider/RegionItemProvider.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/provider/RegionItemProvider.java
index 22f7f35a4..6c558b5c6 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/provider/RegionItemProvider.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/provider/RegionItemProvider.java
@@ -24,8 +24,8 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.stem.data.geography.GeographicNames;
 import org.eclipse.stem.definitions.nodes.Region;
+import org.eclipse.stem.geography.names.GeographicNames;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.stem.definitions.nodes.Region} object.
diff --git a/core/org.eclipse.stem.transport/META-INF/MANIFEST.MF b/core/org.eclipse.stem.transport/META-INF/MANIFEST.MF
index 7b9a98bf5..08b264b81 100644
--- a/core/org.eclipse.stem.transport/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.transport/META-INF/MANIFEST.MF
@@ -14,6 +14,6 @@ Export-Package: org.eclipse.stem.definitions.transport,
 Require-Bundle: org.eclipse.stem.definitions;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore.edit,
- org.eclipse.stem.data.geography
+ org.eclipse.stem.geography
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.stem.definitions.transport.provider.TransportEditPlugin$Implementation
diff --git a/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/PipeStyleTransportSystemItemProvider.java b/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/PipeStyleTransportSystemItemProvider.java
index b1ab1fb6b..c98a6b1d7 100644
--- a/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/PipeStyleTransportSystemItemProvider.java
+++ b/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/PipeStyleTransportSystemItemProvider.java
@@ -16,9 +16,7 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -28,10 +26,9 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.stem.data.geography.GeographicNames;
 import org.eclipse.stem.definitions.transport.PipeStyleTransportSystem;
 import org.eclipse.stem.definitions.transport.TransportPackage;
+import org.eclipse.stem.geography.names.GeographicNames;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.stem.definitions.transport.PipeStyleTransportSystem} object.
diff --git a/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/PipeTransportEdgeItemProvider.java b/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/PipeTransportEdgeItemProvider.java
index c03057885..c072772fd 100644
--- a/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/PipeTransportEdgeItemProvider.java
+++ b/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/PipeTransportEdgeItemProvider.java
@@ -16,21 +16,16 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
 import org.eclipse.stem.core.graph.GraphPackage;
-
 import org.eclipse.stem.definitions.edges.provider.PopulationEdgeItemProvider;
-
 import org.eclipse.stem.definitions.transport.PipeTransportEdge;
 import org.eclipse.stem.definitions.transport.TransportFactory;
 
diff --git a/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/PipeTransportEdgeLabelItemProvider.java b/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/PipeTransportEdgeLabelItemProvider.java
index bdd9c5425..c25f66009 100644
--- a/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/PipeTransportEdgeLabelItemProvider.java
+++ b/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/PipeTransportEdgeLabelItemProvider.java
@@ -16,23 +16,19 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
 import org.eclipse.stem.core.graph.Edge;
 import org.eclipse.stem.core.graph.EdgeLabel;
 import org.eclipse.stem.core.graph.provider.EdgeLabelItemProvider;
-
-import org.eclipse.stem.data.geography.GeographicNames;
 import org.eclipse.stem.definitions.transport.PipeTransportEdgeLabel;
+import org.eclipse.stem.geography.names.GeographicNames;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.stem.definitions.transport.PipeTransportEdgeLabel} object.
diff --git a/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/PipeTransportEdgeLabelValueItemProvider.java b/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/PipeTransportEdgeLabelValueItemProvider.java
index d0f463012..92420af5a 100644
--- a/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/PipeTransportEdgeLabelValueItemProvider.java
+++ b/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/PipeTransportEdgeLabelValueItemProvider.java
@@ -16,9 +16,7 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -28,9 +26,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.stem.core.graph.provider.LabelValueItemProvider;
-
 import org.eclipse.stem.definitions.transport.PipeTransportEdgeLabelValue;
 import org.eclipse.stem.definitions.transport.TransportPackage;
 
diff --git a/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/TransportEditPlugin.java b/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/TransportEditPlugin.java
index 68f4f4aa7..8e84a015f 100644
--- a/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/TransportEditPlugin.java
+++ b/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/TransportEditPlugin.java
@@ -12,13 +12,9 @@ package org.eclipse.stem.definitions.transport.provider;
  *******************************************************************************/
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.common.EMFPlugin;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
 import org.eclipse.stem.core.common.provider.CoreEditPlugin;
-
 import org.eclipse.stem.definitions.edges.provider.DefinitionsEditPlugin;
 import org.osgi.framework.Bundle;
 
diff --git a/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/TransportItemProviderAdapterFactory.java b/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/TransportItemProviderAdapterFactory.java
index 76c874b82..ae9e2bfc5 100644
--- a/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/TransportItemProviderAdapterFactory.java
+++ b/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/TransportItemProviderAdapterFactory.java
@@ -16,7 +16,6 @@ import java.util.Collection;
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.Notifier;
-
 import org.eclipse.emf.edit.provider.ChangeNotifier;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -28,7 +27,6 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
 import org.eclipse.stem.definitions.transport.util.TransportAdapterFactory;
 
 /**
diff --git a/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/TransportSystemItemProvider.java b/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/TransportSystemItemProvider.java
index 8a24fcb2d..4cab0c035 100644
--- a/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/TransportSystemItemProvider.java
+++ b/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/TransportSystemItemProvider.java
@@ -16,19 +16,15 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
 import org.eclipse.stem.core.graph.provider.NodeItemProvider;
-
 import org.eclipse.stem.definitions.transport.TransportSystem;
 
 /**
diff --git a/core/org.eclipse.stem.ui.ge/META-INF/MANIFEST.MF b/core/org.eclipse.stem.ui.ge/META-INF/MANIFEST.MF
index 6c93484ae..f17760982 100644
--- a/core/org.eclipse.stem.ui.ge/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.ui.ge/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help.appserver;visibility:=reexport,
  org.eclipse.stem.diseasemodels,
  org.eclipse.stem.ui,
- org.eclipse.stem.data.geography
+ org.eclipse.stem.geography
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.stem.ui.ge;
   uses:="org.eclipse.stem.ui.views.geographic.map,
diff --git a/core/org.eclipse.stem.ui.ge/src/org/eclipse/stem/ui/ge/GEInterface.java b/core/org.eclipse.stem.ui.ge/src/org/eclipse/stem/ui/ge/GEInterface.java
index 960b47e17..fccefb54f 100644
--- a/core/org.eclipse.stem.ui.ge/src/org/eclipse/stem/ui/ge/GEInterface.java
+++ b/core/org.eclipse.stem.ui.ge/src/org/eclipse/stem/ui/ge/GEInterface.java
@@ -29,7 +29,6 @@ import org.eclipse.stem.core.model.Decorator;
 import org.eclipse.stem.core.model.Model;
 import org.eclipse.stem.core.scenario.Scenario;
 import org.eclipse.stem.core.sequencer.Sequencer;
-import org.eclipse.stem.data.geography.GeographicNames;
 import org.eclipse.stem.definitions.adapters.relativevalue.RelativeValueProvider;
 import org.eclipse.stem.definitions.adapters.relativevalue.RelativeValueProviderAdapter;
 import org.eclipse.stem.definitions.adapters.relativevalue.RelativeValueProviderAdapterFactory;
@@ -40,6 +39,7 @@ import org.eclipse.stem.definitions.adapters.spatial.geo.LatLongProviderAdapter;
 import org.eclipse.stem.definitions.adapters.spatial.geo.LatLongProviderAdapterFactory;
 import org.eclipse.stem.definitions.adapters.spatial.geo.PlatformLatLongDataProvider;
 import org.eclipse.stem.definitions.nodes.impl.RegionImpl;
+import org.eclipse.stem.geography.names.GeographicNames;
 import org.eclipse.stem.jobs.preferences.PreferenceConstants;
 import org.eclipse.stem.jobs.simulation.ISimulation;
 import org.eclipse.stem.jobs.simulation.ISimulationListener;
diff --git a/core/org.eclipse.stem.ui/META-INF/MANIFEST.MF b/core/org.eclipse.stem.ui/META-INF/MANIFEST.MF
index 93fa4d59a..2300bbe1c 100644
--- a/core/org.eclipse.stem.ui/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.ui/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.stem.jobs;visibility:=reexport,
  org.eclipse.stem.definitions,
- org.eclipse.stem.data.geography,
+ org.eclipse.stem.geography,
  org.eclipse.stem.diseasemodels,
  org.eclipse.stem.populationmodels,
  org.eclipse.emf.ecore.edit,
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/Utility.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/Utility.java
index eade3386a..386422173 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/Utility.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/Utility.java
@@ -37,6 +37,8 @@ public class Utility {
 	
 	private static final String HUMAN_POPULATION_PLUGIN_ID = "org.eclipse.stem.data.geography.population.human";
 	
+	private static final String GEOGRAPHY_DATA_PLUGIN_ID = "org.eclipse.stem.data.geography";
+	
 	/**
 	 * @return a List of the projects in the workspace that have STEM Project
 	 *         "nature"
@@ -169,8 +171,7 @@ public class Utility {
 	 *         {@link Label} with the labelURI would be serialized in
 	 */
 	private static URI createAreaGraphURI(final URI labelURI) {
-		
-		final String prefix = URI.createPlatformPluginURI(org.eclipse.stem.data.geography.Activator.PLUGIN_ID, false).toString();
+		final String prefix = URI.createPlatformPluginURI(GEOGRAPHY_DATA_PLUGIN_ID, false).toString();
 		//final StringBuilder sb = new StringBuilder("platform:/plugin/" + org.eclipse.stem.data.geography.Activator.PLUGIN_ID + "/resources/data");
 		final StringBuilder sb = new StringBuilder(prefix + "/resources/data");
 
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/IdentifiablePluginView.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/IdentifiablePluginView.java
index 35b81a758..50d818be1 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/IdentifiablePluginView.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/IdentifiablePluginView.java
@@ -43,7 +43,7 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.stem.core.Constants;
 import org.eclipse.stem.core.common.DublinCore;
 import org.eclipse.stem.core.common.Identifiable;
-import org.eclipse.stem.data.geography.GeographicNames;
+import org.eclipse.stem.geography.names.GeographicNames;
 import org.eclipse.stem.jobs.execution.IExecutable;
 import org.eclipse.stem.ui.Activator;
 import org.eclipse.stem.ui.perspectives.Simulation;
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/geographic/GeographicControl.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/geographic/GeographicControl.java
index a49e8ec77..1345d0ee4 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/geographic/GeographicControl.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/geographic/GeographicControl.java
@@ -49,7 +49,6 @@ import org.eclipse.stem.core.graph.Edge;
 import org.eclipse.stem.core.graph.Graph;
 import org.eclipse.stem.core.graph.Node;
 import org.eclipse.stem.core.model.Decorator;
-import org.eclipse.stem.data.geography.centers.GeographicCenters;
 import org.eclipse.stem.definitions.adapters.relativevalue.RelativeValueProvider;
 import org.eclipse.stem.definitions.adapters.relativevalue.RelativeValueProviderAdapter;
 import org.eclipse.stem.definitions.adapters.relativevalue.RelativeValueProviderAdapterFactory;
@@ -60,6 +59,7 @@ import org.eclipse.stem.definitions.adapters.spatial.geo.LatLongProviderAdapter;
 import org.eclipse.stem.definitions.adapters.spatial.geo.LatLongProviderAdapterFactory;
 import org.eclipse.stem.definitions.edges.PopulationEdge;
 import org.eclipse.stem.diseasemodels.standard.DiseaseModelLabel;
+import org.eclipse.stem.geography.centers.GeographicCenters;
 import org.eclipse.stem.jobs.simulation.ISimulation;
 import org.eclipse.stem.jobs.simulation.ISimulationListener;
 import org.eclipse.stem.jobs.simulation.SimulationEvent;
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/geographic/map/MapCanvas.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/geographic/map/MapCanvas.java
index 07dd88ab8..45569224f 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/geographic/map/MapCanvas.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/geographic/map/MapCanvas.java
@@ -34,11 +34,11 @@ import org.eclipse.stem.core.graph.Node;
 import org.eclipse.stem.core.graph.NodeLabel;
 import org.eclipse.stem.core.model.STEMTime;
 import org.eclipse.stem.core.sequencer.Sequencer;
-import org.eclipse.stem.data.geography.GeographicNames;
 import org.eclipse.stem.definitions.labels.AreaLabel;
 import org.eclipse.stem.definitions.labels.PopulationLabel;
 import org.eclipse.stem.definitions.nodes.Region;
 import org.eclipse.stem.diseasemodels.standard.StandardDiseaseModelLabel;
+import org.eclipse.stem.geography.names.GeographicNames;
 import org.eclipse.stem.jobs.simulation.ISimulation;
 import org.eclipse.stem.populationmodels.standard.PopulationModelLabel;
 import org.eclipse.stem.ui.Activator;
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/graphmap/GraphMapCanvas.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/graphmap/GraphMapCanvas.java
index 7cfe75e30..ff2f9c494 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/graphmap/GraphMapCanvas.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/graphmap/GraphMapCanvas.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *     Bundesinstitut für Risikobewertung
+ *     Bundesinstitut f�r Risikobewertung
  *******************************************************************************/
 
 package org.eclipse.stem.ui.views.graphmap;
@@ -45,12 +45,12 @@ import org.eclipse.stem.core.graph.Node;
 import org.eclipse.stem.core.graph.NodeLabel;
 import org.eclipse.stem.core.model.STEMTime;
 import org.eclipse.stem.core.scenario.Scenario;
-import org.eclipse.stem.data.geography.GeographicNames;
 import org.eclipse.stem.definitions.edges.MigrationEdge;
 import org.eclipse.stem.definitions.labels.AreaLabel;
 import org.eclipse.stem.definitions.labels.PopulationLabel;
 import org.eclipse.stem.definitions.nodes.Region;
 import org.eclipse.stem.diseasemodels.standard.StandardDiseaseModelLabel;
+import org.eclipse.stem.geography.names.GeographicNames;
 import org.eclipse.stem.jobs.simulation.ISimulation;
 import org.eclipse.stem.populationmodels.standard.PopulationModelLabel;
 import org.eclipse.stem.ui.Activator;
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/graphmap/GraphMapControl.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/graphmap/GraphMapControl.java
index 7272fdd36..2143a05bd 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/graphmap/GraphMapControl.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/graphmap/GraphMapControl.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
- *     Bundesinstitut für Risikobewertung
+ *     Bundesinstitut f�r Risikobewertung
  *******************************************************************************/
 
 package org.eclipse.stem.ui.views.graphmap;
@@ -49,7 +49,6 @@ import org.eclipse.stem.core.predicate.Not;
 import org.eclipse.stem.core.predicate.Predicate;
 import org.eclipse.stem.core.predicate.PredicateExpression;
 import org.eclipse.stem.core.trigger.TriggerList;
-import org.eclipse.stem.data.geography.centers.GeographicCenters;
 import org.eclipse.stem.definitions.adapters.spatial.geo.LatLong;
 import org.eclipse.stem.definitions.adapters.spatial.geo.LatLong.Segment;
 import org.eclipse.stem.definitions.adapters.spatial.geo.LatLongProvider;
@@ -59,6 +58,7 @@ import org.eclipse.stem.definitions.edges.MigrationEdge;
 import org.eclipse.stem.definitions.edges.MigrationEdgeLabel;
 import org.eclipse.stem.definitions.edges.PopulationEdge;
 import org.eclipse.stem.diseasemodels.standard.DiseaseModelLabel;
+import org.eclipse.stem.geography.centers.GeographicCenters;
 import org.eclipse.stem.jobs.simulation.ISimulation;
 import org.eclipse.stem.jobs.simulation.ISimulationListener;
 import org.eclipse.stem.jobs.simulation.SimulationEvent;
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/widgets/ISOKeyPicker.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/widgets/ISOKeyPicker.java
index 1ea0c3e36..866ba6a8d 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/widgets/ISOKeyPicker.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/widgets/ISOKeyPicker.java
@@ -16,7 +16,7 @@ import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.stem.data.geography.GeographicNames;
+import org.eclipse.stem.geography.names.GeographicNames;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/widgets/LocationPickerDialog.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/widgets/LocationPickerDialog.java
index 723456b25..519aa6f01 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/widgets/LocationPickerDialog.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/widgets/LocationPickerDialog.java
@@ -19,9 +19,9 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableContext;
 import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.stem.data.geography.GeographicMapper;
-import org.eclipse.stem.data.geography.GeographicNames;
 import org.eclipse.stem.definitions.LocationUtility;
+import org.eclipse.stem.geography.names.GeographicMapper;
+import org.eclipse.stem.geography.names.GeographicNames;
 import org.eclipse.stem.ui.Activator;
 import org.eclipse.stem.ui.wizards.Messages;
 import org.eclipse.swt.SWT;
diff --git a/distributed/org.eclipse.stem.graphsynchronizer/META-INF/MANIFEST.MF b/distributed/org.eclipse.stem.graphsynchronizer/META-INF/MANIFEST.MF
index 4ef839106..86c92e9ba 100644
--- a/distributed/org.eclipse.stem.graphsynchronizer/META-INF/MANIFEST.MF
+++ b/distributed/org.eclipse.stem.graphsynchronizer/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.stem.definitions,
  org.eclipse.stem.populationmodels,
  org.eclipse.stem.diseasemodels,
- org.eclipse.stem.data.geography
+ org.eclipse.stem.geography
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.graphsynchronizer,
  org.eclipse.stem.graphsynchronizer.impl,
diff --git a/distributed/org.eclipse.stem.graphsynchronizer/src/org/eclipse/stem/graphsynchronizer/impl/SimulationGraphSynchronizer.java b/distributed/org.eclipse.stem.graphsynchronizer/src/org/eclipse/stem/graphsynchronizer/impl/SimulationGraphSynchronizer.java
index 795218ff8..95137cf4d 100644
--- a/distributed/org.eclipse.stem.graphsynchronizer/src/org/eclipse/stem/graphsynchronizer/impl/SimulationGraphSynchronizer.java
+++ b/distributed/org.eclipse.stem.graphsynchronizer/src/org/eclipse/stem/graphsynchronizer/impl/SimulationGraphSynchronizer.java
@@ -36,8 +36,8 @@ import org.eclipse.stem.core.model.Decorator;
 import org.eclipse.stem.core.model.IntegrationDecorator;
 import org.eclipse.stem.definitions.labels.RelativePhysicalRelationshipLabel;
 import org.eclipse.stem.diseasemodels.standard.DiseaseModelLabel;
-import org.eclipse.stem.graphsynchronizer.Messenger;
 import org.eclipse.stem.graphsynchronizer.Activator;
+import org.eclipse.stem.graphsynchronizer.Messenger;
 import org.eclipse.stem.graphsynchronizer.MessengerException;
 import org.eclipse.stem.graphsynchronizer.SynchGraphPartitioner;
 import org.eclipse.stem.jobs.simulation.ISimulation;
diff --git a/distributed/org.eclipse.stem.graphsynchronizer/src/org/eclipse/stem/graphsynchronizer/impl/SynchGraphPartitionerImpl.java b/distributed/org.eclipse.stem.graphsynchronizer/src/org/eclipse/stem/graphsynchronizer/impl/SynchGraphPartitionerImpl.java
index 2c73b817e..7905a1160 100644
--- a/distributed/org.eclipse.stem.graphsynchronizer/src/org/eclipse/stem/graphsynchronizer/impl/SynchGraphPartitionerImpl.java
+++ b/distributed/org.eclipse.stem.graphsynchronizer/src/org/eclipse/stem/graphsynchronizer/impl/SynchGraphPartitionerImpl.java
@@ -17,9 +17,9 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.TreeSet;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.TreeSet;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.BasicEList;
@@ -36,12 +36,12 @@ import org.eclipse.stem.core.graph.Graph;
 import org.eclipse.stem.core.graph.Node;
 import org.eclipse.stem.core.graph.impl.GraphPartitionerImpl;
 import org.eclipse.stem.core.model.Decorator;
-import org.eclipse.stem.data.geography.GeographicMapper;
 import org.eclipse.stem.definitions.labels.RelativePhysicalRelationshipLabel;
+import org.eclipse.stem.geography.names.GeographicMapper;
+import org.eclipse.stem.graphsynchronizer.Activator;
 import org.eclipse.stem.graphsynchronizer.GraphsynchronizerPackage;
 import org.eclipse.stem.graphsynchronizer.SynchGraphPartitioner;
 import org.eclipse.stem.graphsynchronizer.util.GlobalTileGenerator;
-import org.eclipse.stem.graphsynchronizer.Activator;
 import org.eclipse.stem.jobs.simulation.ISimulation;
 
 /**
diff --git a/distributed/org.eclipse.stem.graphsynchronizer/src/org/eclipse/stem/graphsynchronizer/util/GlobalTileGenerator.java b/distributed/org.eclipse.stem.graphsynchronizer/src/org/eclipse/stem/graphsynchronizer/util/GlobalTileGenerator.java
index 7b004816f..542ad10f1 100644
--- a/distributed/org.eclipse.stem.graphsynchronizer/src/org/eclipse/stem/graphsynchronizer/util/GlobalTileGenerator.java
+++ b/distributed/org.eclipse.stem.graphsynchronizer/src/org/eclipse/stem/graphsynchronizer/util/GlobalTileGenerator.java
@@ -32,9 +32,9 @@ import java.util.StringTokenizer;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.stem.data.geography.NameReader;
-import org.eclipse.stem.data.geography.centers.CenterReader;
-import org.eclipse.stem.data.geography.centers.PluginCenterReader;
+import org.eclipse.stem.geography.centers.CenterReader;
+import org.eclipse.stem.geography.centers.PluginCenterReader;
+import org.eclipse.stem.geography.names.NameReader;
 import org.eclipse.stem.graphsynchronizer.Activator;
 import org.osgi.framework.Bundle;
 
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.globalinfluenzamodel/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.diseasemodels.globalinfluenzamodel/META-INF/MANIFEST.MF
index a9afb4300..7237318b9 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.globalinfluenzamodel/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels.globalinfluenzamodel/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Export-Package: org.eclipse.stem.diseasemodels.globalinfluenzamodel,
  org.eclipse.stem.diseasemodels.globalinfluenzamodel.provider,

  org.eclipse.stem.diseasemodels.globalinfluenzamodel.util

 Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.stem.data.geography,

+ org.eclipse.stem.geography,

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.stem.diseasemodels;visibility:=reexport,

  org.eclipse.stem.core;visibility:=reexport,

diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.globalinfluenzamodel/src/org/eclipse/stem/diseasemodels/globalinfluenzamodel/impl/GlobalInfluenzaModelImpl.java b/models/epidemiology/org.eclipse.stem.diseasemodels.globalinfluenzamodel/src/org/eclipse/stem/diseasemodels/globalinfluenzamodel/impl/GlobalInfluenzaModelImpl.java
index 7832aba80..0da7ea7fe 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.globalinfluenzamodel/src/org/eclipse/stem/diseasemodels/globalinfluenzamodel/impl/GlobalInfluenzaModelImpl.java
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels.globalinfluenzamodel/src/org/eclipse/stem/diseasemodels/globalinfluenzamodel/impl/GlobalInfluenzaModelImpl.java
@@ -17,7 +17,6 @@ import org.eclipse.stem.core.graph.DynamicLabel;
 import org.eclipse.stem.core.graph.IntegrationLabel;

 import org.eclipse.stem.core.graph.Node;

 import org.eclipse.stem.core.model.STEMTime;

-import org.eclipse.stem.data.geography.centers.GeographicCenters;

 import org.eclipse.stem.definitions.adapters.spatial.geo.LatLongProvider;

 import org.eclipse.stem.definitions.adapters.spatial.geo.LatLongProviderAdapter;

 import org.eclipse.stem.definitions.adapters.spatial.geo.LatLongProviderAdapterFactory;

@@ -31,6 +30,7 @@ import org.eclipse.stem.diseasemodels.standard.StandardDiseaseModelLabelValue;
 import org.eclipse.stem.diseasemodels.standard.StandardPackage;

 import org.eclipse.stem.diseasemodels.standard.impl.SIRImpl;

 import org.eclipse.stem.diseasemodels.standard.impl.SIRLabelValueImpl;

+import org.eclipse.stem.geography.centers.GeographicCenters;

 

 /**

  * <!-- begin-user-doc -->

diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.diseasemodels/META-INF/MANIFEST.MF
index 86a8e123d..e672e6beb 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels/META-INF/MANIFEST.MF
@@ -19,9 +19,9 @@ Export-Package: org.eclipse.stem.diseasemodels,
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.definitions;visibility:=reexport,
  org.eclipse.stem.transport,
+ org.eclipse.stem.geography,
  org.eclipse.stem.populationmodels;visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="2.6.0",
- org.eclipse.stem.interventions,
- org.eclipse.stem.data.geography
+ org.eclipse.stem.interventions
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/Activator.java b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/Activator.java
index 947942324..d74d3bb03 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/Activator.java
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/Activator.java
@@ -11,17 +11,9 @@ package org.eclipse.stem.diseasemodels;
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.stem.core.Constants;
-import org.eclipse.stem.core.common.DublinCore;
-import org.eclipse.stem.diseasemodels.standard.DiseaseModel;
 import org.eclipse.stem.diseasemodels.standard.provider.StandardHistoryProviderAdapterFactory;
 import org.eclipse.stem.diseasemodels.standard.provider.StandardRelativeValueHistoryProviderAdapterFactory;
 import org.eclipse.stem.diseasemodels.standard.provider.StandardRelativeValueProviderAdapterFactory;
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/predicates/diseasepredicates/impl/DiseasepredicatesFactoryImpl.java b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/predicates/diseasepredicates/impl/DiseasepredicatesFactoryImpl.java
index 2dd4affdf..609535ade 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/predicates/diseasepredicates/impl/DiseasepredicatesFactoryImpl.java
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/predicates/diseasepredicates/impl/DiseasepredicatesFactoryImpl.java
@@ -16,7 +16,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.stem.diseasemodels.predicates.diseasepredicates.*;
 import org.eclipse.stem.diseasemodels.predicates.diseasepredicates.DiseasepredicatesFactory;
 import org.eclipse.stem.diseasemodels.predicates.diseasepredicates.DiseasepredicatesPackage;
 import org.eclipse.stem.diseasemodels.predicates.diseasepredicates.LabelValueTest;
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/predicates/diseasepredicates/provider/LabelValueTestItemProvider.java b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/predicates/diseasepredicates/provider/LabelValueTestItemProvider.java
index 3afef4907..21019fd15 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/predicates/diseasepredicates/provider/LabelValueTestItemProvider.java
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/predicates/diseasepredicates/provider/LabelValueTestItemProvider.java
@@ -29,10 +29,10 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.stem.core.predicate.provider.TestItemProvider;
-import org.eclipse.stem.data.geography.GeographicNames;
 import org.eclipse.stem.diseasemodels.predicates.diseasepredicates.DiseasepredicatesPackage;
 import org.eclipse.stem.diseasemodels.predicates.diseasepredicates.LabelValueTest;
 import org.eclipse.stem.diseasemodels.standard.provider.DiseasemodelsEditPlugin;
+import org.eclipse.stem.geography.names.GeographicNames;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.stem.diseasemodels.predicates.diseasepredicates.LabelValueTest} object.
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/predicates/diseasepredicates/util/DiseasepredicatesAdapterFactory.java b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/predicates/diseasepredicates/util/DiseasepredicatesAdapterFactory.java
index 448214f22..d71e2a8b8 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/predicates/diseasepredicates/util/DiseasepredicatesAdapterFactory.java
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/predicates/diseasepredicates/util/DiseasepredicatesAdapterFactory.java
@@ -17,7 +17,6 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.stem.core.predicate.Predicate;
 import org.eclipse.stem.core.predicate.Test;
-import org.eclipse.stem.diseasemodels.predicates.diseasepredicates.*;
 import org.eclipse.stem.diseasemodels.predicates.diseasepredicates.DiseasepredicatesPackage;
 import org.eclipse.stem.diseasemodels.predicates.diseasepredicates.LabelValueTest;
 
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/predicates/diseasepredicates/util/DiseasepredicatesSwitch.java b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/predicates/diseasepredicates/util/DiseasepredicatesSwitch.java
index 5ca1ca178..6b6e33743 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/predicates/diseasepredicates/util/DiseasepredicatesSwitch.java
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/predicates/diseasepredicates/util/DiseasepredicatesSwitch.java
@@ -17,7 +17,6 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.stem.core.predicate.Predicate;
 import org.eclipse.stem.core.predicate.Test;
-import org.eclipse.stem.diseasemodels.predicates.diseasepredicates.*;
 import org.eclipse.stem.diseasemodels.predicates.diseasepredicates.DiseasepredicatesPackage;
 import org.eclipse.stem.diseasemodels.predicates.diseasepredicates.LabelValueTest;
 
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/impl/StandardFactoryImpl.java b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/impl/StandardFactoryImpl.java
index 6eeeffa6f..20d32b5fd 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/impl/StandardFactoryImpl.java
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/impl/StandardFactoryImpl.java
@@ -20,7 +20,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.stem.diseasemodels.standard.*;
 import org.eclipse.stem.diseasemodels.standard.DeterministicSEIRDiseaseModel;
 import org.eclipse.stem.diseasemodels.standard.DeterministicSIDiseaseModel;
 import org.eclipse.stem.diseasemodels.standard.DeterministicSIRDiseaseModel;
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/provider/DiseasemodelsEditPlugin.java b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/provider/DiseasemodelsEditPlugin.java
index c464bfeca..dd0103fcf 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/provider/DiseasemodelsEditPlugin.java
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/provider/DiseasemodelsEditPlugin.java
@@ -13,10 +13,8 @@ package org.eclipse.stem.diseasemodels.standard.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
 import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
 import org.eclipse.stem.core.common.provider.CoreEditPlugin;
 import org.eclipse.stem.definitions.edges.provider.DefinitionsEditPlugin;
-import org.eclipse.stem.populationmodels.standard.provider.StandardEditPlugin;
 
 /**
  * This is the central singleton for the Diseasemodels edit plugin.
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/provider/StandardInfectorItemProvider.java b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/provider/StandardInfectorItemProvider.java
index 188313e49..47031065a 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/provider/StandardInfectorItemProvider.java
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/provider/StandardInfectorItemProvider.java
@@ -22,7 +22,6 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.stem.diseasemodels.standard.StandardInfector;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.stem.diseasemodels.standard.StandardInfector} object.
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/util/StandardAdapterFactory.java b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/util/StandardAdapterFactory.java
index ebf25ca37..cd70077d2 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/util/StandardAdapterFactory.java
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/util/StandardAdapterFactory.java
@@ -31,7 +31,6 @@ import org.eclipse.stem.core.model.Decorator;
 import org.eclipse.stem.core.model.IntegrationDecorator;
 import org.eclipse.stem.core.model.NodeDecorator;
 import org.eclipse.stem.core.modifier.Modifiable;
-import org.eclipse.stem.diseasemodels.standard.*;
 import org.eclipse.stem.diseasemodels.standard.DeterministicSEIRDiseaseModel;
 import org.eclipse.stem.diseasemodels.standard.DeterministicSIDiseaseModel;
 import org.eclipse.stem.diseasemodels.standard.DeterministicSIRDiseaseModel;
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/util/StandardSwitch.java b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/util/StandardSwitch.java
index 552ffbd5c..06a1a118b 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/util/StandardSwitch.java
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/util/StandardSwitch.java
@@ -29,7 +29,6 @@ import org.eclipse.stem.core.model.Decorator;
 import org.eclipse.stem.core.model.IntegrationDecorator;
 import org.eclipse.stem.core.model.NodeDecorator;
 import org.eclipse.stem.core.modifier.Modifiable;
-import org.eclipse.stem.diseasemodels.standard.*;
 import org.eclipse.stem.diseasemodels.standard.DeterministicSEIRDiseaseModel;
 import org.eclipse.stem.diseasemodels.standard.DeterministicSIDiseaseModel;
 import org.eclipse.stem.diseasemodels.standard.DeterministicSIRDiseaseModel;
diff --git a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/META-INF/MANIFEST.MF
index 70c8f50a9..a1cb9c693 100644
--- a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/META-INF/MANIFEST.MF
@@ -5,6 +5,7 @@ Bundle-SymbolicName: org.eclipse.stem.internal.diseasemodels.models
 Bundle-Version: 1.4.1.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.core,
+ org.eclipse.stem.geography,
  org.eclipse.stem.data.geography,
  org.eclipse.stem.data.diseasemodels.models,
  org.eclipse.stem.diseasemodels,
diff --git a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/src/org/eclipse/stem/internal/data/specifications/DiseaseModelModelSpecification.java b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/src/org/eclipse/stem/internal/data/specifications/DiseaseModelModelSpecification.java
index 3a23d9ac8..f21101ac5 100644
--- a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/src/org/eclipse/stem/internal/data/specifications/DiseaseModelModelSpecification.java
+++ b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/src/org/eclipse/stem/internal/data/specifications/DiseaseModelModelSpecification.java
@@ -20,9 +20,9 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 import org.eclipse.stem.core.Utility;
 import org.eclipse.stem.core.model.Model;
 import org.eclipse.stem.core.model.ModelPackage;
-import org.eclipse.stem.data.geography.ISOKey;
 import org.eclipse.stem.diseasemodels.standard.DiseaseModel;
 import org.eclipse.stem.diseasemodels.standard.StandardPackage;
+import org.eclipse.stem.geography.names.ISOKey;
 import org.eclipse.stem.internal.data.generatedplugin.DublinCore;
 import org.eclipse.stem.internal.data.geography.specifications.AdminLevelSet;
 import org.eclipse.stem.internal.data.geography.specifications.CountryGraphPropertyFileSpecification;
diff --git a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/src/org/eclipse/stem/internal/diseasemodels/models/DiseaseModelModelGenerator.java b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/src/org/eclipse/stem/internal/diseasemodels/models/DiseaseModelModelGenerator.java
index 9c734096a..1c7b9cf05 100644
--- a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/src/org/eclipse/stem/internal/diseasemodels/models/DiseaseModelModelGenerator.java
+++ b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/src/org/eclipse/stem/internal/diseasemodels/models/DiseaseModelModelGenerator.java
@@ -25,10 +25,10 @@ import org.eclipse.stem.core.Constants;
 import org.eclipse.stem.core.Utility;
 import org.eclipse.stem.core.common.Identifiable;
 import org.eclipse.stem.core.model.ModelPackage;
-import org.eclipse.stem.data.geography.ISOKey;
 import org.eclipse.stem.diseasemodels.standard.AggregatingSIDiseaseModel;
 import org.eclipse.stem.diseasemodels.standard.DiseaseModel;
 import org.eclipse.stem.diseasemodels.standard.StandardPackage;
+import org.eclipse.stem.geography.names.ISOKey;
 import org.eclipse.stem.internal.data.ModelGenerator;
 import org.eclipse.stem.internal.data.PluginFileGenerator;
 import org.eclipse.stem.internal.data.generatedplugin.DublinCore;
diff --git a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/update.xml b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/update.xml
index 4aa5fa396..47a7f1f99 100644
--- a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/update.xml
+++ b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/update.xml
@@ -95,6 +95,7 @@
 		<pathelement location="${path.sourceplugin}/${targetBin}" />
 		<pathelement location="${pluginRootDirectory}/${ID_ROOT}.core/${targetBin}" />
 		<pathelement location="${pluginRootDirectory}/${ID_ROOT}.definitions/${targetBin}" />
+		<pathelement location="${pluginRootDirectory}/${ID_ROOT}.geography/${targetBin}" />
 	    <pathelement location="${pluginRootDirectory}/${ID_ROOT}.internal.data/${targetBin}" />
 		<pathelement location="${pluginRootDirectory}/${ID_ROOT}.internal.data.geography/${targetBin}" />
 		<pathelement location="${pluginRootDirectory}/${ID_ROOT}.internal.data.geography.models/${targetBin}" />
diff --git a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/META-INF/MANIFEST.MF
index 9a2ad2a55..e8ac59796 100644
--- a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.core,
  org.eclipse.stem.diseasemodels,
  org.eclipse.stem.diseases,
+ org.eclipse.stem.geography,
  org.eclipse.stem.data.geography,
  org.eclipse.stem.data.geography.population.human,
  org.eclipse.stem.data.geography.population.human.models,
diff --git a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/src/org/eclipse/stem/internal/data/specifications/DiseaseModelScenarioSpecification.java b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/src/org/eclipse/stem/internal/data/specifications/DiseaseModelScenarioSpecification.java
index dacd1433f..32a29aab3 100644
--- a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/src/org/eclipse/stem/internal/data/specifications/DiseaseModelScenarioSpecification.java
+++ b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/src/org/eclipse/stem/internal/data/specifications/DiseaseModelScenarioSpecification.java
@@ -38,11 +38,11 @@ import org.eclipse.stem.core.scenario.ScenarioFactory;
 import org.eclipse.stem.core.scenario.ScenarioPackage;
 import org.eclipse.stem.core.sequencer.Sequencer;
 import org.eclipse.stem.core.sequencer.SequencerFactory;
-import org.eclipse.stem.data.geography.ISOKey;
 import org.eclipse.stem.diseasemodels.standard.DiseaseModel;
 import org.eclipse.stem.diseasemodels.standard.SIInfector;
 import org.eclipse.stem.diseasemodels.standard.StandardFactory;
 import org.eclipse.stem.diseasemodels.standard.StandardPackage;
+import org.eclipse.stem.geography.names.ISOKey;
 import org.eclipse.stem.internal.data.generatedplugin.DublinCore;
 import org.eclipse.stem.internal.data.geography.specifications.AdminLevelSet;
 import org.eclipse.stem.internal.data.geography.specifications.CountryGraphPropertyFileSpecification;
diff --git a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/src/org/eclipse/stem/internal/diseasemodels/scenarios/DiseaseModelScenarioGenerator.java b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/src/org/eclipse/stem/internal/diseasemodels/scenarios/DiseaseModelScenarioGenerator.java
index e77574df5..8e30a4ca9 100644
--- a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/src/org/eclipse/stem/internal/diseasemodels/scenarios/DiseaseModelScenarioGenerator.java
+++ b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/src/org/eclipse/stem/internal/diseasemodels/scenarios/DiseaseModelScenarioGenerator.java
@@ -23,8 +23,8 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 import org.eclipse.stem.core.Constants;
 import org.eclipse.stem.core.model.ModelPackage;
-import org.eclipse.stem.data.geography.ISOKey;
 import org.eclipse.stem.diseasemodels.standard.StandardPackage;
+import org.eclipse.stem.geography.names.ISOKey;
 import org.eclipse.stem.internal.data.ModelGenerator;
 import org.eclipse.stem.internal.data.PluginFileGenerator;
 import org.eclipse.stem.internal.data.generatedplugin.DublinCore;
diff --git a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/update.xml b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/update.xml
index 3b81ad094..d6003aecd 100644
--- a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/update.xml
+++ b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/update.xml
@@ -95,6 +95,7 @@
 		<pathelement location="${path.sourceplugin}/${targetBin}" />
 		<pathelement location="${pluginRootDirectory}/${ID_ROOT}.core/${targetBin}" />
 		<pathelement location="${pluginRootDirectory}/${ID_ROOT}.definitions/${targetBin}" />
+		<pathelement location="${pluginRootDirectory}/${ID_ROOT}.geography/${targetBin}" />
 	    <pathelement location="${pluginRootDirectory}/${ID_ROOT}.internal.data/${targetBin}" />
 		<pathelement location="${pluginRootDirectory}/${ID_ROOT}.internal.data.geography/${targetBin}" />
 		<pathelement location="${pluginRootDirectory}/${ID_ROOT}.internal.data.geography.models/${targetBin}" />
diff --git a/models/epidemiology/org.eclipse.stem.interventions/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.interventions/META-INF/MANIFEST.MF
index fa7f9d6f6..c1c44c8c0 100644
--- a/models/epidemiology/org.eclipse.stem.interventions/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.interventions/META-INF/MANIFEST.MF
@@ -19,5 +19,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore.edit;visibility:=reexport,
  org.eclipse.stem.graphgenerators;visibility:=reexport,
  org.eclipse.stem.definitions,
- org.eclipse.stem.data.geography
+ org.eclipse.stem.geography
 Bundle-ActivationPolicy: lazy
diff --git a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/ControlGraphGenerator.java b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/ControlGraphGenerator.java
index 355c21e4a..bdf3c99ed 100644
--- a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/ControlGraphGenerator.java
+++ b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/ControlGraphGenerator.java
@@ -11,8 +11,8 @@ package org.eclipse.stem.interventions;
  *     IBM Corporation - initial API and implementation 
  *******************************************************************************/
 
-import org.eclipse.emf.common.util.URI;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.stem.graphgenerators.GraphGenerator;
 
 /**
diff --git a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/InterventionsPackage.java b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/InterventionsPackage.java
index 4c2e1a554..6b4bb1237 100644
--- a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/InterventionsPackage.java
+++ b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/InterventionsPackage.java
@@ -14,7 +14,6 @@ package org.eclipse.stem.interventions;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.stem.core.graph.GraphPackage;
 import org.eclipse.stem.graphgenerators.GraphgeneratorsPackage;
 
diff --git a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/ControlGraphGeneratorImpl.java b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/ControlGraphGeneratorImpl.java
index db73b72bb..250b8954b 100644
--- a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/ControlGraphGeneratorImpl.java
+++ b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/ControlGraphGeneratorImpl.java
@@ -16,12 +16,10 @@ import java.util.Calendar;
 import java.util.Iterator;
 import java.util.Set;
 
-
 import org.eclipse.core.resources.IProject;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.stem.core.STEMURI;
 import org.eclipse.stem.core.common.DublinCore;
@@ -33,7 +31,6 @@ import org.eclipse.stem.definitions.LocationUtility;
 import org.eclipse.stem.definitions.labels.PopulationLabel;
 import org.eclipse.stem.definitions.labels.PopulationLabelValue;
 import org.eclipse.stem.graphgenerators.impl.GraphGeneratorImpl;
-
 import org.eclipse.stem.interventions.ControlGraphGenerator;
 import org.eclipse.stem.interventions.InterventionsFactory;
 import org.eclipse.stem.interventions.InterventionsPackage;
diff --git a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionLabelImpl.java b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionLabelImpl.java
index 32ff52777..d9d62b082 100644
--- a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionLabelImpl.java
+++ b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionLabelImpl.java
@@ -12,9 +12,7 @@ package org.eclipse.stem.interventions.impl;
  *******************************************************************************/
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.stem.core.graph.impl.StaticNodeLabelImpl;
-
 import org.eclipse.stem.interventions.InterventionLabel;
 import org.eclipse.stem.interventions.InterventionsPackage;
 
diff --git a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionLabelValueImpl.java b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionLabelValueImpl.java
index 6de967c45..326c45a0c 100644
--- a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionLabelValueImpl.java
+++ b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionLabelValueImpl.java
@@ -12,9 +12,7 @@ package org.eclipse.stem.interventions.impl;
  *******************************************************************************/
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.stem.core.graph.impl.LabelValueImpl;
-
 import org.eclipse.stem.interventions.InterventionLabelValue;
 import org.eclipse.stem.interventions.InterventionsPackage;
 
diff --git a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionsFactoryImpl.java b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionsFactoryImpl.java
index 04626036a..59b2b3a58 100644
--- a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionsFactoryImpl.java
+++ b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionsFactoryImpl.java
@@ -14,12 +14,13 @@ package org.eclipse.stem.interventions.impl;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.stem.interventions.*;
+import org.eclipse.stem.interventions.ControlGraphGenerator;
+import org.eclipse.stem.interventions.InterventionsFactory;
+import org.eclipse.stem.interventions.InterventionsPackage;
+import org.eclipse.stem.interventions.StandardInterventionLabel;
+import org.eclipse.stem.interventions.StandardInterventionLabelValue;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionsPackageImpl.java b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionsPackageImpl.java
index 3cfc7e52e..d8145a802 100644
--- a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionsPackageImpl.java
+++ b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionsPackageImpl.java
@@ -15,15 +15,10 @@ import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EcorePackage;
-
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
 import org.eclipse.stem.core.common.CommonPackage;
-
 import org.eclipse.stem.core.graph.GraphPackage;
-
 import org.eclipse.stem.core.predicate.PredicatePackage;
-
 import org.eclipse.stem.graphgenerators.GraphgeneratorsPackage;
 import org.eclipse.stem.interventions.ControlGraphGenerator;
 import org.eclipse.stem.interventions.InterventionLabel;
diff --git a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/StandardInterventionLabelImpl.java b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/StandardInterventionLabelImpl.java
index eda81ee7a..97ee4ee41 100644
--- a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/StandardInterventionLabelImpl.java
+++ b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/StandardInterventionLabelImpl.java
@@ -12,11 +12,8 @@ package org.eclipse.stem.interventions.impl;
  *******************************************************************************/
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.stem.interventions.InterventionsPackage;
 import org.eclipse.stem.interventions.StandardInterventionLabel;
 
diff --git a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/StandardInterventionLabelValueImpl.java b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/StandardInterventionLabelValueImpl.java
index 64c12b2d3..411f88af9 100644
--- a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/StandardInterventionLabelValueImpl.java
+++ b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/StandardInterventionLabelValueImpl.java
@@ -12,11 +12,8 @@ package org.eclipse.stem.interventions.impl;
  *******************************************************************************/
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.stem.interventions.InterventionsPackage;
 import org.eclipse.stem.interventions.StandardInterventionLabelValue;
 
diff --git a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/ControlGraphGeneratorItemProvider.java b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/ControlGraphGeneratorItemProvider.java
index abf4f6472..57f3aca1f 100644
--- a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/ControlGraphGeneratorItemProvider.java
+++ b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/ControlGraphGeneratorItemProvider.java
@@ -18,10 +18,8 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -29,7 +27,6 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.stem.graphgenerators.provider.GraphGeneratorItemProvider;
diff --git a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionLabelItemProvider.java b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionLabelItemProvider.java
index 1ef7fb720..4aba9c432 100644
--- a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionLabelItemProvider.java
+++ b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionLabelItemProvider.java
@@ -17,19 +17,15 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
 import org.eclipse.stem.core.graph.provider.StaticNodeLabelItemProvider;
-
 import org.eclipse.stem.interventions.InterventionLabel;
 
 /**
diff --git a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionLabelValueItemProvider.java b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionLabelValueItemProvider.java
index 76f8396ee..dd70eff6f 100644
--- a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionLabelValueItemProvider.java
+++ b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionLabelValueItemProvider.java
@@ -17,16 +17,13 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
 import org.eclipse.stem.core.graph.provider.LabelValueItemProvider;
 
 /**
diff --git a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionsEditPlugin.java b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionsEditPlugin.java
index a6653789d..a26238bef 100644
--- a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionsEditPlugin.java
+++ b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionsEditPlugin.java
@@ -13,11 +13,8 @@ package org.eclipse.stem.interventions.provider;
 
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.common.EMFPlugin;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
 import org.eclipse.stem.core.common.provider.CoreEditPlugin;
 import org.eclipse.stem.graphgenerators.provider.GraphgeneratorEditPlugin;
 import org.osgi.framework.Bundle;
diff --git a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionsItemProviderAdapterFactory.java b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionsItemProviderAdapterFactory.java
index 01dc8f21a..e0318e20a 100644
--- a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionsItemProviderAdapterFactory.java
+++ b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionsItemProviderAdapterFactory.java
@@ -13,10 +13,10 @@ package org.eclipse.stem.interventions.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
+
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.Notifier;
-
 import org.eclipse.emf.edit.provider.ChangeNotifier;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -28,7 +28,6 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
 import org.eclipse.stem.interventions.util.InterventionsAdapterFactory;
 
 /**
diff --git a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/StandardInterventionLabelItemProvider.java b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/StandardInterventionLabelItemProvider.java
index f5228a15d..16958b1b2 100644
--- a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/StandardInterventionLabelItemProvider.java
+++ b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/StandardInterventionLabelItemProvider.java
@@ -17,9 +17,7 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -29,8 +27,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.stem.data.geography.GeographicNames;
+import org.eclipse.stem.geography.names.GeographicNames;
 import org.eclipse.stem.interventions.InterventionsPackage;
 import org.eclipse.stem.interventions.StandardInterventionLabel;
 
diff --git a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/StandardInterventionLabelValueItemProvider.java b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/StandardInterventionLabelValueItemProvider.java
index 0585be2e8..cc61ca096 100644
--- a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/StandardInterventionLabelValueItemProvider.java
+++ b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/StandardInterventionLabelValueItemProvider.java
@@ -17,7 +17,6 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -27,7 +26,6 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.stem.interventions.InterventionsPackage;
 import org.eclipse.stem.interventions.StandardInterventionLabelValue;
 
diff --git a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/util/InterventionsAdapterFactory.java b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/util/InterventionsAdapterFactory.java
index 5dbb8480d..695051155 100644
--- a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/util/InterventionsAdapterFactory.java
+++ b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/util/InterventionsAdapterFactory.java
@@ -13,11 +13,8 @@ package org.eclipse.stem.interventions.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
-
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.stem.core.common.Identifiable;
 import org.eclipse.stem.core.common.SanityChecker;
 import org.eclipse.stem.core.graph.Label;
@@ -27,7 +24,12 @@ import org.eclipse.stem.core.graph.StaticLabel;
 import org.eclipse.stem.core.graph.StaticNodeLabel;
 import org.eclipse.stem.core.modifier.Modifiable;
 import org.eclipse.stem.graphgenerators.GraphGenerator;
-import org.eclipse.stem.interventions.*;
+import org.eclipse.stem.interventions.ControlGraphGenerator;
+import org.eclipse.stem.interventions.InterventionLabel;
+import org.eclipse.stem.interventions.InterventionLabelValue;
+import org.eclipse.stem.interventions.InterventionsPackage;
+import org.eclipse.stem.interventions.StandardInterventionLabel;
+import org.eclipse.stem.interventions.StandardInterventionLabelValue;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/util/InterventionsSwitch.java b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/util/InterventionsSwitch.java
index d4893a11a..cac7d4c84 100644
--- a/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/util/InterventionsSwitch.java
+++ b/models/epidemiology/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/util/InterventionsSwitch.java
@@ -15,7 +15,6 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.stem.core.common.Identifiable;
 import org.eclipse.stem.core.common.SanityChecker;
 import org.eclipse.stem.core.graph.Label;
@@ -25,7 +24,12 @@ import org.eclipse.stem.core.graph.StaticLabel;
 import org.eclipse.stem.core.graph.StaticNodeLabel;
 import org.eclipse.stem.core.modifier.Modifiable;
 import org.eclipse.stem.graphgenerators.GraphGenerator;
-import org.eclipse.stem.interventions.*;
+import org.eclipse.stem.interventions.ControlGraphGenerator;
+import org.eclipse.stem.interventions.InterventionLabel;
+import org.eclipse.stem.interventions.InterventionLabelValue;
+import org.eclipse.stem.interventions.InterventionsPackage;
+import org.eclipse.stem.interventions.StandardInterventionLabel;
+import org.eclipse.stem.interventions.StandardInterventionLabelValue;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.ui.diseasemodels/META-INF/MANIFEST.MF
index 1b7ef5ac1..147aea38d 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Export-Package: org.eclipse.stem.diseasemodels.standard.presentation,
  org.eclipse.stem.ui.wizards
 Require-Bundle: org.eclipse.stem.diseasemodels;visibility:=reexport,
  org.eclipse.stem.ui,
- org.eclipse.stem.data.geography,
+ org.eclipse.stem.geography,
  org.eclipse.ui.navigator,
  org.eclipse.ui.navigator.resources,
  org.eclipse.emf.ecore.edit,
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/presentation/DiseasemodelsEditorAdvisor.java b/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/presentation/DiseasemodelsEditorAdvisor.java
index 9e2775064..bb1b8ca60 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/presentation/DiseasemodelsEditorAdvisor.java
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/presentation/DiseasemodelsEditorAdvisor.java
@@ -21,8 +21,6 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.common.util.UniqueEList;
 import org.eclipse.emf.edit.ui.action.LoadResourceAction;
 import org.eclipse.emf.edit.ui.util.EditUIUtil;
-import org.eclipse.stem.diseasemodels.standard.presentation.DiseasemodelsEditorPlugin;
-import org.eclipse.stem.diseasemodels.predicates.diseasepredicates.presentation.DiseasepredicatesEditor;
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.equinox.app.IApplicationContext;
 import org.eclipse.jface.action.GroupMarker;
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/presentation/DiseasemodelsEditorPlugin.java b/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/presentation/DiseasemodelsEditorPlugin.java
index b964defd5..48da6b08d 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/presentation/DiseasemodelsEditorPlugin.java
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/diseasemodels/standard/presentation/DiseasemodelsEditorPlugin.java
@@ -14,11 +14,9 @@ package org.eclipse.stem.diseasemodels.standard.presentation;
 import org.eclipse.emf.common.EMFPlugin;
 import org.eclipse.emf.common.ui.EclipseUIPlugin;
 import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.stem.core.common.provider.CoreEditPlugin;
 import org.eclipse.stem.definitions.edges.provider.DefinitionsEditPlugin;
-import org.eclipse.stem.populationmodels.standard.provider.StandardEditPlugin;
 import org.eclipse.stem.ui.diseasemodels.ISharedImages;
 import org.eclipse.stem.ui.wizards.StandardDiseaseModelPropertyEditorAdapterFactory;
 import org.eclipse.stem.ui.wizards.StandardPropertyStringProviderAdapterFactory;
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/ui/wizards/ISOKeyPicker.java b/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/ui/wizards/ISOKeyPicker.java
index e5e06a7f4..54c943e65 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/ui/wizards/ISOKeyPicker.java
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/ui/wizards/ISOKeyPicker.java
@@ -16,7 +16,7 @@ import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.stem.data.geography.GeographicNames;
+import org.eclipse.stem.geography.names.GeographicNames;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/ui/wizards/NewExternalDataSourceDiseaseInitializerPage.java b/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/ui/wizards/NewExternalDataSourceDiseaseInitializerPage.java
index efd02cde5..83620e478 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/ui/wizards/NewExternalDataSourceDiseaseInitializerPage.java
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels/src/org/eclipse/stem/ui/wizards/NewExternalDataSourceDiseaseInitializerPage.java
@@ -11,14 +11,7 @@
 
 package org.eclipse.stem.ui.wizards;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.common.util.EList;
diff --git a/models/populations/org.eclipse.stem.populationmodels/META-INF/MANIFEST.MF b/models/populations/org.eclipse.stem.populationmodels/META-INF/MANIFEST.MF
index 46abb3386..149866460 100644
--- a/models/populations/org.eclipse.stem.populationmodels/META-INF/MANIFEST.MF
+++ b/models/populations/org.eclipse.stem.populationmodels/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore.edit,

  org.eclipse.stem.definitions,

  org.eclipse.stem.transport,

- org.eclipse.stem.data.geography,

+ org.eclipse.stem.geography,

  org.eclipse.stem.analysis

 Bundle-ActivationPolicy: lazy

 Export-Package: org.eclipse.stem.populationmodels;

diff --git a/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/impl/SeasonalPopulationModelImpl.java b/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/impl/SeasonalPopulationModelImpl.java
index 63388c4ac..8cbd2a2b8 100644
--- a/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/impl/SeasonalPopulationModelImpl.java
+++ b/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/impl/SeasonalPopulationModelImpl.java
@@ -17,11 +17,11 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.stem.core.graph.DynamicLabel;
 import org.eclipse.stem.core.graph.Node;
 import org.eclipse.stem.core.model.STEMTime;
-import org.eclipse.stem.data.geography.centers.GeographicCenters;
 import org.eclipse.stem.definitions.adapters.spatial.geo.LatLongProvider;
 import org.eclipse.stem.definitions.adapters.spatial.geo.LatLongProviderAdapter;
 import org.eclipse.stem.definitions.adapters.spatial.geo.LatLongProviderAdapterFactory;
 import org.eclipse.stem.definitions.nodes.impl.RegionImpl;
+import org.eclipse.stem.geography.centers.GeographicCenters;
 import org.eclipse.stem.populationmodels.Activator;
 import org.eclipse.stem.populationmodels.standard.SeasonalPopulationModel;
 import org.eclipse.stem.populationmodels.standard.StandardPackage;
diff --git a/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/impl/StandardFactoryImpl.java b/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/impl/StandardFactoryImpl.java
index 599bde4f5..eb71906d0 100644
--- a/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/impl/StandardFactoryImpl.java
+++ b/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/impl/StandardFactoryImpl.java
@@ -16,7 +16,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.stem.populationmodels.standard.*;

 import org.eclipse.stem.populationmodels.standard.AgeGroup;

 import org.eclipse.stem.populationmodels.standard.AgingPopulationModel;

 import org.eclipse.stem.populationmodels.standard.DemographicPopulationModel;

diff --git a/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/provider/ExternalDataSourcePopulationInitializerItemProvider.java b/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/provider/ExternalDataSourcePopulationInitializerItemProvider.java
index b0e2c21a2..15e137335 100644
--- a/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/provider/ExternalDataSourcePopulationInitializerItemProvider.java
+++ b/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/provider/ExternalDataSourcePopulationInitializerItemProvider.java
@@ -17,7 +17,6 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
diff --git a/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/provider/PopulationInitializerItemProvider.java b/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/provider/PopulationInitializerItemProvider.java
index 499a43f5a..db5aa5f51 100644
--- a/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/provider/PopulationInitializerItemProvider.java
+++ b/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/provider/PopulationInitializerItemProvider.java
@@ -18,7 +18,6 @@ import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
diff --git a/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/util/StandardAdapterFactory.java b/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/util/StandardAdapterFactory.java
index c390ae15f..dc3199305 100644
--- a/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/util/StandardAdapterFactory.java
+++ b/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/util/StandardAdapterFactory.java
@@ -29,7 +29,6 @@ import org.eclipse.stem.core.model.Decorator;
 import org.eclipse.stem.core.model.IntegrationDecorator;

 import org.eclipse.stem.core.model.NodeDecorator;

 import org.eclipse.stem.core.modifier.Modifiable;

-import org.eclipse.stem.populationmodels.standard.*;

 import org.eclipse.stem.populationmodels.standard.AgeGroup;

 import org.eclipse.stem.populationmodels.standard.AgingPopulationModel;

 import org.eclipse.stem.populationmodels.standard.DemographicPopulationModel;

diff --git a/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/util/StandardSwitch.java b/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/util/StandardSwitch.java
index 0a5ab357a..ccb342dc2 100644
--- a/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/util/StandardSwitch.java
+++ b/models/populations/org.eclipse.stem.populationmodels/src/org/eclipse/stem/populationmodels/standard/util/StandardSwitch.java
@@ -29,7 +29,6 @@ import org.eclipse.stem.core.model.Decorator;
 import org.eclipse.stem.core.model.IntegrationDecorator;

 import org.eclipse.stem.core.model.NodeDecorator;

 import org.eclipse.stem.core.modifier.Modifiable;

-import org.eclipse.stem.populationmodels.standard.*;

 import org.eclipse.stem.populationmodels.standard.AgeGroup;

 import org.eclipse.stem.populationmodels.standard.AgingPopulationModel;

 import org.eclipse.stem.populationmodels.standard.DemographicPopulationModel;

diff --git a/models/populations/org.eclipse.stem.ui.populationmodels/META-INF/MANIFEST.MF b/models/populations/org.eclipse.stem.ui.populationmodels/META-INF/MANIFEST.MF
index 6ad725ded..7a6708a4f 100644
--- a/models/populations/org.eclipse.stem.ui.populationmodels/META-INF/MANIFEST.MF
+++ b/models/populations/org.eclipse.stem.ui.populationmodels/META-INF/MANIFEST.MF
@@ -20,6 +20,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.core;visibility:=reexport,

  org.eclipse.emf.ecore.edit;visibility:=reexport,

  org.eclipse.stem.ui,

- org.eclipse.stem.definitions,

- org.eclipse.stem.data.geography

+ org.eclipse.stem.definitions

 Bundle-ActivationPolicy: lazy

diff --git a/tests/org.eclipse.stem.tests.ui/META-INF/MANIFEST.MF b/tests/org.eclipse.stem.tests.ui/META-INF/MANIFEST.MF
index aee8a8e30..b3489df68 100644
--- a/tests/org.eclipse.stem.tests.ui/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.stem.tests.ui/META-INF/MANIFEST.MF
@@ -9,8 +9,7 @@ Bundle-Localization: plugin
 Require-Bundle: org.eclipse.stem.tests.util,
  org.eclipse.stem.tests.core,
  org.eclipse.stem.ui,
- org.eclipse.stem.definitions,
- org.eclipse.stem.data.geography
+ org.eclipse.stem.definitions
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.stem.tests.ui,