diff --git a/wsexample/server/src/main/java/com/google/gson/wsexample/server/MainServlet.java b/wsexample/server/src/main/java/com/google/gson/wsexample/server/MainServlet.java
index 12b6c11d..ffbc62a2 100644
--- a/wsexample/server/src/main/java/com/google/gson/wsexample/server/MainServlet.java
+++ b/wsexample/server/src/main/java/com/google/gson/wsexample/server/MainServlet.java
@@ -31,8 +31,8 @@ import com.google.gson.webservice.definition.procedural.ResponseSpec;
 import com.google.gson.webservice.definition.procedural.WebServiceCallSpec;
 import com.google.gson.webservice.definition.procedural.WebServiceRequest;
 import com.google.gson.webservice.definition.procedural.WebServiceResponse;
-import com.google.gson.wsf.server.RequestReceiver;
-import com.google.gson.wsf.server.ResponseSender;
+import com.google.gson.wsf.server.procedural.RequestReceiver;
+import com.google.gson.wsf.server.procedural.ResponseSender;
 
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
diff --git a/wsf/src/main/java/com/google/gson/wsf/inject/server/WebServiceCallServerProvider.java b/wsf/src/main/java/com/google/gson/wsf/inject/server/procedural/WebServiceCallServerProvider.java
similarity index 89%
rename from wsf/src/main/java/com/google/gson/wsf/inject/server/WebServiceCallServerProvider.java
rename to wsf/src/main/java/com/google/gson/wsf/inject/server/procedural/WebServiceCallServerProvider.java
index a8ced929..b79e4178 100755
--- a/wsf/src/main/java/com/google/gson/wsf/inject/server/WebServiceCallServerProvider.java
+++ b/wsf/src/main/java/com/google/gson/wsf/inject/server/procedural/WebServiceCallServerProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.gson.wsf.inject.server;
+package com.google.gson.wsf.inject.server.procedural;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -22,8 +22,8 @@ import com.google.gson.webservice.definition.procedural.WebServiceCall;
 import com.google.gson.webservice.definition.procedural.WebServiceCallSpec;
 import com.google.gson.webservice.definition.procedural.WebServiceRequest;
 import com.google.gson.webservice.definition.procedural.WebServiceResponse;
-import com.google.gson.wsf.server.RequestReceiver;
-import com.google.gson.wsf.server.WebServiceCallServerBuilder;
+import com.google.gson.wsf.server.procedural.RequestReceiver;
+import com.google.gson.wsf.server.procedural.WebServiceCallServerBuilder;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 
diff --git a/wsf/src/main/java/com/google/gson/wsf/inject/WebServiceCallSpecProvider.java b/wsf/src/main/java/com/google/gson/wsf/inject/server/procedural/WebServiceCallSpecProvider.java
similarity index 93%
rename from wsf/src/main/java/com/google/gson/wsf/inject/WebServiceCallSpecProvider.java
rename to wsf/src/main/java/com/google/gson/wsf/inject/server/procedural/WebServiceCallSpecProvider.java
index 982d7814..51113c57 100755
--- a/wsf/src/main/java/com/google/gson/wsf/inject/WebServiceCallSpecProvider.java
+++ b/wsf/src/main/java/com/google/gson/wsf/inject/server/procedural/WebServiceCallSpecProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.gson.wsf.inject;
+package com.google.gson.wsf.inject.server.procedural;
 
 import com.google.gson.webservice.definition.CallPath;
 import com.google.gson.webservice.definition.procedural.WebServiceCallSpec;
diff --git a/wsf/src/main/java/com/google/gson/wsf/server/RequestReceiver.java b/wsf/src/main/java/com/google/gson/wsf/server/procedural/RequestReceiver.java
similarity index 98%
rename from wsf/src/main/java/com/google/gson/wsf/server/RequestReceiver.java
rename to wsf/src/main/java/com/google/gson/wsf/server/procedural/RequestReceiver.java
index 47089126..a8feec0e 100644
--- a/wsf/src/main/java/com/google/gson/wsf/server/RequestReceiver.java
+++ b/wsf/src/main/java/com/google/gson/wsf/server/procedural/RequestReceiver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.gson.wsf.server;
+package com.google.gson.wsf.server.procedural;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/wsf/src/main/java/com/google/gson/wsf/server/ResponseBuilder.java b/wsf/src/main/java/com/google/gson/wsf/server/procedural/ResponseBuilder.java
similarity index 93%
rename from wsf/src/main/java/com/google/gson/wsf/server/ResponseBuilder.java
rename to wsf/src/main/java/com/google/gson/wsf/server/procedural/ResponseBuilder.java
index a5f253b3..d3a59a6b 100644
--- a/wsf/src/main/java/com/google/gson/wsf/server/ResponseBuilder.java
+++ b/wsf/src/main/java/com/google/gson/wsf/server/procedural/ResponseBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.gson.wsf.server;
+package com.google.gson.wsf.server.procedural;
 
 import com.google.gson.webservice.definition.procedural.WebServiceCallSpec;
 import com.google.gson.webservice.definition.procedural.WebServiceRequest;
diff --git a/wsf/src/main/java/com/google/gson/wsf/server/ResponseSender.java b/wsf/src/main/java/com/google/gson/wsf/server/procedural/ResponseSender.java
similarity index 98%
rename from wsf/src/main/java/com/google/gson/wsf/server/ResponseSender.java
rename to wsf/src/main/java/com/google/gson/wsf/server/procedural/ResponseSender.java
index 451e8d67..7afe69d5 100644
--- a/wsf/src/main/java/com/google/gson/wsf/server/ResponseSender.java
+++ b/wsf/src/main/java/com/google/gson/wsf/server/procedural/ResponseSender.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.gson.wsf.server;
+package com.google.gson.wsf.server.procedural;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
diff --git a/wsf/src/main/java/com/google/gson/wsf/server/WebServiceCallServerBuilder.java b/wsf/src/main/java/com/google/gson/wsf/server/procedural/WebServiceCallServerBuilder.java
similarity index 93%
rename from wsf/src/main/java/com/google/gson/wsf/server/WebServiceCallServerBuilder.java
rename to wsf/src/main/java/com/google/gson/wsf/server/procedural/WebServiceCallServerBuilder.java
index f04f1c21..b3ba944e 100644
--- a/wsf/src/main/java/com/google/gson/wsf/server/WebServiceCallServerBuilder.java
+++ b/wsf/src/main/java/com/google/gson/wsf/server/procedural/WebServiceCallServerBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.gson.wsf.server;
+package com.google.gson.wsf.server.procedural;
 
 import com.google.gson.webservice.definition.procedural.WebServiceCallSpec;
 import com.google.gson.webservice.definition.procedural.WebServiceRequest;