diff --git a/taverna-activity-palette-ui/src/main/java/org/apache/taverna/workbench/ui/servicepanel/ServicePanel.java b/taverna-activity-palette-ui/src/main/java/org/apache/taverna/workbench/ui/servicepanel/ServicePanel.java
index e95869f..69f7bce 100644
--- a/taverna-activity-palette-ui/src/main/java/org/apache/taverna/workbench/ui/servicepanel/ServicePanel.java
+++ b/taverna-activity-palette-ui/src/main/java/org/apache/taverna/workbench/ui/servicepanel/ServicePanel.java
@@ -61,7 +61,7 @@
 
 import org.apache.log4j.Logger;
 
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 
 /**
  * A panel of available services
diff --git a/taverna-activity-palette-ui/src/main/java/org/apache/taverna/workbench/ui/servicepanel/ServicePanelComponentFactory.java b/taverna-activity-palette-ui/src/main/java/org/apache/taverna/workbench/ui/servicepanel/ServicePanelComponentFactory.java
index 1bd92a5..86c7cc9 100644
--- a/taverna-activity-palette-ui/src/main/java/org/apache/taverna/workbench/ui/servicepanel/ServicePanelComponentFactory.java
+++ b/taverna-activity-palette-ui/src/main/java/org/apache/taverna/workbench/ui/servicepanel/ServicePanelComponentFactory.java
@@ -21,7 +21,7 @@
 
 import javax.swing.ImageIcon;
 
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 
 import org.apache.taverna.servicedescriptions.ServiceDescriptionRegistry;
 import org.apache.taverna.ui.menu.MenuManager;
diff --git a/taverna-activity-palette-ui/src/main/java/org/apache/taverna/workbench/ui/servicepanel/ServiceTreeClickListener.java b/taverna-activity-palette-ui/src/main/java/org/apache/taverna/workbench/ui/servicepanel/ServiceTreeClickListener.java
index 8109cdc..77f6665 100644
--- a/taverna-activity-palette-ui/src/main/java/org/apache/taverna/workbench/ui/servicepanel/ServiceTreeClickListener.java
+++ b/taverna-activity-palette-ui/src/main/java/org/apache/taverna/workbench/ui/servicepanel/ServiceTreeClickListener.java
@@ -63,7 +63,7 @@
 
 import org.apache.log4j.Logger;
 
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 
 /**
  * @author alanrw
diff --git a/taverna-activity-palette-ui/src/main/java/org/apache/taverna/workbench/ui/servicepanel/ServiceTreePanel.java b/taverna-activity-palette-ui/src/main/java/org/apache/taverna/workbench/ui/servicepanel/ServiceTreePanel.java
index 5d24027..d34ee5b 100644
--- a/taverna-activity-palette-ui/src/main/java/org/apache/taverna/workbench/ui/servicepanel/ServiceTreePanel.java
+++ b/taverna-activity-palette-ui/src/main/java/org/apache/taverna/workbench/ui/servicepanel/ServiceTreePanel.java
@@ -51,7 +51,7 @@
 
 import org.apache.log4j.Logger;
 
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 
 public class ServiceTreePanel extends TreePanel {
 	private static final long serialVersionUID = 6611462684296693909L;
diff --git a/taverna-activity-palette-ui/src/main/java/org/apache/taverna/workbench/ui/servicepanel/config/ServiceDescriptionConfigUIFactory.java b/taverna-activity-palette-ui/src/main/java/org/apache/taverna/workbench/ui/servicepanel/config/ServiceDescriptionConfigUIFactory.java
index a95b644..872fc50 100644
--- a/taverna-activity-palette-ui/src/main/java/org/apache/taverna/workbench/ui/servicepanel/config/ServiceDescriptionConfigUIFactory.java
+++ b/taverna-activity-palette-ui/src/main/java/org/apache/taverna/workbench/ui/servicepanel/config/ServiceDescriptionConfigUIFactory.java
@@ -20,9 +20,8 @@
 package org.apache.taverna.workbench.ui.servicepanel.config;
 
 import javax.swing.JPanel;
-
-import uk.org.taverna.configuration.Configurable;
-import uk.org.taverna.configuration.ConfigurationUIFactory;
+import org.apache.taverna.configuration.Configurable;
+import org.apache.taverna.configuration.ConfigurationUIFactory;
 
 import org.apache.taverna.servicedescriptions.ServiceDescriptionRegistry;
 import org.apache.taverna.servicedescriptions.ServiceDescriptionsConfiguration;
diff --git a/taverna-contextual-views-api/src/main/java/org/apache/taverna/workbench/ui/views/contextualviews/activity/ActivityConfigurationPanel.java b/taverna-contextual-views-api/src/main/java/org/apache/taverna/workbench/ui/views/contextualviews/activity/ActivityConfigurationPanel.java
index b0a6fa9..0e61ca2 100644
--- a/taverna-contextual-views-api/src/main/java/org/apache/taverna/workbench/ui/views/contextualviews/activity/ActivityConfigurationPanel.java
+++ b/taverna-contextual-views-api/src/main/java/org/apache/taverna/workbench/ui/views/contextualviews/activity/ActivityConfigurationPanel.java
@@ -28,9 +28,9 @@
 
 import org.apache.log4j.Logger;
 
-import org.apache.taverna.commons.services.ActivityTypeNotFoundException;
-import org.apache.taverna.commons.services.InvalidConfigurationException;
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ActivityTypeNotFoundException;
+import org.apache.taverna.services.InvalidConfigurationException;
+import org.apache.taverna.services.ServiceRegistry;
 import org.apache.taverna.scufl2.api.activity.Activity;
 import org.apache.taverna.scufl2.api.common.Scufl2Tools;
 import org.apache.taverna.scufl2.api.configurations.Configuration;
diff --git a/taverna-graph-view/src/main/java/org/apache/taverna/workbench/views/graph/GraphViewComponent.java b/taverna-graph-view/src/main/java/org/apache/taverna/workbench/views/graph/GraphViewComponent.java
index 4ec1a28..7e3f6aa 100644
--- a/taverna-graph-view/src/main/java/org/apache/taverna/workbench/views/graph/GraphViewComponent.java
+++ b/taverna-graph-view/src/main/java/org/apache/taverna/workbench/views/graph/GraphViewComponent.java
@@ -94,7 +94,7 @@
 import org.apache.batik.swing.gvt.GVTTreeRendererEvent;
 import org.apache.log4j.Logger;
 
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 import org.apache.taverna.scufl2.api.container.WorkflowBundle;
 import org.apache.taverna.scufl2.api.core.Workflow;
 
diff --git a/taverna-graph-view/src/main/java/org/apache/taverna/workbench/views/graph/GraphViewComponentFactory.java b/taverna-graph-view/src/main/java/org/apache/taverna/workbench/views/graph/GraphViewComponentFactory.java
index 3b0cff4..6271708 100644
--- a/taverna-graph-view/src/main/java/org/apache/taverna/workbench/views/graph/GraphViewComponentFactory.java
+++ b/taverna-graph-view/src/main/java/org/apache/taverna/workbench/views/graph/GraphViewComponentFactory.java
@@ -21,7 +21,7 @@
 
 import javax.swing.ImageIcon;
 
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 
 import org.apache.taverna.ui.menu.MenuManager;
 import org.apache.taverna.workbench.configuration.colour.ColourManager;
diff --git a/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/activityport/AddInputPortDefaultValueAction.java b/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/activityport/AddInputPortDefaultValueAction.java
index 74dfefb..0411e47 100644
--- a/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/activityport/AddInputPortDefaultValueAction.java
+++ b/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/activityport/AddInputPortDefaultValueAction.java
@@ -42,7 +42,7 @@
 
 import org.apache.log4j.Logger;
 
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 import org.apache.taverna.scufl2.api.activity.Activity;
 import org.apache.taverna.scufl2.api.configurations.Configuration;
 import org.apache.taverna.scufl2.api.core.DataLink;
diff --git a/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/activityport/SetConstantInputPortValueMenuAction.java b/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/activityport/SetConstantInputPortValueMenuAction.java
index 07213d9..29c06f5 100644
--- a/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/activityport/SetConstantInputPortValueMenuAction.java
+++ b/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/activityport/SetConstantInputPortValueMenuAction.java
@@ -25,7 +25,7 @@
 import org.apache.taverna.ui.menu.AbstractContextualMenuAction;
 import org.apache.taverna.workbench.edits.EditManager;
 import org.apache.taverna.workbench.selection.SelectionManager;
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 import org.apache.taverna.scufl2.api.core.Workflow;
 import org.apache.taverna.scufl2.api.port.InputProcessorPort;
 
diff --git a/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/activityport/SetDefaultInputPortValueAction.java b/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/activityport/SetDefaultInputPortValueAction.java
index 008ad65..1c72b8e 100644
--- a/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/activityport/SetDefaultInputPortValueAction.java
+++ b/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/activityport/SetDefaultInputPortValueAction.java
@@ -37,7 +37,7 @@
 import org.apache.taverna.workbench.selection.events.PerspectiveSelectionEvent;
 import org.apache.taverna.workbench.selection.events.SelectionManagerEvent;
 import org.apache.taverna.workbench.selection.events.WorkflowBundleSelectionEvent;
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 import org.apache.taverna.scufl2.api.common.Scufl2Tools;
 import org.apache.taverna.scufl2.api.container.WorkflowBundle;
 import org.apache.taverna.scufl2.api.port.InputProcessorPort;
diff --git a/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/contextualviews/PasteMenuAction.java b/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/contextualviews/PasteMenuAction.java
index 219be7c..e900807 100644
--- a/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/contextualviews/PasteMenuAction.java
+++ b/taverna-menu-items/src/main/java/org/apache/taverna/ui/menu/items/contextualviews/PasteMenuAction.java
@@ -29,7 +29,7 @@
 import org.apache.taverna.workbench.edits.EditManager;
 import org.apache.taverna.workbench.selection.SelectionManager;
 import org.apache.taverna.workbench.ui.actions.PasteGraphComponentAction;
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 import org.apache.taverna.scufl2.api.core.Workflow;
 
 public class PasteMenuAction extends AbstractContextualMenuAction {
diff --git a/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/actions/StringConstantActivityConfigurationAction.java b/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/actions/StringConstantActivityConfigurationAction.java
index 5a017e6..a335c0c 100644
--- a/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/actions/StringConstantActivityConfigurationAction.java
+++ b/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/actions/StringConstantActivityConfigurationAction.java
@@ -29,7 +29,7 @@
 import org.apache.taverna.workbench.file.FileManager;
 import org.apache.taverna.workbench.ui.actions.activity.ActivityConfigurationAction;
 import org.apache.taverna.workbench.ui.views.contextualviews.activity.ActivityConfigurationDialog;
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 import org.apache.taverna.scufl2.api.activity.Activity;
 
 public class StringConstantActivityConfigurationAction extends
diff --git a/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/menu/AddStringConstantTemplateAction.java b/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/menu/AddStringConstantTemplateAction.java
index 566d1b7..3219630 100644
--- a/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/menu/AddStringConstantTemplateAction.java
+++ b/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/menu/AddStringConstantTemplateAction.java
@@ -33,7 +33,7 @@
 import org.apache.taverna.workbench.activityicons.ActivityIconManager;
 import org.apache.taverna.workbench.edits.EditManager;
 import org.apache.taverna.workbench.selection.SelectionManager;
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 import org.apache.taverna.scufl2.api.core.Workflow;
 
 /**
diff --git a/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/menu/AddStringConstantTemplateMenuAction.java b/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/menu/AddStringConstantTemplateMenuAction.java
index 1efb80a..72771f5 100644
--- a/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/menu/AddStringConstantTemplateMenuAction.java
+++ b/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/menu/AddStringConstantTemplateMenuAction.java
@@ -38,7 +38,7 @@
 import org.apache.taverna.workbench.activityicons.ActivityIconManager;
 import org.apache.taverna.workbench.edits.EditManager;
 import org.apache.taverna.workbench.selection.SelectionManager;
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 
 /**
  * An action to add a string constant activity + a wrapping processor to the
diff --git a/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/menu/ConfigureStringConstantMenuAction.java b/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/menu/ConfigureStringConstantMenuAction.java
index f7d4cd3..123273f 100644
--- a/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/menu/ConfigureStringConstantMenuAction.java
+++ b/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/menu/ConfigureStringConstantMenuAction.java
@@ -32,7 +32,7 @@
 import org.apache.taverna.workbench.activitytools.AbstractConfigureActivityMenuAction;
 import org.apache.taverna.workbench.edits.EditManager;
 import org.apache.taverna.workbench.file.FileManager;
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 
 public class ConfigureStringConstantMenuAction extends
 		AbstractConfigureActivityMenuAction {
diff --git a/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/views/StringConstantActivityContextualView.java b/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/views/StringConstantActivityContextualView.java
index 07136fd..2ae2f24 100644
--- a/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/views/StringConstantActivityContextualView.java
+++ b/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/views/StringConstantActivityContextualView.java
@@ -33,7 +33,7 @@
 import org.apache.taverna.workbench.edits.EditManager;
 import org.apache.taverna.workbench.file.FileManager;
 import org.apache.taverna.workbench.ui.actions.activity.HTMLBasedActivityContextualView;
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 import org.apache.taverna.scufl2.api.activity.Activity;
 
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/views/StringConstantActivityViewFactory.java b/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/views/StringConstantActivityViewFactory.java
index 43b9c29..72f87b0 100644
--- a/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/views/StringConstantActivityViewFactory.java
+++ b/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/views/StringConstantActivityViewFactory.java
@@ -31,7 +31,7 @@
 import org.apache.taverna.workbench.file.FileManager;
 import org.apache.taverna.workbench.ui.views.contextualviews.ContextualView;
 import org.apache.taverna.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 import org.apache.taverna.scufl2.api.activity.Activity;
 
 public class StringConstantActivityViewFactory implements
diff --git a/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/views/StringConstantConfigView.java b/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/views/StringConstantConfigView.java
index 7c0e78c..1ed88cf 100644
--- a/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/views/StringConstantConfigView.java
+++ b/taverna-stringconstant-activity-ui/src/main/java/org/apache/taverna/activities/stringconstant/views/StringConstantConfigView.java
@@ -60,7 +60,7 @@
 
 import org.apache.log4j.Logger;
 
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 import org.apache.taverna.scufl2.api.activity.Activity;
 import org.apache.taverna.scufl2.api.configurations.Configuration;
 
diff --git a/taverna-workflow-explorer/src/main/java/org/apache/taverna/workbench/ui/workflowexplorer/WorkflowExplorer.java b/taverna-workflow-explorer/src/main/java/org/apache/taverna/workbench/ui/workflowexplorer/WorkflowExplorer.java
index 8c84d59..01d1c9f 100644
--- a/taverna-workflow-explorer/src/main/java/org/apache/taverna/workbench/ui/workflowexplorer/WorkflowExplorer.java
+++ b/taverna-workflow-explorer/src/main/java/org/apache/taverna/workbench/ui/workflowexplorer/WorkflowExplorer.java
@@ -79,7 +79,7 @@
 import org.apache.taverna.workbench.selection.events.WorkflowSelectionEvent;
 import org.apache.taverna.workbench.ui.dndhandler.ServiceTransferHandler;
 import org.apache.taverna.workbench.ui.zaria.UIComponentSPI;
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 import org.apache.taverna.scufl2.api.container.WorkflowBundle;
 import org.apache.taverna.scufl2.api.core.Workflow;
 
diff --git a/taverna-workflow-explorer/src/main/java/org/apache/taverna/workbench/ui/workflowexplorer/WorkflowExplorerFactory.java b/taverna-workflow-explorer/src/main/java/org/apache/taverna/workbench/ui/workflowexplorer/WorkflowExplorerFactory.java
index 197fa4c..e1d687d 100644
--- a/taverna-workflow-explorer/src/main/java/org/apache/taverna/workbench/ui/workflowexplorer/WorkflowExplorerFactory.java
+++ b/taverna-workflow-explorer/src/main/java/org/apache/taverna/workbench/ui/workflowexplorer/WorkflowExplorerFactory.java
@@ -21,7 +21,7 @@
 
 import javax.swing.ImageIcon;
 
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 
 import org.apache.taverna.ui.menu.MenuManager;
 import org.apache.taverna.workbench.activityicons.ActivityIconManager;
diff --git a/taverna-workflow-view/src/main/java/org/apache/taverna/workbench/ui/actions/PasteGraphComponentAction.java b/taverna-workflow-view/src/main/java/org/apache/taverna/workbench/ui/actions/PasteGraphComponentAction.java
index e47dd25..dceddd3 100644
--- a/taverna-workflow-view/src/main/java/org/apache/taverna/workbench/ui/actions/PasteGraphComponentAction.java
+++ b/taverna-workflow-view/src/main/java/org/apache/taverna/workbench/ui/actions/PasteGraphComponentAction.java
@@ -34,7 +34,7 @@
 import org.apache.taverna.ui.menu.MenuManager;
 import org.apache.taverna.workbench.edits.EditManager;
 import org.apache.taverna.workbench.selection.SelectionManager;
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 
 /**
  * An action that pastes a graph component
diff --git a/taverna-workflow-view/src/main/java/org/apache/taverna/workbench/ui/dndhandler/ServiceTransferHandler.java b/taverna-workflow-view/src/main/java/org/apache/taverna/workbench/ui/dndhandler/ServiceTransferHandler.java
index a0e6dd1..3d742f9 100644
--- a/taverna-workflow-view/src/main/java/org/apache/taverna/workbench/ui/dndhandler/ServiceTransferHandler.java
+++ b/taverna-workflow-view/src/main/java/org/apache/taverna/workbench/ui/dndhandler/ServiceTransferHandler.java
@@ -38,7 +38,7 @@
 
 import org.apache.log4j.Logger;
 
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 
 /**
  * TransferHandler for accepting ActivityAndBeanWrapper object dropped on the
diff --git a/taverna-workflow-view/src/main/java/org/apache/taverna/workbench/ui/menu/PasteGraphComponentMenuAction.java b/taverna-workflow-view/src/main/java/org/apache/taverna/workbench/ui/menu/PasteGraphComponentMenuAction.java
index d9f518e..4aa3d54 100644
--- a/taverna-workflow-view/src/main/java/org/apache/taverna/workbench/ui/menu/PasteGraphComponentMenuAction.java
+++ b/taverna-workflow-view/src/main/java/org/apache/taverna/workbench/ui/menu/PasteGraphComponentMenuAction.java
@@ -23,7 +23,7 @@
 
 import javax.swing.Action;
 
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 
 import org.apache.taverna.ui.menu.AbstractMenuAction;
 import org.apache.taverna.ui.menu.MenuManager;
diff --git a/taverna-workflow-view/src/main/java/org/apache/taverna/workbench/ui/toolbar/PasteToolbarAction.java b/taverna-workflow-view/src/main/java/org/apache/taverna/workbench/ui/toolbar/PasteToolbarAction.java
index 9e0e292..b4c18e7 100644
--- a/taverna-workflow-view/src/main/java/org/apache/taverna/workbench/ui/toolbar/PasteToolbarAction.java
+++ b/taverna-workflow-view/src/main/java/org/apache/taverna/workbench/ui/toolbar/PasteToolbarAction.java
@@ -23,7 +23,7 @@
 
 import javax.swing.Action;
 
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ServiceRegistry;
 
 import org.apache.taverna.ui.menu.AbstractMenuAction;
 import org.apache.taverna.ui.menu.MenuManager;
diff --git a/taverna-workflow-view/src/main/java/org/apache/taverna/workbench/ui/workflowview/WorkflowView.java b/taverna-workflow-view/src/main/java/org/apache/taverna/workbench/ui/workflowview/WorkflowView.java
index c54f5be..02f561b 100644
--- a/taverna-workflow-view/src/main/java/org/apache/taverna/workbench/ui/workflowview/WorkflowView.java
+++ b/taverna-workflow-view/src/main/java/org/apache/taverna/workbench/ui/workflowview/WorkflowView.java
@@ -58,9 +58,9 @@
 
 
 
-import org.apache.taverna.commons.services.ActivityTypeNotFoundException;
-import org.apache.taverna.commons.services.InvalidConfigurationException;
-import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.services.ActivityTypeNotFoundException;
+import org.apache.taverna.services.InvalidConfigurationException;
+import org.apache.taverna.services.ServiceRegistry;
 import org.apache.taverna.scufl2.api.activity.Activity;
 import org.apache.taverna.scufl2.api.common.Scufl2Tools;
 import org.apache.taverna.scufl2.api.configurations.Configuration;