Update some command plugin names


git-svn-id: https://svn.apache.org/repos/asf/geronimo/gshell/trunk@722771 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/gshell-assembly/src/main/underlay/etc/application.xml b/gshell-assembly/src/main/underlay/etc/application.xml
index adf8c48..131ae8b 100644
--- a/gshell-assembly/src/main/underlay/etc/application.xml
+++ b/gshell-assembly/src/main/underlay/etc/application.xml
@@ -77,31 +77,31 @@
             <list>
                 <bean class="org.apache.geronimo.gshell.artifact.Artifact">
                     <property name="group" value="org.apache.geronimo.gshell.commands"/>
-                    <property name="name" value="gshell-builtins"/>
+                    <property name="name" value="gshell-builtin"/>
                     <property name="version" value="${gshell.version}"/>
                 </bean>
 
                 <bean class="org.apache.geronimo.gshell.artifact.Artifact">
                     <property name="group" value="org.apache.geronimo.gshell.commands"/>
-                    <property name="name" value="gshell-shellutils"/>
+                    <property name="name" value="gshell-shell"/>
                     <property name="version" value="${gshell.version}"/>
                 </bean>
 
                 <bean class="org.apache.geronimo.gshell.artifact.Artifact">
                     <property name="group" value="org.apache.geronimo.gshell.commands"/>
-                    <property name="name" value="gshell-fileutils"/>
+                    <property name="name" value="gshell-file"/>
                     <property name="version" value="${gshell.version}"/>
                 </bean>
 
                 <bean class="org.apache.geronimo.gshell.artifact.Artifact">
                     <property name="group" value="org.apache.geronimo.gshell.commands"/>
-                    <property name="name" value="gshell-textutils"/>
+                    <property name="name" value="gshell-text"/>
                     <property name="version" value="${gshell.version}"/>
                 </bean>
 
                 <bean class="org.apache.geronimo.gshell.artifact.Artifact">
                     <property name="group" value="org.apache.geronimo.gshell.commands"/>
-                    <property name="name" value="gshell-netutils"/>
+                    <property name="name" value="gshell-network"/>
                     <property name="version" value="${gshell.version}"/>
                 </bean>
 
diff --git a/gshell-commands/gshell-builtins/pom.xml b/gshell-commands/gshell-builtin/pom.xml
similarity index 92%
rename from gshell-commands/gshell-builtins/pom.xml
rename to gshell-commands/gshell-builtin/pom.xml
index 727387a..50e5c40 100644
--- a/gshell-commands/gshell-builtins/pom.xml
+++ b/gshell-commands/gshell-builtin/pom.xml
@@ -30,11 +30,11 @@
         <version>1.0-alpha-2-SNAPSHOT</version>
     </parent>
     
-    <artifactId>gshell-builtins</artifactId>
-    <name>GShell Commands :: Builtins</name>
+    <artifactId>gshell-builtin</artifactId>
+    <name>GShell Commands :: Builtin</name>
     
     <description>
-        Provides the default "built-in" commands.
+        "Built-in" commands.
     </description>
 
     <dependencies>
diff --git a/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AboutAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/AboutAction.java
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AboutAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/AboutAction.java
diff --git a/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AliasAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/AliasAction.java
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AliasAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/AliasAction.java
diff --git a/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearAction.java
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearAction.java
diff --git a/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoAction.java
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoAction.java
diff --git a/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ExitAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/ExitAction.java
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/ExitAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/ExitAction.java
diff --git a/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpAction.java
diff --git a/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HistoryAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/HistoryAction.java
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/HistoryAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/HistoryAction.java
diff --git a/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetAction.java
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetAction.java
diff --git a/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceAction.java
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceAction.java
diff --git a/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.java
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.java
diff --git a/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetAction.java b/gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetAction.java
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetAction.java
rename to gshell-commands/gshell-builtin/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetAction.java
diff --git a/gshell-commands/gshell-builtins/src/main/resources/META-INF/gshell/components.xml b/gshell-commands/gshell-builtin/src/main/resources/META-INF/gshell/components.xml
similarity index 98%
rename from gshell-commands/gshell-builtins/src/main/resources/META-INF/gshell/components.xml
rename to gshell-commands/gshell-builtin/src/main/resources/META-INF/gshell/components.xml
index 3b36b4a..c11190e 100755
--- a/gshell-commands/gshell-builtins/src/main/resources/META-INF/gshell/components.xml
+++ b/gshell-commands/gshell-builtin/src/main/resources/META-INF/gshell/components.xml
@@ -31,7 +31,7 @@
        default-init-method="init"
        default-destroy-method="destroy">
 
