diff --git a/Oqtane.Client/Themes/BlazorTheme/Container.razor b/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor
similarity index 100%
rename from Oqtane.Client/Themes/BlazorTheme/Container.razor
rename to Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor
diff --git a/Oqtane.Client/Themes/BlazorTheme/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
similarity index 100%
rename from Oqtane.Client/Themes/BlazorTheme/Default.razor
rename to Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Container.razor b/Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor
similarity index 100%
rename from Oqtane.Client/Themes/OqtaneTheme/Container.razor
rename to Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor
diff --git a/Oqtane.Client/Themes/OqtaneTheme/NoTitle.razor b/Oqtane.Client/Themes/OqtaneTheme/Containers/NoTitle.razor
similarity index 100%
rename from Oqtane.Client/Themes/OqtaneTheme/NoTitle.razor
rename to Oqtane.Client/Themes/OqtaneTheme/Containers/NoTitle.razor
diff --git a/Oqtane.Client/Themes/OqtaneTheme/MultiPane.razor b/Oqtane.Client/Themes/OqtaneTheme/Layouts/MultiPane.razor
similarity index 100%
rename from Oqtane.Client/Themes/OqtaneTheme/MultiPane.razor
rename to Oqtane.Client/Themes/OqtaneTheme/Layouts/MultiPane.razor
diff --git a/Oqtane.Client/Themes/OqtaneTheme/SinglePane.razor b/Oqtane.Client/Themes/OqtaneTheme/Layouts/SinglePane.razor
similarity index 100%
rename from Oqtane.Client/Themes/OqtaneTheme/SinglePane.razor
rename to Oqtane.Client/Themes/OqtaneTheme/Layouts/SinglePane.razor
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
similarity index 100%
rename from Oqtane.Client/Themes/OqtaneTheme/Default.razor
rename to Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor