refactored
diff --git a/impl/src/main/conf/META-INF/standard-faces-config-base.xml b/impl/src/main/conf/META-INF/standard-faces-config-base.xml
index a3a926a..c1669e4 100644
--- a/impl/src/main/conf/META-INF/standard-faces-config-base.xml
+++ b/impl/src/main/conf/META-INF/standard-faces-config-base.xml
@@ -48,6 +48,7 @@
<visit-context-factory>org.apache.myfaces.component.visit.VisitContextFactoryImpl</visit-context-factory>
<view-declaration-language-factory>org.apache.myfaces.view.ViewDeclarationLanguageFactoryImpl</view-declaration-language-factory>
<tag-handler-delegate-factory>org.apache.myfaces.view.facelets.tag.jsf.TagHandlerDelegateFactoryImpl</tag-handler-delegate-factory>
+ <client-window-factory>org.apache.myfaces.lifecycle.clientwindow.ClientWindowFactoryImpl</client-window-factory>
</factory>
<!-- behaviors by id -->
diff --git a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
index b1d0f51..c6242c7 100755
--- a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
+++ b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
@@ -99,7 +99,7 @@
import org.apache.myfaces.context.FacesContextFactoryImpl;
import org.apache.myfaces.context.PartialViewContextFactoryImpl;
import org.apache.myfaces.context.servlet.ServletFlashFactoryImpl;
-import org.apache.myfaces.lifecycle.ClientWindowFactoryImpl;
+import org.apache.myfaces.lifecycle.clientwindow.ClientWindowFactoryImpl;
import org.apache.myfaces.flow.FlowCallNodeImpl;
import org.apache.myfaces.flow.FlowHandlerFactoryImpl;
import org.apache.myfaces.flow.FlowImpl;
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/CODIClientSideWindow.java b/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/CODIClientSideWindow.java
similarity index 99%
rename from impl/src/main/java/org/apache/myfaces/lifecycle/CODIClientSideWindow.java
rename to impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/CODIClientSideWindow.java
index 0dbbf0c..58cc0d4 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/CODIClientSideWindow.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/CODIClientSideWindow.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.lifecycle;
+package org.apache.myfaces.lifecycle.clientwindow;
import org.apache.myfaces.util.token.TokenGenerator;
import java.io.BufferedReader;
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/ClientConfig.java b/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/ClientConfig.java
similarity index 99%
rename from impl/src/main/java/org/apache/myfaces/lifecycle/ClientConfig.java
rename to impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/ClientConfig.java
index 21b8142..5bf1da4 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/ClientConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/ClientConfig.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.lifecycle;
+package org.apache.myfaces.lifecycle.clientwindow;
import javax.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/ClientWindowFactoryImpl.java b/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/ClientWindowFactoryImpl.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/lifecycle/ClientWindowFactoryImpl.java
rename to impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/ClientWindowFactoryImpl.java
index b3c37a2..356d231 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/ClientWindowFactoryImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/ClientWindowFactoryImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.lifecycle;
+package org.apache.myfaces.lifecycle.clientwindow;
import org.apache.myfaces.util.token.TokenGenerator;
import javax.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/UrlClientWindow.java b/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/UrlClientWindow.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/lifecycle/UrlClientWindow.java
rename to impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/UrlClientWindow.java
index 6c488f6..20afb30 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/UrlClientWindow.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/UrlClientWindow.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.lifecycle;
+package org.apache.myfaces.lifecycle.clientwindow;
import org.apache.myfaces.util.token.TokenGenerator;
import java.util.HashMap;
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/WindowContextConfig.java b/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/WindowContextConfig.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/lifecycle/WindowContextConfig.java
rename to impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/WindowContextConfig.java
index ee6cfb5..1d3caf4 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/WindowContextConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/WindowContextConfig.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.lifecycle;
+package org.apache.myfaces.lifecycle.clientwindow;
/**
* Configuration for the org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext
