simplify module names

e.g. taverna-gis-activiy
diff --git a/pom.xml b/pom.xml
index 170209b..283d755 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,10 +110,10 @@
 	</repositories>
 
 	<modules>
-		<module>apache-taverna-activity-gis-plugin</module>
-		<module>apache-taverna-activity-gis-activity</module>
-		<module>apache-taverna-activity-gis-activity-ui</module>
-		<module>taverna-gis-client</module>
+		<module>taverna-gis-plugin</module>
+		<module>taverna-gis-activity</module>
+		<module>taverna-gis-activity-ui</module>		
+		<module>taverna-gis-plugin</module>
 	</modules>
 
 </project>
diff --git a/apache-taverna-activity-gis-activity-ui/pom.xml b/taverna-gis-activity-ui/pom.xml
similarity index 100%
rename from apache-taverna-activity-gis-activity-ui/pom.xml
rename to taverna-gis-activity-ui/pom.xml
diff --git a/apache-taverna-activity-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/config/GisConfigurationPanel.java b/taverna-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/config/GisConfigurationPanel.java
similarity index 100%
rename from apache-taverna-activity-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/config/GisConfigurationPanel.java
rename to taverna-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/config/GisConfigurationPanel.java
diff --git a/apache-taverna-activity-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/config/GisConfigureAction.java b/taverna-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/config/GisConfigureAction.java
similarity index 100%
rename from apache-taverna-activity-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/config/GisConfigureAction.java
rename to taverna-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/config/GisConfigureAction.java
diff --git a/apache-taverna-activity-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/menu/GisConfigureMenuAction.java b/taverna-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/menu/GisConfigureMenuAction.java
similarity index 100%
rename from apache-taverna-activity-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/menu/GisConfigureMenuAction.java
rename to taverna-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/menu/GisConfigureMenuAction.java
diff --git a/apache-taverna-activity-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceDesc.java b/taverna-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceDesc.java
similarity index 100%
rename from apache-taverna-activity-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceDesc.java
rename to taverna-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceDesc.java
diff --git a/apache-taverna-activity-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceIcon.java b/taverna-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceIcon.java
similarity index 100%
rename from apache-taverna-activity-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceIcon.java
rename to taverna-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceIcon.java
diff --git a/apache-taverna-activity-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceProvider.java b/taverna-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceProvider.java
similarity index 100%
rename from apache-taverna-activity-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceProvider.java
rename to taverna-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceProvider.java
diff --git a/apache-taverna-activity-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/view/GisActivityContextViewFactory.java b/taverna-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/view/GisActivityContextViewFactory.java
similarity index 100%
rename from apache-taverna-activity-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/view/GisActivityContextViewFactory.java
rename to taverna-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/view/GisActivityContextViewFactory.java
diff --git a/apache-taverna-activity-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/view/GisContextualView.java b/taverna-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/view/GisContextualView.java
similarity index 100%
rename from apache-taverna-activity-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/view/GisContextualView.java
rename to taverna-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/view/GisContextualView.java
diff --git a/apache-taverna-activity-gis-activity-ui/src/main/resources/META-INF/spring/context-osgi.xml b/taverna-gis-activity-ui/src/main/resources/META-INF/spring/context-osgi.xml
similarity index 100%
rename from apache-taverna-activity-gis-activity-ui/src/main/resources/META-INF/spring/context-osgi.xml
rename to taverna-gis-activity-ui/src/main/resources/META-INF/spring/context-osgi.xml
diff --git a/apache-taverna-activity-gis-activity-ui/src/main/resources/META-INF/spring/context.xml b/taverna-gis-activity-ui/src/main/resources/META-INF/spring/context.xml
similarity index 100%
rename from apache-taverna-activity-gis-activity-ui/src/main/resources/META-INF/spring/context.xml
rename to taverna-gis-activity-ui/src/main/resources/META-INF/spring/context.xml
diff --git a/apache-taverna-activity-gis-activity-ui/src/main/resources/exampleIcon.png b/taverna-gis-activity-ui/src/main/resources/exampleIcon.png
similarity index 100%
rename from apache-taverna-activity-gis-activity-ui/src/main/resources/exampleIcon.png
rename to taverna-gis-activity-ui/src/main/resources/exampleIcon.png
Binary files differ
diff --git a/apache-taverna-activity-gis-activity/pom.xml b/taverna-gis-activity/pom.xml
similarity index 100%
rename from apache-taverna-activity-gis-activity/pom.xml
rename to taverna-gis-activity/pom.xml
diff --git a/apache-taverna-activity-gis-activity/src/main/java/org/apache/taverna/gis/GisActivity.java b/taverna-gis-activity/src/main/java/org/apache/taverna/gis/GisActivity.java
similarity index 100%
rename from apache-taverna-activity-gis-activity/src/main/java/org/apache/taverna/gis/GisActivity.java
rename to taverna-gis-activity/src/main/java/org/apache/taverna/gis/GisActivity.java
diff --git a/apache-taverna-activity-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityConfigurationBean.java b/taverna-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityConfigurationBean.java
similarity index 100%
rename from apache-taverna-activity-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityConfigurationBean.java
rename to taverna-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityConfigurationBean.java
diff --git a/apache-taverna-activity-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityExample.java b/taverna-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityExample.java
similarity index 100%
rename from apache-taverna-activity-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityExample.java
rename to taverna-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityExample.java
diff --git a/apache-taverna-activity-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityFactory.java b/taverna-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityFactory.java
similarity index 100%
rename from apache-taverna-activity-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityFactory.java
rename to taverna-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityFactory.java
diff --git a/apache-taverna-activity-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityHealthChecker.java b/taverna-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityHealthChecker.java
similarity index 100%
rename from apache-taverna-activity-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityHealthChecker.java
rename to taverna-gis-activity/src/main/java/org/apache/taverna/gis/GisActivityHealthChecker.java
diff --git a/apache-taverna-activity-gis-activity/src/main/resources/schema.json b/taverna-gis-activity/src/main/resources/schema.json
similarity index 100%
rename from apache-taverna-activity-gis-activity/src/main/resources/schema.json
rename to taverna-gis-activity/src/main/resources/schema.json
diff --git a/apache-taverna-activity-gis-activity/src/main/resources/spring/context-osgi.xml b/taverna-gis-activity/src/main/resources/spring/context-osgi.xml
similarity index 100%
rename from apache-taverna-activity-gis-activity/src/main/resources/spring/context-osgi.xml
rename to taverna-gis-activity/src/main/resources/spring/context-osgi.xml
diff --git a/apache-taverna-activity-gis-activity/src/main/resources/spring/context.xml b/taverna-gis-activity/src/main/resources/spring/context.xml
similarity index 100%
rename from apache-taverna-activity-gis-activity/src/main/resources/spring/context.xml
rename to taverna-gis-activity/src/main/resources/spring/context.xml
diff --git a/apache-taverna-activity-gis-activity/src/main/resources/wps_config.xml b/taverna-gis-activity/src/main/resources/wps_config.xml
similarity index 100%
rename from apache-taverna-activity-gis-activity/src/main/resources/wps_config.xml
rename to taverna-gis-activity/src/main/resources/wps_config.xml
diff --git a/apache-taverna-activity-gis-activity/src/test/java/org/apache/taverna/gis/GisActivityFactoryTest.java b/taverna-gis-activity/src/test/java/org/apache/taverna/gis/GisActivityFactoryTest.java
similarity index 100%
rename from apache-taverna-activity-gis-activity/src/test/java/org/apache/taverna/gis/GisActivityFactoryTest.java
rename to taverna-gis-activity/src/test/java/org/apache/taverna/gis/GisActivityFactoryTest.java
diff --git a/apache-taverna-activity-gis-activity/src/test/java/org/apache/taverna/gis/GisActivityTest.java b/taverna-gis-activity/src/test/java/org/apache/taverna/gis/GisActivityTest.java
similarity index 100%
rename from apache-taverna-activity-gis-activity/src/test/java/org/apache/taverna/gis/GisActivityTest.java
rename to taverna-gis-activity/src/test/java/org/apache/taverna/gis/GisActivityTest.java
diff --git a/apache-taverna-activity-gis-plugin/pom.xml b/taverna-gis-plugin/pom.xml
similarity index 100%
rename from apache-taverna-activity-gis-plugin/pom.xml
rename to taverna-gis-plugin/pom.xml