-    <gshell:plugin name="gshell-builtins">
+    <gshell:plugin name="gshell-builtin">
         <gshell:command-bundle name="default">
             <gshell:command name="about">
                 <gshell:action class="org.apache.geronimo.gshell.commands.builtins.AboutAction">
diff --git a/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AboutAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AboutAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AboutAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AboutAction.properties
diff --git a/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AliasAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AliasAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AliasAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/AliasAction.properties
diff --git a/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ClearAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ClearAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ClearAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ClearAction.properties
diff --git a/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/EchoAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/EchoAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/EchoAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/EchoAction.properties
diff --git a/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ExitAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ExitAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ExitAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/ExitAction.properties
diff --git a/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HelpAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HelpAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HelpAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HelpAction.properties
diff --git a/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HistoryAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HistoryAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HistoryAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/HistoryAction.properties
diff --git a/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SetAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SetAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SetAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SetAction.properties
diff --git a/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SourceAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SourceAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SourceAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/SourceAction.properties
diff --git a/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnaliasAction.properties
diff --git a/gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnsetAction.properties b/gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnsetAction.properties
similarity index 100%
rename from gshell-commands/gshell-builtins/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnsetAction.properties
rename to gshell-commands/gshell-builtin/src/main/resources/org/apache/geronimo/gshell/commands/builtins/UnsetAction.properties
diff --git a/gshell-commands/gshell-fileutils/pom.xml b/gshell-commands/gshell-file/pom.xml
similarity index 92%
copy from gshell-commands/gshell-fileutils/pom.xml
copy to gshell-commands/gshell-file/pom.xml
index 8b90fa8..6e2b9c3 100644
--- a/gshell-commands/gshell-fileutils/pom.xml
+++ b/gshell-commands/gshell-file/pom.xml
@@ -30,11 +30,11 @@
         <version>1.0-alpha-2-SNAPSHOT</version>
     </parent>
 
-    <artifactId>gshell-fileutils</artifactId>
-    <name>GShell Commands :: File Utils</name>
+    <artifactId>gshell-file</artifactId>
+    <name>GShell Commands :: File</name>
 
     <description>
-        File utilities.
+        File commands.
     </description>
 
     <dependencies>
diff --git a/gshell-commands/gshell-fileutils/src/main/java/org/apache/geronimo/gshell/commands/fileutils/ChangeDirectoryAction.java b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/ChangeDirectoryAction.java
similarity index 100%
rename from gshell-commands/gshell-fileutils/src/main/java/org/apache/geronimo/gshell/commands/fileutils/ChangeDirectoryAction.java
rename to gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/ChangeDirectoryAction.java
diff --git a/gshell-commands/gshell-fileutils/src/main/java/org/apache/geronimo/gshell/commands/fileutils/CopyAction.java b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/CopyAction.java
similarity index 100%
rename from gshell-commands/gshell-fileutils/src/main/java/org/apache/geronimo/gshell/commands/fileutils/CopyAction.java
rename to gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/CopyAction.java
diff --git a/gshell-commands/gshell-fileutils/src/main/java/org/apache/geronimo/gshell/commands/fileutils/CurrentDirectoryAction.java b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/CurrentDirectoryAction.java
similarity index 100%
rename from gshell-commands/gshell-fileutils/src/main/java/org/apache/geronimo/gshell/commands/fileutils/CurrentDirectoryAction.java
rename to gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/CurrentDirectoryAction.java
diff --git a/gshell-commands/gshell-fileutils/src/main/java/org/apache/geronimo/gshell/commands/fileutils/FileInfoAction.java b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/FileInfoAction.java
similarity index 100%
rename from gshell-commands/gshell-fileutils/src/main/java/org/apache/geronimo/gshell/commands/fileutils/FileInfoAction.java
rename to gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/FileInfoAction.java
diff --git a/gshell-commands/gshell-fileutils/src/main/java/org/apache/geronimo/gshell/commands/fileutils/ListDirectoryAction.java b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/ListDirectoryAction.java
similarity index 100%
rename from gshell-commands/gshell-fileutils/src/main/java/org/apache/geronimo/gshell/commands/fileutils/ListDirectoryAction.java
rename to gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/ListDirectoryAction.java
diff --git a/gshell-commands/gshell-fileutils/src/main/java/org/apache/geronimo/gshell/commands/fileutils/RemoveAction.java b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/RemoveAction.java
similarity index 100%
rename from gshell-commands/gshell-fileutils/src/main/java/org/apache/geronimo/gshell/commands/fileutils/RemoveAction.java
rename to gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/RemoveAction.java
diff --git a/gshell-commands/gshell-fileutils/src/main/java/org/apache/geronimo/gshell/commands/fileutils/TouchAction.java b/gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/TouchAction.java
similarity index 100%
rename from gshell-commands/gshell-fileutils/src/main/java/org/apache/geronimo/gshell/commands/fileutils/TouchAction.java
rename to gshell-commands/gshell-file/src/main/java/org/apache/geronimo/gshell/commands/fileutils/TouchAction.java
diff --git a/gshell-commands/gshell-fileutils/src/main/resources/META-INF/gshell/components.xml b/gshell-commands/gshell-file/src/main/resources/META-INF/gshell/components.xml
similarity index 98%
rename from gshell-commands/gshell-fileutils/src/main/resources/META-INF/gshell/components.xml
rename to gshell-commands/gshell-file/src/main/resources/META-INF/gshell/components.xml
index 8f15c99..f2c7b4c 100644
--- a/gshell-commands/gshell-fileutils/src/main/resources/META-INF/gshell/components.xml
+++ b/gshell-commands/gshell-file/src/main/resources/META-INF/gshell/components.xml
@@ -35,7 +35,7 @@
         <property name="fileSystemAccess" ref="fileSystemAccess"/>
     </bean>
 
-    <gshell:plugin name="gshell-fileutils">
+    <gshell:plugin name="gshell-file">
         <gshell:command-bundle name="default">
             <gshell:command name="cd">
                 <gshell:action class="org.apache.geronimo.gshell.commands.fileutils.ChangeDirectoryAction" parent="vfsCommandActionTemplate"/>
diff --git a/gshell-commands/gshell-fileutils/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/ChangeDirectoryAction.properties b/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/ChangeDirectoryAction.properties
similarity index 100%
rename from gshell-commands/gshell-fileutils/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/ChangeDirectoryAction.properties
rename to gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/ChangeDirectoryAction.properties
diff --git a/gshell-commands/gshell-fileutils/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/CopyAction.properties b/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/CopyAction.properties
similarity index 100%
rename from gshell-commands/gshell-fileutils/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/CopyAction.properties
rename to gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/CopyAction.properties
diff --git a/gshell-commands/gshell-fileutils/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/CurrentDirectoryAction.properties b/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/CurrentDirectoryAction.properties
similarity index 100%
rename from gshell-commands/gshell-fileutils/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/CurrentDirectoryAction.properties
rename to gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/CurrentDirectoryAction.properties
diff --git a/gshell-commands/gshell-fileutils/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/FileInfoAction.properties b/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/FileInfoAction.properties
similarity index 100%
rename from gshell-commands/gshell-fileutils/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/FileInfoAction.properties
rename to gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/FileInfoAction.properties
diff --git a/gshell-commands/gshell-fileutils/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/ListDirectoryAction.properties b/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/ListDirectoryAction.properties
similarity index 100%
rename from gshell-commands/gshell-fileutils/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/ListDirectoryAction.properties
rename to gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/ListDirectoryAction.properties
diff --git a/gshell-commands/gshell-fileutils/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/RemoveAction.properties b/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/RemoveAction.properties
similarity index 100%
rename from gshell-commands/gshell-fileutils/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/RemoveAction.properties
rename to gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/RemoveAction.properties
diff --git a/gshell-commands/gshell-fileutils/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/TouchAction.properties b/gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/TouchAction.properties
similarity index 100%
rename from gshell-commands/gshell-fileutils/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/TouchAction.properties
rename to gshell-commands/gshell-file/src/main/resources/org/apache/geronimo/gshell/commands/fileutils/TouchAction.properties
diff --git a/gshell-commands/gshell-netutils/pom.xml b/gshell-commands/gshell-netutils/pom.xml
deleted file mode 100644
index 2b90de4..0000000
--- a/gshell-commands/gshell-netutils/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-     http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    
-    <modelVersion>4.0.0</modelVersion>
-    
-    <parent>
-        <groupId>org.apache.geronimo.gshell.commands</groupId>
-        <artifactId>gshell-commands</artifactId>
-        <version>1.0-alpha-2-SNAPSHOT</version>
-    </parent>
-    
-    <artifactId>gshell-netutils</artifactId>
-    <name>GShell Commands :: Network Utilities</name>
-    
-    <description>
-        Network utilities.
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.gshell.support</groupId>
-            <artifactId>gshell-vfs</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/gshell-commands/gshell-fileutils/pom.xml b/gshell-commands/gshell-network/pom.xml
similarity index 92%
rename from gshell-commands/gshell-fileutils/pom.xml
rename to gshell-commands/gshell-network/pom.xml
index 8b90fa8..ea56544 100644
--- a/gshell-commands/gshell-fileutils/pom.xml
+++ b/gshell-commands/gshell-network/pom.xml
@@ -29,12 +29,12 @@
         <artifactId>gshell-commands</artifactId>
         <version>1.0-alpha-2-SNAPSHOT</version>
     </parent>
-
-    <artifactId>gshell-fileutils</artifactId>
-    <name>GShell Commands :: File Utils</name>
-
+    
+    <artifactId>gshell-network</artifactId>
+    <name>GShell Commands :: Network</name>
+    
     <description>
-        File utilities.
+        Network commands.
     </description>
 
     <dependencies>
diff --git a/gshell-commands/gshell-netutils/src/main/java/org/apache/geronimo/gshell/commands/netutils/HostnameAction.java b/gshell-commands/gshell-network/src/main/java/org/apache/geronimo/gshell/commands/netutils/HostnameAction.java
similarity index 100%
rename from gshell-commands/gshell-netutils/src/main/java/org/apache/geronimo/gshell/commands/netutils/HostnameAction.java
rename to gshell-commands/gshell-network/src/main/java/org/apache/geronimo/gshell/commands/netutils/HostnameAction.java
diff --git a/gshell-commands/gshell-netutils/src/main/resources/META-INF/gshell/components.xml b/gshell-commands/gshell-network/src/main/resources/META-INF/gshell/components.xml
similarity index 97%
rename from gshell-commands/gshell-netutils/src/main/resources/META-INF/gshell/components.xml
rename to gshell-commands/gshell-network/src/main/resources/META-INF/gshell/components.xml
index 13ff6f1..ab4e009 100644
--- a/gshell-commands/gshell-netutils/src/main/resources/META-INF/gshell/components.xml
+++ b/gshell-commands/gshell-network/src/main/resources/META-INF/gshell/components.xml
@@ -31,7 +31,7 @@
        default-init-method="init"
        default-destroy-method="destroy">
 
-    <gshell:plugin name="gshell-netutils">
+    <gshell:plugin name="gshell-network">
         <gshell:command-bundle name="default">
             <gshell:command name="hostname">
                 <gshell:action class="org.apache.geronimo.gshell.commands.netutils.HostnameAction"/>
diff --git a/gshell-commands/gshell-netutils/src/main/resources/org/apache/geronimo/gshell/commands/netutils/HostnameAction.properties b/gshell-commands/gshell-network/src/main/resources/org/apache/geronimo/gshell/commands/netutils/HostnameAction.properties
similarity index 100%
rename from gshell-commands/gshell-netutils/src/main/resources/org/apache/geronimo/gshell/commands/netutils/HostnameAction.properties
rename to gshell-commands/gshell-network/src/main/resources/org/apache/geronimo/gshell/commands/netutils/HostnameAction.properties
diff --git a/gshell-commands/gshell-fileutils/pom.xml b/gshell-commands/gshell-shell/pom.xml
similarity index 92%
copy from gshell-commands/gshell-fileutils/pom.xml
copy to gshell-commands/gshell-shell/pom.xml
index 8b90fa8..6d3789d 100644
--- a/gshell-commands/gshell-fileutils/pom.xml
+++ b/gshell-commands/gshell-shell/pom.xml
@@ -29,12 +29,12 @@
         <artifactId>gshell-commands</artifactId>
         <version>1.0-alpha-2-SNAPSHOT</version>
     </parent>
-
-    <artifactId>gshell-fileutils</artifactId>
-    <name>GShell Commands :: File Utils</name>
-
+    
+    <artifactId>gshell-shell</artifactId>
+    <name>GShell Commands :: Shell</name>
+    
     <description>
-        File utilities.
+        Shell commands.
     </description>
 
     <dependencies>
diff --git a/gshell-commands/gshell-shellutils/src/main/java/org/apache/geronimo/gshell/commands/shellutils/DateAction.java b/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/DateAction.java
similarity index 100%
rename from gshell-commands/gshell-shellutils/src/main/java/org/apache/geronimo/gshell/commands/shellutils/DateAction.java
rename to gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/DateAction.java
diff --git a/gshell-commands/gshell-shellutils/src/main/java/org/apache/geronimo/gshell/commands/shellutils/EditAction.java b/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/EditAction.java
similarity index 100%
rename from gshell-commands/gshell-shellutils/src/main/java/org/apache/geronimo/gshell/commands/shellutils/EditAction.java
rename to gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/EditAction.java
diff --git a/gshell-commands/gshell-shellutils/src/main/java/org/apache/geronimo/gshell/commands/shellutils/ExecuteAction.java b/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/ExecuteAction.java
similarity index 100%
rename from gshell-commands/gshell-shellutils/src/main/java/org/apache/geronimo/gshell/commands/shellutils/ExecuteAction.java
rename to gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/ExecuteAction.java
diff --git a/gshell-commands/gshell-shellutils/src/main/java/org/apache/geronimo/gshell/commands/shellutils/FindAction.java b/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/FindAction.java
similarity index 100%
rename from gshell-commands/gshell-shellutils/src/main/java/org/apache/geronimo/gshell/commands/shellutils/FindAction.java
rename to gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/FindAction.java
diff --git a/gshell-commands/gshell-shellutils/src/main/java/org/apache/geronimo/gshell/commands/shellutils/JavaAction.java b/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/JavaAction.java
similarity index 100%
rename from gshell-commands/gshell-shellutils/src/main/java/org/apache/geronimo/gshell/commands/shellutils/JavaAction.java
rename to gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/JavaAction.java
diff --git a/gshell-commands/gshell-shellutils/src/main/java/org/apache/geronimo/gshell/commands/shellutils/SleepAction.java b/gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/SleepAction.java
similarity index 100%
rename from gshell-commands/gshell-shellutils/src/main/java/org/apache/geronimo/gshell/commands/shellutils/SleepAction.java
rename to gshell-commands/gshell-shell/src/main/java/org/apache/geronimo/gshell/commands/shellutils/SleepAction.java
diff --git a/gshell-commands/gshell-shellutils/src/main/resources/META-INF/gshell/components.xml b/gshell-commands/gshell-shell/src/main/resources/META-INF/gshell/components.xml
similarity index 98%
rename from gshell-commands/gshell-shellutils/src/main/resources/META-INF/gshell/components.xml
rename to gshell-commands/gshell-shell/src/main/resources/META-INF/gshell/components.xml
index 476f4d2..3c5880b 100644
--- a/gshell-commands/gshell-shellutils/src/main/resources/META-INF/gshell/components.xml
+++ b/gshell-commands/gshell-shell/src/main/resources/META-INF/gshell/components.xml
@@ -35,7 +35,7 @@
         <property name="fileSystemAccess" ref="fileSystemAccess"/>
     </bean>
     
-    <gshell:plugin name="gshell-shellutils">
+    <gshell:plugin name="gshell-shell">
         <gshell:command-bundle name="default">
             <gshell:command name="exec">
                 <gshell:action class="org.apache.geronimo.gshell.commands.shellutils.ExecuteAction"/>
diff --git a/gshell-commands/gshell-shellutils/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/DateAction.properties b/gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/DateAction.properties
similarity index 100%
rename from gshell-commands/gshell-shellutils/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/DateAction.properties
rename to gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/DateAction.properties
diff --git a/gshell-commands/gshell-shellutils/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/EditAction.properties b/gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/EditAction.properties
similarity index 100%
rename from gshell-commands/gshell-shellutils/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/EditAction.properties
rename to gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/EditAction.properties
diff --git a/gshell-commands/gshell-shellutils/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/ExecuteAction.properties b/gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/ExecuteAction.properties
similarity index 100%
rename from gshell-commands/gshell-shellutils/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/ExecuteAction.properties
rename to gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/ExecuteAction.properties
diff --git a/gshell-commands/gshell-shellutils/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/FindAction.properties b/gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/FindAction.properties
similarity index 100%
rename from gshell-commands/gshell-shellutils/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/FindAction.properties
rename to gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/FindAction.properties
diff --git a/gshell-commands/gshell-shellutils/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/JavaAction.properties b/gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/JavaAction.properties
similarity index 100%
rename from gshell-commands/gshell-shellutils/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/JavaAction.properties
rename to gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/JavaAction.properties
diff --git a/gshell-commands/gshell-shellutils/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/SleepAction.properties b/gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/SleepAction.properties
similarity index 100%
rename from gshell-commands/gshell-shellutils/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/SleepAction.properties
rename to gshell-commands/gshell-shell/src/main/resources/org/apache/geronimo/gshell/commands/shellutils/SleepAction.properties
diff --git a/gshell-commands/gshell-shellutils/pom.xml b/gshell-commands/gshell-shellutils/pom.xml
deleted file mode 100644
index b14d641..0000000
--- a/gshell-commands/gshell-shellutils/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-     http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    
-    <modelVersion>4.0.0</modelVersion>
-    
-    <parent>
-        <groupId>org.apache.geronimo.gshell.commands</groupId>
-        <artifactId>gshell-commands</artifactId>
-        <version>1.0-alpha-2-SNAPSHOT</version>
-    </parent>
-    
-    <artifactId>gshell-shellutils</artifactId>
-    <name>GShell Commands :: Shell Utilities</name>
-    
-    <description>
-        Shell Utilities.
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.gshell.support</groupId>
-            <artifactId>gshell-vfs</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/gshell-commands/gshell-fileutils/pom.xml b/gshell-commands/gshell-text/pom.xml
similarity index 92%
copy from gshell-commands/gshell-fileutils/pom.xml
copy to gshell-commands/gshell-text/pom.xml
index 8b90fa8..510eb8d 100644
--- a/gshell-commands/gshell-fileutils/pom.xml
+++ b/gshell-commands/gshell-text/pom.xml
@@ -29,12 +29,12 @@
         <artifactId>gshell-commands</artifactId>
         <version>1.0-alpha-2-SNAPSHOT</version>
     </parent>
