diff --git a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/AbstractInputComponent.java b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/AbstractInputComponent.java
similarity index 98%
rename from ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/AbstractInputComponent.java
rename to ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/AbstractInputComponent.java
index 347b73af57..69ee9e4dfe 100644
--- a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/AbstractInputComponent.java
+++ b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/AbstractInputComponent.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.addon.ui.impl;
+package org.jboss.forge.addon.ui.impl.input;
 
 import java.util.concurrent.Callable;
 
diff --git a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/AbstractUISelectInputComponent.java b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/AbstractUISelectInputComponent.java
similarity index 97%
rename from ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/AbstractUISelectInputComponent.java
rename to ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/AbstractUISelectInputComponent.java
index b2354d18aa..7f818d7554 100644
--- a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/AbstractUISelectInputComponent.java
+++ b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/AbstractUISelectInputComponent.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.addon.ui.impl;
+package org.jboss.forge.addon.ui.impl.input;
 
 import java.util.concurrent.Callable;
 
diff --git a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/InputComponentProducer.java b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/InputComponentProducer.java
similarity index 99%
rename from ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/InputComponentProducer.java
rename to ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/InputComponentProducer.java
index 8cecd53fa7..0b4c0f56d2 100644
--- a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/InputComponentProducer.java
+++ b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/InputComponentProducer.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.addon.ui.impl;
+package org.jboss.forge.addon.ui.impl.input;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/UIInputImpl.java b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/UIInputImpl.java
similarity index 98%
rename from ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/UIInputImpl.java
rename to ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/UIInputImpl.java
index 8f487bf638..5a46c96c17 100644
--- a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/UIInputImpl.java
+++ b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/UIInputImpl.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.addon.ui.impl;
+package org.jboss.forge.addon.ui.impl.input;
 
 import java.util.concurrent.Callable;
 
diff --git a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/UIInputManyImpl.java b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/UIInputManyImpl.java
similarity index 98%
rename from ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/UIInputManyImpl.java
rename to ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/UIInputManyImpl.java
index 8d916ffb84..7016869855 100644
--- a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/UIInputManyImpl.java
+++ b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/UIInputManyImpl.java
@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.addon.ui.impl;
+package org.jboss.forge.addon.ui.impl.input;
 
 import java.util.concurrent.Callable;
 
diff --git a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/UISelectManyImpl.java b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/UISelectManyImpl.java
similarity index 97%
rename from ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/UISelectManyImpl.java
rename to ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/UISelectManyImpl.java
index f04b6cc909..7db114b9a5 100644
--- a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/UISelectManyImpl.java
+++ b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/UISelectManyImpl.java
@@ -4,7 +4,7 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.forge.addon.ui.impl;
+package org.jboss.forge.addon.ui.impl.input;
 
 import java.util.concurrent.Callable;
 
diff --git a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/UISelectOneImpl.java b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/UISelectOneImpl.java
similarity index 97%
rename from ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/UISelectOneImpl.java
rename to ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/UISelectOneImpl.java
index 5ed890dd3e..fa4c4af076 100644
--- a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/UISelectOneImpl.java
+++ b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/UISelectOneImpl.java
@@ -4,7 +4,7 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.forge.addon.ui.impl;
+package org.jboss.forge.addon.ui.impl.input;
 
 import java.util.concurrent.Callable;