diff --git a/Terminal.Gui/Views/TextInput/HistoryText.cs b/Terminal.Gui/Views/TextInput/History/HistoryText.cs
similarity index 100%
rename from Terminal.Gui/Views/TextInput/HistoryText.cs
rename to Terminal.Gui/Views/TextInput/History/HistoryText.cs
diff --git a/Terminal.Gui/Views/TextInput/HistoryTextItemEventArgs.cs b/Terminal.Gui/Views/TextInput/History/HistoryTextItemEventArgs.cs
similarity index 100%
rename from Terminal.Gui/Views/TextInput/HistoryTextItemEventArgs.cs
rename to Terminal.Gui/Views/TextInput/History/HistoryTextItemEventArgs.cs
diff --git a/Terminal.Gui/Views/TextInput/TextEditingLineStatus.cs b/Terminal.Gui/Views/TextInput/History/TextEditingLineStatus.cs
similarity index 100%
rename from Terminal.Gui/Views/TextInput/TextEditingLineStatus.cs
rename to Terminal.Gui/Views/TextInput/History/TextEditingLineStatus.cs
diff --git a/Terminal.Gui/Views/TextInput/ITextValidateProvider.cs b/Terminal.Gui/Views/TextInput/TextValidation/ITextValidateProvider.cs
similarity index 100%
rename from Terminal.Gui/Views/TextInput/ITextValidateProvider.cs
rename to Terminal.Gui/Views/TextInput/TextValidation/ITextValidateProvider.cs
diff --git a/Terminal.Gui/Views/TextInput/NetMaskedTextProvider.cs b/Terminal.Gui/Views/TextInput/TextValidation/NetMaskedTextProvider.cs
similarity index 100%
rename from Terminal.Gui/Views/TextInput/NetMaskedTextProvider.cs
rename to Terminal.Gui/Views/TextInput/TextValidation/NetMaskedTextProvider.cs
diff --git a/Terminal.Gui/Views/TextInput/TextRegexProvider.cs b/Terminal.Gui/Views/TextInput/TextValidation/TextRegexProvider.cs
similarity index 100%
rename from Terminal.Gui/Views/TextInput/TextRegexProvider.cs
rename to Terminal.Gui/Views/TextInput/TextValidation/TextRegexProvider.cs
diff --git a/Terminal.Gui/Views/TextInput/TextValidateField.cs b/Terminal.Gui/Views/TextInput/TextValidation/TextValidateField.cs
similarity index 100%
rename from Terminal.Gui/Views/TextInput/TextValidateField.cs
rename to Terminal.Gui/Views/TextInput/TextValidation/TextValidateField.cs
diff --git a/Terminal.Gui/Views/TextInput/ContentsChangedEventArgs.cs b/Terminal.Gui/Views/TextInput/TextView/ContentsChangedEventArgs.cs
similarity index 100%
rename from Terminal.Gui/Views/TextInput/ContentsChangedEventArgs.cs
rename to Terminal.Gui/Views/TextInput/TextView/ContentsChangedEventArgs.cs
diff --git a/Terminal.Gui/Views/TextInput/TextView.cs b/Terminal.Gui/Views/TextInput/TextView/TextView.cs
similarity index 100%
rename from Terminal.Gui/Views/TextInput/TextView.cs
rename to Terminal.Gui/Views/TextInput/TextView/TextView.cs
diff --git a/Terminal.Gui/Views/TextInput/WordWrapManager.cs b/Terminal.Gui/Views/TextInput/TextView/WordWrapManager.cs
similarity index 100%
rename from Terminal.Gui/Views/TextInput/WordWrapManager.cs
rename to Terminal.Gui/Views/TextInput/TextView/WordWrapManager.cs