-
-    <artifactId>gshell-fileutils</artifactId>
-    <name>GShell Commands :: File Utils</name>
-
+    
+    <artifactId>gshell-text</artifactId>
+    <name>GShell Commands :: Text</name>
+    
     <description>
-        File utilities.
+        Text commands.
     </description>
 
     <dependencies>
diff --git a/gshell-commands/gshell-textutils/src/main/java/org/apache/geronimo/gshell/commands/textutils/CatAction.java b/gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/textutils/CatAction.java
similarity index 100%
rename from gshell-commands/gshell-textutils/src/main/java/org/apache/geronimo/gshell/commands/textutils/CatAction.java
rename to gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/textutils/CatAction.java
diff --git a/gshell-commands/gshell-textutils/src/main/java/org/apache/geronimo/gshell/commands/textutils/GrepAction.java b/gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/textutils/GrepAction.java
similarity index 100%
rename from gshell-commands/gshell-textutils/src/main/java/org/apache/geronimo/gshell/commands/textutils/GrepAction.java
rename to gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/textutils/GrepAction.java
diff --git a/gshell-commands/gshell-textutils/src/main/java/org/apache/geronimo/gshell/commands/textutils/PrintfAction.java b/gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/textutils/PrintfAction.java
similarity index 100%
rename from gshell-commands/gshell-textutils/src/main/java/org/apache/geronimo/gshell/commands/textutils/PrintfAction.java
rename to gshell-commands/gshell-text/src/main/java/org/apache/geronimo/gshell/commands/textutils/PrintfAction.java
diff --git a/gshell-commands/gshell-textutils/src/main/resources/META-INF/gshell/components.xml b/gshell-commands/gshell-text/src/main/resources/META-INF/gshell/components.xml
similarity index 98%
rename from gshell-commands/gshell-textutils/src/main/resources/META-INF/gshell/components.xml
rename to gshell-commands/gshell-text/src/main/resources/META-INF/gshell/components.xml
index 8df9d3c..719618c 100644
--- a/gshell-commands/gshell-textutils/src/main/resources/META-INF/gshell/components.xml
+++ b/gshell-commands/gshell-text/src/main/resources/META-INF/gshell/components.xml
@@ -35,7 +35,7 @@
         <property name="fileSystemAccess" ref="fileSystemAccess"/>
     </bean>
     
-    <gshell:plugin name="gshell-optional">
+    <gshell:plugin name="gshell-text">
         <gshell:command-bundle name="default">
             <gshell:command name="printf">
                 <gshell:action class="org.apache.geronimo.gshell.commands.textutils.PrintfAction"/>
diff --git a/gshell-commands/gshell-textutils/src/main/resources/org/apache/geronimo/gshell/commands/textutils/CatAction.properties b/gshell-commands/gshell-text/src/main/resources/org/apache/geronimo/gshell/commands/textutils/CatAction.properties
similarity index 100%
rename from gshell-commands/gshell-textutils/src/main/resources/org/apache/geronimo/gshell/commands/textutils/CatAction.properties
rename to gshell-commands/gshell-text/src/main/resources/org/apache/geronimo/gshell/commands/textutils/CatAction.properties
diff --git a/gshell-commands/gshell-textutils/src/main/resources/org/apache/geronimo/gshell/commands/textutils/GrepAction.properties b/gshell-commands/gshell-text/src/main/resources/org/apache/geronimo/gshell/commands/textutils/GrepAction.properties
similarity index 100%
rename from gshell-commands/gshell-textutils/src/main/resources/org/apache/geronimo/gshell/commands/textutils/GrepAction.properties
rename to gshell-commands/gshell-text/src/main/resources/org/apache/geronimo/gshell/commands/textutils/GrepAction.properties
diff --git a/gshell-commands/gshell-textutils/src/main/resources/org/apache/geronimo/gshell/commands/textutils/PrintfAction.properties b/gshell-commands/gshell-text/src/main/resources/org/apache/geronimo/gshell/commands/textutils/PrintfAction.properties
similarity index 100%
rename from gshell-commands/gshell-textutils/src/main/resources/org/apache/geronimo/gshell/commands/textutils/PrintfAction.properties
rename to gshell-commands/gshell-text/src/main/resources/org/apache/geronimo/gshell/commands/textutils/PrintfAction.properties
diff --git a/gshell-commands/gshell-textutils/pom.xml b/gshell-commands/gshell-textutils/pom.xml
deleted file mode 100644
index 4d0a93b..0000000
--- a/gshell-commands/gshell-textutils/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-     http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    
-    <modelVersion>4.0.0</modelVersion>
-    
-    <parent>
-        <groupId>org.apache.geronimo.gshell.commands</groupId>
-        <artifactId>gshell-commands</artifactId>
-        <version>1.0-alpha-2-SNAPSHOT</version>
-    </parent>
-    
-    <artifactId>gshell-textutils</artifactId>
-    <name>GShell Commands :: Text Utilities</name>
-    
-    <description>
-        Text Utilities.
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.gshell.support</groupId>
-            <artifactId>gshell-vfs</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/gshell-commands/pom.xml b/gshell-commands/pom.xml
index 6ea5e48..bf8c4e1 100644
--- a/gshell-commands/pom.xml
+++ b/gshell-commands/pom.xml
@@ -57,12 +57,12 @@
     </dependencies>
 
     <modules>
-        <module>gshell-builtins</module>
+        <module>gshell-builtin</module>
         <module>gshell-admin</module>
-        <module>gshell-fileutils</module>
-        <module>gshell-netutils</module>
-        <module>gshell-shellutils</module>
-        <module>gshell-textutils</module>
+        <module>gshell-file</module>
+        <module>gshell-network</module>
+        <module>gshell-shell</module>
+        <module>gshell-text</module>
         <module>gshell-repository</module>
         <module>gshell-bsf</module>
         <module>gshell-log4j</module>
diff --git a/pom.xml b/pom.xml
index 2c00bc3..b38de17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -332,7 +332,7 @@
             
             <dependency>
                 <groupId>org.apache.geronimo.gshell.commands</groupId>
-                <artifactId>gshell-builtins</artifactId>
+                <artifactId>gshell-builtin</artifactId>
                 <version>1.0-alpha-2-SNAPSHOT</version>
             </dependency>
 
@@ -356,25 +356,25 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.gshell.commands</groupId>
-                <artifactId>gshell-fileutils</artifactId>
+                <artifactId>gshell-file</artifactId>
                 <version>1.0-alpha-2-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.gshell.commands</groupId>
-                <artifactId>gshell-netutils</artifactId>
+                <artifactId>gshell-network</artifactId>
                 <version>1.0-alpha-2-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.gshell.commands</groupId>
-                <artifactId>gshell-shellutils</artifactId>
+                <artifactId>gshell-shell</artifactId>
                 <version>1.0-alpha-2-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.gshell.commands</groupId>
-                <artifactId>gshell-textutils</artifactId>
+                <artifactId>gshell-text</artifactId>
                 <version>1.0-alpha-2-SNAPSHOT</version>
             </dependency>