diff --git a/library/server/wsf/router/wsf_caching_policy.e b/library/server/wsf/router/policy/wsf_caching_policy.e
similarity index 100%
rename from library/server/wsf/router/wsf_caching_policy.e
rename to library/server/wsf/router/policy/wsf_caching_policy.e
diff --git a/library/server/wsf/router/wsf_delete_helper.e b/library/server/wsf/router/policy/wsf_delete_helper.e
similarity index 100%
rename from library/server/wsf/router/wsf_delete_helper.e
rename to library/server/wsf/router/policy/wsf_delete_helper.e
diff --git a/library/server/wsf/router/wsf_get_helper.e b/library/server/wsf/router/policy/wsf_get_helper.e
similarity index 100%
rename from library/server/wsf/router/wsf_get_helper.e
rename to library/server/wsf/router/policy/wsf_get_helper.e
diff --git a/library/server/wsf/router/wsf_method_helper.e b/library/server/wsf/router/policy/wsf_method_helper.e
similarity index 100%
rename from library/server/wsf/router/wsf_method_helper.e
rename to library/server/wsf/router/policy/wsf_method_helper.e
diff --git a/library/server/wsf/router/wsf_method_helper_factory.e b/library/server/wsf/router/policy/wsf_method_helper_factory.e
similarity index 100%
rename from library/server/wsf/router/wsf_method_helper_factory.e
rename to library/server/wsf/router/policy/wsf_method_helper_factory.e
diff --git a/library/server/wsf/router/wsf_no_proxy_policy.e b/library/server/wsf/router/policy/wsf_no_proxy_policy.e
similarity index 100%
rename from library/server/wsf/router/wsf_no_proxy_policy.e
rename to library/server/wsf/router/policy/wsf_no_proxy_policy.e
diff --git a/library/server/wsf/router/wsf_options_policy.e b/library/server/wsf/router/policy/wsf_options_policy.e
similarity index 100%
rename from library/server/wsf/router/wsf_options_policy.e
rename to library/server/wsf/router/policy/wsf_options_policy.e
diff --git a/library/server/wsf/router/wsf_post_helper.e b/library/server/wsf/router/policy/wsf_post_helper.e
similarity index 100%
rename from library/server/wsf/router/wsf_post_helper.e
rename to library/server/wsf/router/policy/wsf_post_helper.e
diff --git a/library/server/wsf/router/wsf_previous_policy.e b/library/server/wsf/router/policy/wsf_previous_policy.e
similarity index 100%
rename from library/server/wsf/router/wsf_previous_policy.e
rename to library/server/wsf/router/policy/wsf_previous_policy.e
diff --git a/library/server/wsf/router/wsf_proxy_use_policy.e b/library/server/wsf/router/policy/wsf_proxy_use_policy.e
similarity index 100%
rename from library/server/wsf/router/wsf_proxy_use_policy.e
rename to library/server/wsf/router/policy/wsf_proxy_use_policy.e
diff --git a/library/server/wsf/router/wsf_put_helper.e b/library/server/wsf/router/policy/wsf_put_helper.e
similarity index 100%
rename from library/server/wsf/router/wsf_put_helper.e
rename to library/server/wsf/router/policy/wsf_put_helper.e
diff --git a/library/server/wsf/router/wsf_routed_skeleton_service.e b/library/server/wsf/router/policy/wsf_routed_skeleton_service.e
similarity index 100%
rename from library/server/wsf/router/wsf_routed_skeleton_service.e
rename to library/server/wsf/router/policy/wsf_routed_skeleton_service.e
diff --git a/library/server/wsf/router/wsf_skeleton_handler.e b/library/server/wsf/router/policy/wsf_skeleton_handler.e
similarity index 100%
rename from library/server/wsf/router/wsf_skeleton_handler.e
rename to library/server/wsf/router/policy/wsf_skeleton_handler.e
diff --git a/library/server/wsf/router/wsf_system_options_access_policy.e b/library/server/wsf/router/policy/wsf_system_options_access_policy.e
similarity index 100%
rename from library/server/wsf/router/wsf_system_options_access_policy.e
rename to library/server/wsf/router/policy/wsf_system_options_access_policy.e