diff --git a/src/Myra/Graphics2D/UI/Dialog.cs b/src/Myra/Graphics2D/UI/Misc/Dialog.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/Dialog.cs
rename to src/Myra/Graphics2D/UI/Misc/Dialog.cs
diff --git a/src/Myra/Graphics2D/UI/Tree.cs b/src/Myra/Graphics2D/UI/Misc/Tree.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/Tree.cs
rename to src/Myra/Graphics2D/UI/Misc/Tree.cs
diff --git a/src/Myra/Graphics2D/UI/TreeNode.cs b/src/Myra/Graphics2D/UI/Misc/TreeNode.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/TreeNode.cs
rename to src/Myra/Graphics2D/UI/Misc/TreeNode.cs
diff --git a/src/Myra/Graphics2D/UI/Window.cs b/src/Myra/Graphics2D/UI/Misc/Window.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/Window.cs
rename to src/Myra/Graphics2D/UI/Misc/Window.cs
diff --git a/src/Myra/Graphics2D/UI/HorizontalProgressBar.cs b/src/Myra/Graphics2D/UI/Range/HorizontalProgressBar.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/HorizontalProgressBar.cs
rename to src/Myra/Graphics2D/UI/Range/HorizontalProgressBar.cs
diff --git a/src/Myra/Graphics2D/UI/HorizontalSlider.cs b/src/Myra/Graphics2D/UI/Range/HorizontalSlider.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/HorizontalSlider.cs
rename to src/Myra/Graphics2D/UI/Range/HorizontalSlider.cs
diff --git a/src/Myra/Graphics2D/UI/ProgressBar.cs b/src/Myra/Graphics2D/UI/Range/ProgressBar.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/ProgressBar.cs
rename to src/Myra/Graphics2D/UI/Range/ProgressBar.cs
diff --git a/src/Myra/Graphics2D/UI/Slider.cs b/src/Myra/Graphics2D/UI/Range/Slider.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/Slider.cs
rename to src/Myra/Graphics2D/UI/Range/Slider.cs
diff --git a/src/Myra/Graphics2D/UI/SpinButton.cs b/src/Myra/Graphics2D/UI/Range/SpinButton.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/SpinButton.cs
rename to src/Myra/Graphics2D/UI/Range/SpinButton.cs
diff --git a/src/Myra/Graphics2D/UI/VerticalProgressBar.cs b/src/Myra/Graphics2D/UI/Range/VerticalProgressBar.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/VerticalProgressBar.cs
rename to src/Myra/Graphics2D/UI/Range/VerticalProgressBar.cs
diff --git a/src/Myra/Graphics2D/UI/VerticalSlider.cs b/src/Myra/Graphics2D/UI/Range/VerticalSlider.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/VerticalSlider.cs
rename to src/Myra/Graphics2D/UI/Range/VerticalSlider.cs
diff --git a/src/Myra/Graphics2D/UI/IMenuItem.cs b/src/Myra/Graphics2D/UI/Selectors/IMenuItem.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/IMenuItem.cs
rename to src/Myra/Graphics2D/UI/Selectors/IMenuItem.cs
diff --git a/src/Myra/Graphics2D/UI/ISelector.cs b/src/Myra/Graphics2D/UI/Selectors/ISelector.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/ISelector.cs
rename to src/Myra/Graphics2D/UI/Selectors/ISelector.cs
diff --git a/src/Myra/Graphics2D/UI/ISelectorItem.cs b/src/Myra/Graphics2D/UI/Selectors/ISelectorItem.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/ISelectorItem.cs
rename to src/Myra/Graphics2D/UI/Selectors/ISelectorItem.cs
diff --git a/src/Myra/Graphics2D/UI/ButtonBase.cs b/src/Myra/Graphics2D/UI/Simple/ButtonBase.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/ButtonBase.cs
rename to src/Myra/Graphics2D/UI/Simple/ButtonBase.cs
diff --git a/src/Myra/Graphics2D/UI/CheckBox.cs b/src/Myra/Graphics2D/UI/Simple/CheckBox.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/CheckBox.cs
rename to src/Myra/Graphics2D/UI/Simple/CheckBox.cs
diff --git a/src/Myra/Graphics2D/UI/HorizontalSeparator.cs b/src/Myra/Graphics2D/UI/Simple/HorizontalSeparator.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/HorizontalSeparator.cs
rename to src/Myra/Graphics2D/UI/Simple/HorizontalSeparator.cs
diff --git a/src/Myra/Graphics2D/UI/Image.cs b/src/Myra/Graphics2D/UI/Simple/Image.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/Image.cs
rename to src/Myra/Graphics2D/UI/Simple/Image.cs
diff --git a/src/Myra/Graphics2D/UI/ImageButton.cs b/src/Myra/Graphics2D/UI/Simple/ImageButton.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/ImageButton.cs
rename to src/Myra/Graphics2D/UI/Simple/ImageButton.cs
diff --git a/src/Myra/Graphics2D/UI/ImageTextButton.cs b/src/Myra/Graphics2D/UI/Simple/ImageTextButton.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/ImageTextButton.cs
rename to src/Myra/Graphics2D/UI/Simple/ImageTextButton.cs
diff --git a/src/Myra/Graphics2D/UI/Label.cs b/src/Myra/Graphics2D/UI/Simple/Label.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/Label.cs
rename to src/Myra/Graphics2D/UI/Simple/Label.cs
diff --git a/src/Myra/Graphics2D/UI/RadioButton.cs b/src/Myra/Graphics2D/UI/Simple/RadioButton.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/RadioButton.cs
rename to src/Myra/Graphics2D/UI/Simple/RadioButton.cs
diff --git a/src/Myra/Graphics2D/UI/SeparatorWidget.cs b/src/Myra/Graphics2D/UI/Simple/SeparatorWidget.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/SeparatorWidget.cs
rename to src/Myra/Graphics2D/UI/Simple/SeparatorWidget.cs
diff --git a/src/Myra/Graphics2D/UI/TextBox.cs b/src/Myra/Graphics2D/UI/Simple/TextBox.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/TextBox.cs
rename to src/Myra/Graphics2D/UI/Simple/TextBox.cs
diff --git a/src/Myra/Graphics2D/UI/TextButton.cs b/src/Myra/Graphics2D/UI/Simple/TextButton.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/TextButton.cs
rename to src/Myra/Graphics2D/UI/Simple/TextButton.cs
diff --git a/src/Myra/Graphics2D/UI/VerticalSeparator.cs b/src/Myra/Graphics2D/UI/Simple/VerticalSeparator.cs
similarity index 100%
rename from src/Myra/Graphics2D/UI/VerticalSeparator.cs
rename to src/Myra/Graphics2D/UI/Simple/VerticalSeparator.cs