diff --git a/BlazorBootstrap.Demo.RCL/BlazorBootstrap.Demo.RCL.csproj b/BlazorBootstrap.Demo.RCL/BlazorBootstrap.Demo.RCL.csproj
index c8527ced6..dd74e9dec 100644
--- a/BlazorBootstrap.Demo.RCL/BlazorBootstrap.Demo.RCL.csproj
+++ b/BlazorBootstrap.Demo.RCL/BlazorBootstrap.Demo.RCL.csproj
@@ -19,16 +19,11 @@
     <ProjectReference Include="..\blazorbootstrap\BlazorBootstrap.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Pages\Ribbon\" />
-    <Folder Include="Pages\SortableList\" />
-  </ItemGroup>
-
   <Target Name="EmbedDemos" BeforeTargets="PrepareForBuild">
     <!-- Let's embed demos sources into the assembly to show the source at runtime. -->
     <ItemGroup>
-      <EmbeddedResource Include="Pages\**\*Demo*.razor" />
-      <EmbeddedResource Include="Pages\**\*Snippet*" />
+      <EmbeddedResource Include="Components\**\*Demo*.razor" />
+      <EmbeddedResource Include="Components\**\*Snippet*" />
     </ItemGroup>
   </Target>
 
diff --git a/BlazorBootstrap.Demo.RCL/Shared/EmptyLayout.razor b/BlazorBootstrap.Demo.RCL/Components/Layout/EmptyLayout.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Shared/EmptyLayout.razor
rename to BlazorBootstrap.Demo.RCL/Components/Layout/EmptyLayout.razor
diff --git a/BlazorBootstrap.Demo.RCL/Shared/EmptyLayout.razor.css b/BlazorBootstrap.Demo.RCL/Components/Layout/EmptyLayout.razor.css
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Shared/EmptyLayout.razor.css
rename to BlazorBootstrap.Demo.RCL/Components/Layout/EmptyLayout.razor.css
diff --git a/BlazorBootstrap.Demo.RCL/Shared/MainLayout.razor b/BlazorBootstrap.Demo.RCL/Components/Layout/MainLayout.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Shared/MainLayout.razor
rename to BlazorBootstrap.Demo.RCL/Components/Layout/MainLayout.razor
diff --git a/BlazorBootstrap.Demo.RCL/Shared/MainLayout.razor.cs b/BlazorBootstrap.Demo.RCL/Components/Layout/MainLayout.razor.cs
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Shared/MainLayout.razor.cs
rename to BlazorBootstrap.Demo.RCL/Components/Layout/MainLayout.razor.cs
diff --git a/BlazorBootstrap.Demo.RCL/Shared/MainLayout.razor.css b/BlazorBootstrap.Demo.RCL/Components/Layout/MainLayout.razor.css
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Shared/MainLayout.razor.css
rename to BlazorBootstrap.Demo.RCL/Components/Layout/MainLayout.razor.css
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Accordion/AccordionDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Accordion/AccordionDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Accordion/AccordionDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Accordion/AccordionDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Accordion/Accordion_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Accordion/Accordion_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Accordion/Accordion_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Accordion/Accordion_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Accordion/Accordion_Demo_02_Title_with_Icon.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Accordion/Accordion_Demo_02_Title_with_Icon.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Accordion/Accordion_Demo_02_Title_with_Icon.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Accordion/Accordion_Demo_02_Title_with_Icon.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Accordion/Accordion_Demo_03_Flush.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Accordion/Accordion_Demo_03_Flush.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Accordion/Accordion_Demo_03_Flush.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Accordion/Accordion_Demo_03_Flush.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Accordion/Accordion_Demo_04_Set_Default_Active.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Accordion/Accordion_Demo_04_Set_Default_Active.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Accordion/Accordion_Demo_04_Set_Default_Active.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Accordion/Accordion_Demo_04_Set_Default_Active.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Accordion/Accordion_Demo_05_Always_Open.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Accordion/Accordion_Demo_05_Always_Open.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Accordion/Accordion_Demo_05_Always_Open.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Accordion/Accordion_Demo_05_Always_Open.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Accordion/Accordion_Demo_06_Show_Hide_Individual_AccordionItems.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Accordion/Accordion_Demo_06_Show_Hide_Individual_AccordionItems.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Accordion/Accordion_Demo_06_Show_Hide_Individual_AccordionItems.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Accordion/Accordion_Demo_06_Show_Hide_Individual_AccordionItems.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Accordion/Accordion_Demo_07_Show_Hide_All_AccordionItems.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Accordion/Accordion_Demo_07_Show_Hide_All_AccordionItems.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Accordion/Accordion_Demo_07_Show_Hide_All_AccordionItems.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Accordion/Accordion_Demo_07_Show_Hide_All_AccordionItems.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Accordion/Accordion_Demo_08_Events.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Accordion/Accordion_Demo_08_Events.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Accordion/Accordion_Demo_08_Events.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Accordion/Accordion_Demo_08_Events.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Alerts/AlertDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Alerts/AlertDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Alerts/AlertDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Alerts/AlertDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Alerts/Alert_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Alerts/Alert_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Alerts/Alert_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Alerts/Alert_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Alerts/Alert_Demo_02_Additional_Content.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Alerts/Alert_Demo_02_Additional_Content.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Alerts/Alert_Demo_02_Additional_Content.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Alerts/Alert_Demo_02_Additional_Content.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Alerts/Alert_Demo_03_Icons.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Alerts/Alert_Demo_03_Icons.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Alerts/Alert_Demo_03_Icons.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Alerts/Alert_Demo_03_Icons.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Alerts/Alert_Demo_04_Dismissing_A.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Alerts/Alert_Demo_04_Dismissing_A.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Alerts/Alert_Demo_04_Dismissing_A.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Alerts/Alert_Demo_04_Dismissing_A.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Alerts/Alert_Demo_04_Dismissing_B.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Alerts/Alert_Demo_04_Dismissing_B.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Alerts/Alert_Demo_04_Dismissing_B.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Alerts/Alert_Demo_04_Dismissing_B.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Alerts/Alert_Demo_05_Switch_Alert_Type_Dynamically.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Alerts/Alert_Demo_05_Switch_Alert_Type_Dynamically.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Alerts/Alert_Demo_05_Switch_Alert_Type_Dynamically.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Alerts/Alert_Demo_05_Switch_Alert_Type_Dynamically.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Badge/BadgeDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Badge/BadgeDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Badge/BadgeDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Badge/BadgeDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Badge/Badge_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Badge/Badge_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Badge/Badge_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Badge/Badge_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Badge/Badge_Demo_02_Background_Colors.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Badge/Badge_Demo_02_Background_Colors.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Badge/Badge_Demo_02_Background_Colors.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Badge/Badge_Demo_02_Background_Colors.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Badge/Badge_Demo_03_Pill_Badges.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Badge/Badge_Demo_03_Pill_Badges.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Badge/Badge_Demo_03_Pill_Badges.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Badge/Badge_Demo_03_Pill_Badges.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Badge/Badge_Demo_04_Buttons.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Badge/Badge_Demo_04_Buttons.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Badge/Badge_Demo_04_Buttons.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Badge/Badge_Demo_04_Buttons.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Badge/Badge_Demo_05_Positioned.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Badge/Badge_Demo_05_Positioned.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Badge/Badge_Demo_05_Positioned.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Badge/Badge_Demo_05_Positioned.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Badge/Badge_Demo_06_Generic_Indicator.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Badge/Badge_Demo_06_Generic_Indicator.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Badge/Badge_Demo_06_Generic_Indicator.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Badge/Badge_Demo_06_Generic_Indicator.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Breadcrumb/BreadcrumbDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Breadcrumb/BreadcrumbDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Breadcrumb/BreadcrumbDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Breadcrumb/BreadcrumbDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Breadcrumb/Breadcrumb_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Breadcrumb/Breadcrumb_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Breadcrumb/Breadcrumb_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Breadcrumb/Breadcrumb_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Breadcrumb/Breadcrumb_Demo_02_Dividers.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Breadcrumb/Breadcrumb_Demo_02_Dividers.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Breadcrumb/Breadcrumb_Demo_02_Dividers.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Breadcrumb/Breadcrumb_Demo_02_Dividers.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Breadcrumb/Breadcrumb_Demo_03_Embedded_SVG.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Breadcrumb/Breadcrumb_Demo_03_Embedded_SVG.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Breadcrumb/Breadcrumb_Demo_03_Embedded_SVG.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Breadcrumb/Breadcrumb_Demo_03_Embedded_SVG.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/ButtonDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/ButtonDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/ButtonDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/ButtonDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_02_Button_Tags.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_02_Button_Tags.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_02_Button_Tags.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_02_Button_Tags.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_03_Outline_Buttons.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_03_Outline_Buttons.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_03_Outline_Buttons.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_03_Outline_Buttons.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_04_Sizes_A.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_04_Sizes_A.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_04_Sizes_A.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_04_Sizes_A.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_04_Sizes_B.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_04_Sizes_B.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_04_Sizes_B.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_04_Sizes_B.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_04_Sizes_C.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_04_Sizes_C.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_04_Sizes_C.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_04_Sizes_C.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_05_Disabled_State_A.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_05_Disabled_State_A.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_05_Disabled_State_A.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_05_Disabled_State_A.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_05_Disabled_State_B.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_05_Disabled_State_B.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_05_Disabled_State_B.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_05_Disabled_State_B.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_06_Block_Buttons_A.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_06_Block_Buttons_A.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_06_Block_Buttons_A.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_06_Block_Buttons_A.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_06_Block_Buttons_B.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_06_Block_Buttons_B.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_06_Block_Buttons_B.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_06_Block_Buttons_B.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_06_Block_Buttons_C.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_06_Block_Buttons_C.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_06_Block_Buttons_C.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_06_Block_Buttons_C.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_06_Block_Buttons_D.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_06_Block_Buttons_D.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_06_Block_Buttons_D.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_06_Block_Buttons_D.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_07_Toggle_States_A.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_07_Toggle_States_A.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_07_Toggle_States_A.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_07_Toggle_States_A.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_07_Toggle_States_B.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_07_Toggle_States_B.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_07_Toggle_States_B.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_07_Toggle_States_B.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_08_Loading_Spinner.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_08_Loading_Spinner.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_08_Loading_Spinner.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_08_Loading_Spinner.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_08_Show_Hide_Loading_Spinner.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_08_Show_Hide_Loading_Spinner.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_08_Show_Hide_Loading_Spinner.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_08_Show_Hide_Loading_Spinner.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_09_A_Show_Tooltip.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_09_A_Show_Tooltip.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_09_A_Show_Tooltip.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_09_A_Show_Tooltip.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_09_B_Dynamically_update_the_tooltip_text.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_09_B_Dynamically_update_the_tooltip_text.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_09_B_Dynamically_update_the_tooltip_text.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_09_B_Dynamically_update_the_tooltip_text.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_09_C_Tooltip_Color.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_09_C_Tooltip_Color.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_09_C_Tooltip_Color.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_09_C_Tooltip_Color.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_10_Click_Event.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_10_Click_Event.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_10_Click_Event.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_10_Click_Event.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_11_Double_Click_Event.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_11_Double_Click_Event.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_11_Double_Click_Event.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_11_Double_Click_Event.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_12_Click_Event_With_Args.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_12_Click_Event_With_Args.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_12_Click_Event_With_Args.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_12_Click_Event_With_Args.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_13_Disable_Enable_Dynamically.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_13_Disable_Enable_Dynamically.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Buttons/Button_Demo_13_Disable_Enable_Dynamically.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Buttons/Button_Demo_13_Disable_Enable_Dynamically.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Callout/CalloutDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Callout/CalloutDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Callout/CalloutDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Callout/CalloutDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Callout/Callout_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Callout/Callout_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Callout/Callout_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Callout/Callout_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Callout/Callout_Demo_02_Change_Heading.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Callout/Callout_Demo_02_Change_Heading.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Callout/Callout_Demo_02_Change_Heading.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Callout/Callout_Demo_02_Change_Heading.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Callout/Callout_Demo_03_Large_Text.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Callout/Callout_Demo_03_Large_Text.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Callout/Callout_Demo_03_Large_Text.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Callout/Callout_Demo_03_Large_Text.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Callout/Callout_Demo_04_Hide_Heading.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Callout/Callout_Demo_04_Hide_Heading.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Callout/Callout_Demo_04_Hide_Heading.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Callout/Callout_Demo_04_Hide_Heading.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Card/CardDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Card/CardDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Card/CardDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Card/CardDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_02_Content_Types_Body.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_02_Content_Types_Body.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_02_Content_Types_Body.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_02_Content_Types_Body.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_03_Content_Types_Titles_Text_And_Links.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_03_Content_Types_Titles_Text_And_Links.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_03_Content_Types_Titles_Text_And_Links.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_03_Content_Types_Titles_Text_And_Links.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_04_Content_Types_Images.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_04_Content_Types_Images.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_04_Content_Types_Images.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_04_Content_Types_Images.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_05_Content_Types_List_Groups.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_05_Content_Types_List_Groups.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_05_Content_Types_List_Groups.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_05_Content_Types_List_Groups.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_06_Content_Types_Kitchen_Sink.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_06_Content_Types_Kitchen_Sink.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_06_Content_Types_Kitchen_Sink.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_06_Content_Types_Kitchen_Sink.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_07_Header_And_Footer.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_07_Header_And_Footer.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_07_Header_And_Footer.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_07_Header_And_Footer.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_08_Sizing.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_08_Sizing.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_08_Sizing.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_08_Sizing.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_09_Text_Alignment.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_09_Text_Alignment.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_09_Text_Alignment.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_09_Text_Alignment.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_10_Background_And_Color.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_10_Background_And_Color.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_10_Background_And_Color.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_10_Background_And_Color.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_11_Card_Groups.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_11_Card_Groups.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_11_Card_Groups.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_11_Card_Groups.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_12_Card_Groups_With_Footer.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_12_Card_Groups_With_Footer.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Card/Card_Demo_12_Card_Groups_With_Footer.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Card/Card_Demo_12_Card_Groups_With_Footer.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/BarCharts/BarChartDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/BarCharts/BarChartDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/BarCharts/BarChartDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/BarCharts/BarChartDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/BarCharts/BarChart_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/BarCharts/BarChart_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/BarCharts/BarChart_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/BarCharts/BarChart_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/BarCharts/BarChart_Demo_02_Horizontal_BarChart.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/BarCharts/BarChart_Demo_02_Horizontal_BarChart.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/BarCharts/BarChart_Demo_02_Horizontal_BarChart.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/BarCharts/BarChart_Demo_02_Horizontal_BarChart.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/BarCharts/BarChart_Demo_03_Stacked_BarChart.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/BarCharts/BarChart_Demo_03_Stacked_BarChart.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/BarCharts/BarChart_Demo_03_Stacked_BarChart.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/BarCharts/BarChart_Demo_03_Stacked_BarChart.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/BarCharts/BarChart_Demo_04_Locale.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/BarCharts/BarChart_Demo_04_Locale.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/BarCharts/BarChart_Demo_04_Locale.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/BarCharts/BarChart_Demo_04_Locale.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/BarCharts/BarChart_Demo_05_Stacked_BarChart_with_Datalabels.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/BarCharts/BarChart_Demo_05_Stacked_BarChart_with_Datalabels.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/BarCharts/BarChart_Demo_05_Stacked_BarChart_with_Datalabels.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/BarCharts/BarChart_Demo_05_Stacked_BarChart_with_Datalabels.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/ChartsDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/ChartsDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/ChartsDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/ChartsDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/Charts_Demo_00_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/Charts_Demo_00_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/Charts_Demo_00_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/Charts_Demo_00_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/DoughnutCharts/DoughnutChartDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/DoughnutCharts/DoughnutChartDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/DoughnutCharts/DoughnutChartDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/DoughnutCharts/DoughnutChartDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/DoughnutCharts/DoughnutChart_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/DoughnutCharts/DoughnutChart_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/DoughnutCharts/DoughnutChart_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/DoughnutCharts/DoughnutChart_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/DoughnutCharts/DoughnutChart_Demo_02_Datalabels.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/DoughnutCharts/DoughnutChart_Demo_02_Datalabels.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/DoughnutCharts/DoughnutChart_Demo_02_Datalabels.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/DoughnutCharts/DoughnutChart_Demo_02_Datalabels.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/LineCharts/LineChartDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/LineCharts/LineChartDocumentation.razor
similarity index 98%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/LineCharts/LineChartDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/LineCharts/LineChartDocumentation.razor
index 0c91fdf3a..041dcc119 100644
--- a/BlazorBootstrap.Demo.RCL/Pages/Charts/LineCharts/LineChartDocumentation.razor
+++ b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/LineCharts/LineChartDocumentation.razor
@@ -1,5 +1,4 @@
 @page "/charts/line-chart"
-@using BlazorBootstrap.Demo.RCL.Pages.Charts.BarCharts
 
 <PageTitle>@title</PageTitle>
 
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/LineCharts/LineChart_Demo_01_A_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/LineCharts/LineChart_Demo_01_A_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/LineCharts/LineChart_Demo_01_A_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/LineCharts/LineChart_Demo_01_A_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/LineCharts/LineChart_Demo_01_B_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/LineCharts/LineChart_Demo_01_B_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/LineCharts/LineChart_Demo_01_B_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/LineCharts/LineChart_Demo_01_B_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/LineCharts/LineChart_Demo_02_Locale.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/LineCharts/LineChart_Demo_02_Locale.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/LineCharts/LineChart_Demo_02_Locale.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/LineCharts/LineChart_Demo_02_Locale.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/LineCharts/LineChart_Demo_03_Dynamically_add_data.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/LineCharts/LineChart_Demo_03_Dynamically_add_data.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/LineCharts/LineChart_Demo_03_Dynamically_add_data.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/LineCharts/LineChart_Demo_03_Dynamically_add_data.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/LineCharts/LineChart_Demo_04_Datalabels.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/LineCharts/LineChart_Demo_04_Datalabels.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/LineCharts/LineChart_Demo_04_Datalabels.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/LineCharts/LineChart_Demo_04_Datalabels.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/PieCharts/PieChartDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/PieCharts/PieChartDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/PieCharts/PieChartDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/PieCharts/PieChartDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/PieCharts/PieChart_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/PieCharts/PieChart_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/PieCharts/PieChart_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/PieCharts/PieChart_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/PieCharts/PieChart_Demo_02_Datalabels.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/PieCharts/PieChart_Demo_02_Datalabels.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/PieCharts/PieChart_Demo_02_Datalabels.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/PieCharts/PieChart_Demo_02_Datalabels.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/PieCharts/PieChart_Demo_03_Change_Legend_Position.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/PieCharts/PieChart_Demo_03_Change_Legend_Position.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/PieCharts/PieChart_Demo_03_Change_Legend_Position.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/PieCharts/PieChart_Demo_03_Change_Legend_Position.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Charts/Utils_Colors.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Charts/Utils_Colors.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Charts/Utils_Colors.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Charts/Utils_Colors.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Collapse/CollapseDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Collapse/CollapseDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Collapse/CollapseDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Collapse/CollapseDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Collapse/Collapse_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Collapse/Collapse_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Collapse/Collapse_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Collapse/Collapse_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Collapse/Collapse_Demo_02_Horizontal.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Collapse/Collapse_Demo_02_Horizontal.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Collapse/Collapse_Demo_02_Horizontal.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Collapse/Collapse_Demo_02_Horizontal.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Collapse/Collapse_Demo_03_Events.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Collapse/Collapse_Demo_03_Events.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Collapse/Collapse_Demo_03_Events.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Collapse/Collapse_Demo_03_Events.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/ConfirmDialogDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/ConfirmDialogDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/ConfirmDialogDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/ConfirmDialogDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/ConfirmDialog_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/ConfirmDialog_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/ConfirmDialog_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/ConfirmDialog_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/ConfirmDialog_Demo_03_Dynamic_Component_As_Confirm_Dialog.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/ConfirmDialog_Demo_03_Dynamic_Component_As_Confirm_Dialog.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/ConfirmDialog_Demo_03_Dynamic_Component_As_Confirm_Dialog.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/ConfirmDialog_Demo_03_Dynamic_Component_As_Confirm_Dialog.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/ConfirmDialog_Demo_04_Change_Buttons_Text_And_Color.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/ConfirmDialog_Demo_04_Change_Buttons_Text_And_Color.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/ConfirmDialog_Demo_04_Change_Buttons_Text_And_Color.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/ConfirmDialog_Demo_04_Change_Buttons_Text_And_Color.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/ConfirmDialog_Demo_05_Optional_Sizes.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/ConfirmDialog_Demo_05_Optional_Sizes.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/ConfirmDialog_Demo_05_Optional_Sizes.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/ConfirmDialog_Demo_05_Optional_Sizes.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/ConfirmDialog_Demo_06_Scrolling_Long_Content_01.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/ConfirmDialog_Demo_06_Scrolling_Long_Content_01.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/ConfirmDialog_Demo_06_Scrolling_Long_Content_01.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/ConfirmDialog_Demo_06_Scrolling_Long_Content_01.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/ConfirmDialog_Demo_06_Scrolling_Long_Content_02.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/ConfirmDialog_Demo_06_Scrolling_Long_Content_02.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/ConfirmDialog_Demo_06_Scrolling_Long_Content_02.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/ConfirmDialog_Demo_06_Scrolling_Long_Content_02.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/ConfirmDialog_Demo_07_Vertically_Centered_01.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/ConfirmDialog_Demo_07_Vertically_Centered_01.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/ConfirmDialog_Demo_07_Vertically_Centered_01.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/ConfirmDialog_Demo_07_Vertically_Centered_01.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/ConfirmDialog_Demo_07_Vertically_Centered_02.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/ConfirmDialog_Demo_07_Vertically_Centered_02.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/ConfirmDialog_Demo_07_Vertically_Centered_02.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/ConfirmDialog_Demo_07_Vertically_Centered_02.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/ConfirmDialog_Demo_08_Disable_AutoFocus_Yes_Button.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/ConfirmDialog_Demo_08_Disable_AutoFocus_Yes_Button.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/ConfirmDialog_Demo_08_Disable_AutoFocus_Yes_Button.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/ConfirmDialog_Demo_08_Disable_AutoFocus_Yes_Button.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/EmployeeDemoComponent.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/EmployeeDemoComponent.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/EmployeeDemoComponent.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/EmployeeDemoComponent.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/LongContentDemoComponent.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/LongContentDemoComponent.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/ConfirmDialog/LongContentDemoComponent.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/ConfirmDialog/LongContentDemoComponent.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/DropdownDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/DropdownDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/DropdownDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/DropdownDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_01_Single_Button.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_01_Single_Button.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_01_Single_Button.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_01_Single_Button.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_02_Color.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_02_Color.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_02_Color.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_02_Color.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_03_Split_Button.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_03_Split_Button.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_03_Split_Button.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_03_Split_Button.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_04_A_Sizing.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_04_A_Sizing.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_04_A_Sizing.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_04_A_Sizing.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_04_B_Sizing.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_04_B_Sizing.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_04_B_Sizing.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_04_B_Sizing.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_05_A_Directions_Dropup.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_05_A_Directions_Dropup.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_05_A_Directions_Dropup.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_05_A_Directions_Dropup.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_05_B_Directions_DropupCentered.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_05_B_Directions_DropupCentered.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_05_B_Directions_DropupCentered.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_05_B_Directions_DropupCentered.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_05_C_Directions_Dropend.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_05_C_Directions_Dropend.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_05_C_Directions_Dropend.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_05_C_Directions_Dropend.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_05_D_Directions_Dropstart.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_05_D_Directions_Dropstart.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_05_D_Directions_Dropstart.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_05_D_Directions_Dropstart.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_06_Active.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_06_Active.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_06_Active.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_06_Active.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_07_A_Disabled.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_07_A_Disabled.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_07_A_Disabled.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_07_A_Disabled.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_07_B_Disabled.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_07_B_Disabled.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_07_B_Disabled.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_07_B_Disabled.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_08_Menu_Position.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_08_Menu_Position.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_08_Menu_Position.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_08_Menu_Position.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_09_Header.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_09_Header.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_09_Header.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_09_Header.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_10_Dividers.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_10_Dividers.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_10_Dividers.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_10_Dividers.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_11_Text.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_11_Text.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_11_Text.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_11_Text.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_12_Forms.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_12_Forms.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_12_Forms.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_12_Forms.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_13_AutoClose.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_13_AutoClose.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_13_AutoClose.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_13_AutoClose.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_14_Methods.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_14_Methods.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_14_Methods.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_14_Methods.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_15_Events.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_15_Events.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Dropdowns/Dropdown_Demo_15_Events.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Dropdowns/Dropdown_Demo_15_Events.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/AutoComplete/AutoCompleteDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/AutoComplete/AutoCompleteDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/AutoComplete/AutoCompleteDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/AutoComplete/AutoCompleteDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/AutoComplete/AutoComplete_Demo_01_A_Client_Side_Filtering.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/AutoComplete/AutoComplete_Demo_01_A_Client_Side_Filtering.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/AutoComplete/AutoComplete_Demo_01_A_Client_Side_Filtering.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/AutoComplete/AutoComplete_Demo_01_A_Client_Side_Filtering.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/AutoComplete/AutoComplete_Demo_01_B_Client_Side_Filtering_With_StringComparision.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/AutoComplete/AutoComplete_Demo_01_B_Client_Side_Filtering_With_StringComparision.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/AutoComplete/AutoComplete_Demo_01_B_Client_Side_Filtering_With_StringComparision.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/AutoComplete/AutoComplete_Demo_01_B_Client_Side_Filtering_With_StringComparision.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/AutoComplete/AutoComplete_Demo_02_Server_Side_Filtering.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/AutoComplete/AutoComplete_Demo_02_Server_Side_Filtering.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/AutoComplete/AutoComplete_Demo_02_Server_Side_Filtering.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/AutoComplete/AutoComplete_Demo_02_Server_Side_Filtering.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/AutoComplete/AutoComplete_Demo_03_Set_Default_Value.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/AutoComplete/AutoComplete_Demo_03_Set_Default_Value.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/AutoComplete/AutoComplete_Demo_03_Set_Default_Value.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/AutoComplete/AutoComplete_Demo_03_Set_Default_Value.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/AutoComplete/AutoComplete_Demo_04_Validations.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/AutoComplete/AutoComplete_Demo_04_Validations.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/AutoComplete/AutoComplete_Demo_04_Validations.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/AutoComplete/AutoComplete_Demo_04_Validations.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/AutoComplete/AutoComplete_Demo_05_A_Disable.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/AutoComplete/AutoComplete_Demo_05_A_Disable.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/AutoComplete/AutoComplete_Demo_05_A_Disable.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/AutoComplete/AutoComplete_Demo_05_A_Disable.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/AutoComplete/AutoComplete_Demo_05_B_Disable.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/AutoComplete/AutoComplete_Demo_05_B_Disable.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/AutoComplete/AutoComplete_Demo_05_B_Disable.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/AutoComplete/AutoComplete_Demo_05_B_Disable.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/AutoComplete/AutoComplete_Demo_06_Sizing.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/AutoComplete/AutoComplete_Demo_06_Sizing.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/AutoComplete/AutoComplete_Demo_06_Sizing.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/AutoComplete/AutoComplete_Demo_06_Sizing.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInputDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInputDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInputDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInputDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_01_Basic_Usage.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_01_Basic_Usage.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_01_Basic_Usage.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_01_Basic_Usage.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_02_Show_Currency_Symbols_for_the_Different_Locales.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_02_Show_Currency_Symbols_for_the_Different_Locales.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_02_Show_Currency_Symbols_for_the_Different_Locales.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_02_Show_Currency_Symbols_for_the_Different_Locales.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_03_Hide_Currency_Symbol.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_03_Hide_Currency_Symbol.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_03_Hide_Currency_Symbol.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_03_Hide_Currency_Symbol.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_04_Using_FractionDigits_and_IntegerDigits.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_04_Using_FractionDigits_and_IntegerDigits.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_04_Using_FractionDigits_and_IntegerDigits.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_04_Using_FractionDigits_and_IntegerDigits.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_05_Parentheses_Instead_of_Appending_A_Minus_Sign.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_05_Parentheses_Instead_of_Appending_A_Minus_Sign.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_05_Parentheses_Instead_of_Appending_A_Minus_Sign.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_05_Parentheses_Instead_of_Appending_A_Minus_Sign.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_06_Generic_Type.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_06_Generic_Type.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_06_Generic_Type.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_06_Generic_Type.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_07_Enable_Min_Max.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_07_Enable_Min_Max.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_07_Enable_Min_Max.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_07_Enable_Min_Max.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_08_Text_Alignment.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_08_Text_Alignment.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_08_Text_Alignment.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_08_Text_Alignment.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_09_Allow_Negative_Numbers.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_09_Allow_Negative_Numbers.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_09_Allow_Negative_Numbers.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_09_Allow_Negative_Numbers.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_10_A_Disable_Number_Input.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_10_A_Disable_Number_Input.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_10_A_Disable_Number_Input.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_10_A_Disable_Number_Input.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_10_B_Disable_Number_Input.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_10_B_Disable_Number_Input.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_10_B_Disable_Number_Input.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_10_B_Disable_Number_Input.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_11_Validations.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_11_Validations.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_11_Validations.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_11_Validations.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_12_Decimals.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_12_Decimals.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_12_Decimals.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_12_Decimals.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_13_Events_Value_Changed.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_13_Events_Value_Changed.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/CurrencyInput/CurrencyInput_Demo_13_Events_Value_Changed.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/CurrencyInput/CurrencyInput_Demo_13_Events_Value_Changed.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/DateInput/DateInputDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/DateInput/DateInputDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/DateInput/DateInputDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/DateInput/DateInputDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/DateInput/DateInput_Demo_01_Basic_Usage.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/DateInput/DateInput_Demo_01_Basic_Usage.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/DateInput/DateInput_Demo_01_Basic_Usage.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/DateInput/DateInput_Demo_01_Basic_Usage.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/DateInput/DateInput_Demo_02_Generic_Type.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/DateInput/DateInput_Demo_02_Generic_Type.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/DateInput/DateInput_Demo_02_Generic_Type.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/DateInput/DateInput_Demo_02_Generic_Type.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/DateInput/DateInput_Demo_03_Max_Min.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/DateInput/DateInput_Demo_03_Max_Min.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/DateInput/DateInput_Demo_03_Max_Min.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/DateInput/DateInput_Demo_03_Max_Min.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/DateInput/DateInput_Demo_04_A_Disable_Date_Input.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/DateInput/DateInput_Demo_04_A_Disable_Date_Input.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/DateInput/DateInput_Demo_04_A_Disable_Date_Input.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/DateInput/DateInput_Demo_04_A_Disable_Date_Input.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/DateInput/DateInput_Demo_04_B_Disable_Date_Input.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/DateInput/DateInput_Demo_04_B_Disable_Date_Input.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/DateInput/DateInput_Demo_04_B_Disable_Date_Input.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/DateInput/DateInput_Demo_04_B_Disable_Date_Input.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/DateInput/DateInput_Demo_05_Validations.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/DateInput/DateInput_Demo_05_Validations.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/DateInput/DateInput_Demo_05_Validations.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/DateInput/DateInput_Demo_05_Validations.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/DateInput/DateInput_Demo_06_Events_Value_Changed.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/DateInput/DateInput_Demo_06_Events_Value_Changed.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/DateInput/DateInput_Demo_06_Events_Value_Changed.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/DateInput/DateInput_Demo_06_Events_Value_Changed.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/DateInput/DateInput_Demo_07_Restrict_The_Date_Field_Based_On_The_Entry_In_Another_Date_Field.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/DateInput/DateInput_Demo_07_Restrict_The_Date_Field_Based_On_The_Entry_In_Another_Date_Field.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/DateInput/DateInput_Demo_07_Restrict_The_Date_Field_Based_On_The_Entry_In_Another_Date_Field.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/DateInput/DateInput_Demo_07_Restrict_The_Date_Field_Based_On_The_Entry_In_Another_Date_Field.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInputDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInputDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInputDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInputDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInput_Demo_01_Basic_Usage.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInput_Demo_01_Basic_Usage.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInput_Demo_01_Basic_Usage.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInput_Demo_01_Basic_Usage.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInput_Demo_02_Generic_Type.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInput_Demo_02_Generic_Type.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInput_Demo_02_Generic_Type.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInput_Demo_02_Generic_Type.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInput_Demo_03_Enable_Min_Max.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInput_Demo_03_Enable_Min_Max.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInput_Demo_03_Enable_Min_Max.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInput_Demo_03_Enable_Min_Max.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInput_Demo_04_Step.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInput_Demo_04_Step.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInput_Demo_04_Step.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInput_Demo_04_Step.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInput_Demo_05_Text_Alignment.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInput_Demo_05_Text_Alignment.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInput_Demo_05_Text_Alignment.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInput_Demo_05_Text_Alignment.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInput_Demo_06_Allow_Negative_Numbers.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInput_Demo_06_Allow_Negative_Numbers.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInput_Demo_06_Allow_Negative_Numbers.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInput_Demo_06_Allow_Negative_Numbers.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInput_Demo_07_A_Disable_Number_Input.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInput_Demo_07_A_Disable_Number_Input.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInput_Demo_07_A_Disable_Number_Input.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInput_Demo_07_A_Disable_Number_Input.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInput_Demo_07_B_Disable_Number_Input.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInput_Demo_07_B_Disable_Number_Input.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInput_Demo_07_B_Disable_Number_Input.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInput_Demo_07_B_Disable_Number_Input.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInput_Demo_08_Validations.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInput_Demo_08_Validations.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInput_Demo_08_Validations.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInput_Demo_08_Validations.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInput_Demo_09_Events_Value_Changed.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInput_Demo_09_Events_Value_Changed.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/NumberInput/NumberInput_Demo_09_Events_Value_Changed.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/NumberInput/NumberInput_Demo_09_Events_Value_Changed.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/RangeInput/RangeInputDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/RangeInput/RangeInputDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/RangeInput/RangeInputDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/RangeInput/RangeInputDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/RangeInput/RangeInput_Demo_01_Basic_Usage_A.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/RangeInput/RangeInput_Demo_01_Basic_Usage_A.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/RangeInput/RangeInput_Demo_01_Basic_Usage_A.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/RangeInput/RangeInput_Demo_01_Basic_Usage_A.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/RangeInput/RangeInput_Demo_01_Basic_Usage_B.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/RangeInput/RangeInput_Demo_01_Basic_Usage_B.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/RangeInput/RangeInput_Demo_01_Basic_Usage_B.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/RangeInput/RangeInput_Demo_01_Basic_Usage_B.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/RangeInput/RangeInput_Demo_02_Disabled_A.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/RangeInput/RangeInput_Demo_02_Disabled_A.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/RangeInput/RangeInput_Demo_02_Disabled_A.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/RangeInput/RangeInput_Demo_02_Disabled_A.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/RangeInput/RangeInput_Demo_02_Disabled_B.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/RangeInput/RangeInput_Demo_02_Disabled_B.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/RangeInput/RangeInput_Demo_02_Disabled_B.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/RangeInput/RangeInput_Demo_02_Disabled_B.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/RangeInput/RangeInput_Demo_03_Min_Max.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/RangeInput/RangeInput_Demo_03_Min_Max.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/RangeInput/RangeInput_Demo_03_Min_Max.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/RangeInput/RangeInput_Demo_03_Min_Max.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/RangeInput/RangeInput_Demo_04_Step.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/RangeInput/RangeInput_Demo_04_Step.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/RangeInput/RangeInput_Demo_04_Step.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/RangeInput/RangeInput_Demo_04_Step.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/RangeInput/RangeInput_Demo_05_Decimals.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/RangeInput/RangeInput_Demo_05_Decimals.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/RangeInput/RangeInput_Demo_05_Decimals.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/RangeInput/RangeInput_Demo_05_Decimals.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/RangeInput/RangeInput_Demo_06_Tick_Marks.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/RangeInput/RangeInput_Demo_06_Tick_Marks.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/RangeInput/RangeInput_Demo_06_Tick_Marks.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/RangeInput/RangeInput_Demo_06_Tick_Marks.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/Switch/SwitchDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/Switch/SwitchDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/Switch/SwitchDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/Switch/SwitchDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/Switch/Switch_Demo_01_Basic_Usage.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/Switch/Switch_Demo_01_Basic_Usage.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/Switch/Switch_Demo_01_Basic_Usage.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/Switch/Switch_Demo_01_Basic_Usage.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/Switch/Switch_Demo_02_A_Disable.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/Switch/Switch_Demo_02_A_Disable.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/Switch/Switch_Demo_02_A_Disable.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/Switch/Switch_Demo_02_A_Disable.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/Switch/Switch_Demo_02_B_Disable.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/Switch/Switch_Demo_02_B_Disable.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/Switch/Switch_Demo_02_B_Disable.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/Switch/Switch_Demo_02_B_Disable.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/Switch/Switch_Demo_03_Reverse.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/Switch/Switch_Demo_03_Reverse.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/Switch/Switch_Demo_03_Reverse.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/Switch/Switch_Demo_03_Reverse.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/Switch/Switch_Demo_04_Events_Value_Changed.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/Switch/Switch_Demo_04_Events_Value_Changed.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/Switch/Switch_Demo_04_Events_Value_Changed.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/Switch/Switch_Demo_04_Events_Value_Changed.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/Switch/Switch_Demo_05_Form.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/Switch/Switch_Demo_05_Form.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/Switch/Switch_Demo_05_Form.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/Switch/Switch_Demo_05_Form.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/TimeInput/TimeInputDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/TimeInput/TimeInputDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/TimeInput/TimeInputDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/TimeInput/TimeInputDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/TimeInput/TimeInput_Demo_01_Basic_Usage.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/TimeInput/TimeInput_Demo_01_Basic_Usage.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/TimeInput/TimeInput_Demo_01_Basic_Usage.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/TimeInput/TimeInput_Demo_01_Basic_Usage.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/TimeInput/TimeInput_Demo_02_Generic_Type.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/TimeInput/TimeInput_Demo_02_Generic_Type.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/TimeInput/TimeInput_Demo_02_Generic_Type.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/TimeInput/TimeInput_Demo_02_Generic_Type.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/TimeInput/TimeInput_Demo_03_Max_Min.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/TimeInput/TimeInput_Demo_03_Max_Min.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/TimeInput/TimeInput_Demo_03_Max_Min.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/TimeInput/TimeInput_Demo_03_Max_Min.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/TimeInput/TimeInput_Demo_04_A_Disable.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/TimeInput/TimeInput_Demo_04_A_Disable.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/TimeInput/TimeInput_Demo_04_A_Disable.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/TimeInput/TimeInput_Demo_04_A_Disable.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/TimeInput/TimeInput_Demo_04_B_Disable.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/TimeInput/TimeInput_Demo_04_B_Disable.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/TimeInput/TimeInput_Demo_04_B_Disable.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/TimeInput/TimeInput_Demo_04_B_Disable.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/TimeInput/TimeInput_Demo_05_Validations.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/TimeInput/TimeInput_Demo_05_Validations.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/TimeInput/TimeInput_Demo_05_Validations.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/TimeInput/TimeInput_Demo_05_Validations.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/TimeInput/TimeInput_Demo_06_Events_Value_Changed.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/TimeInput/TimeInput_Demo_06_Events_Value_Changed.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/TimeInput/TimeInput_Demo_06_Events_Value_Changed.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/TimeInput/TimeInput_Demo_06_Events_Value_Changed.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Form/TimeInput/TimeInput_Demo_07_Restrict_The_Time_Field_Based_On_The_Entry_In_Another_Time_Field.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Form/TimeInput/TimeInput_Demo_07_Restrict_The_Time_Field_Based_On_The_Entry_In_Another_Time_Field.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Form/TimeInput/TimeInput_Demo_07_Restrict_The_Time_Field_Based_On_The_Entry_In_Another_Time_Field.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Form/TimeInput/TimeInput_Demo_07_Restrict_The_Time_Field_Based_On_The_Entry_In_Another_Time_Field.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/GettingStarted/GettingStartedDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/GettingStarted/GettingStartedDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/GettingStarted/GettingStartedDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/GettingStarted/GettingStartedDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/GridDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/GridDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/GridDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/GridDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_01_A_Client_Side_Filtering.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_01_A_Client_Side_Filtering.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_01_A_Client_Side_Filtering.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_01_A_Client_Side_Filtering.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_01_B_Client_Side_Filtering_With_StringComparision.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_01_B_Client_Side_Filtering_With_StringComparision.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_01_B_Client_Side_Filtering_With_StringComparision.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_01_B_Client_Side_Filtering_With_StringComparision.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_02_Client_Side_Paging.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_02_Client_Side_Paging.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_02_Client_Side_Paging.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_02_Client_Side_Paging.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_03_Client_Side_Sorting.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_03_Client_Side_Sorting.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_03_Client_Side_Sorting.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_03_Client_Side_Sorting.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_04_Client_Side_Filtering_Paging_And_Sorting.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_04_Client_Side_Filtering_Paging_And_Sorting.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_04_Client_Side_Filtering_Paging_And_Sorting.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_04_Client_Side_Filtering_Paging_And_Sorting.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_05_Set_Default_Filter.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_05_Set_Default_Filter.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_05_Set_Default_Filter.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_05_Set_Default_Filter.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_06_Disable_Specific_Column_Filter.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_06_Disable_Specific_Column_Filter.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_06_Disable_Specific_Column_Filter.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_06_Disable_Specific_Column_Filter.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_06_Increase_Filter_Textbox_Width.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_06_Increase_Filter_Textbox_Width.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_06_Increase_Filter_Textbox_Width.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_06_Increase_Filter_Textbox_Width.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_07_Server_Side_Filtering_Paging_And_Sorting.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_07_Server_Side_Filtering_Paging_And_Sorting.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_07_Server_Side_Filtering_Paging_And_Sorting.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_07_Server_Side_Filtering_Paging_And_Sorting.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_08_Default_Sorting.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_08_Default_Sorting.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_08_Default_Sorting.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_08_Default_Sorting.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_09_Disable_Specific_Column_Sorting.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_09_Disable_Specific_Column_Sorting.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_09_Disable_Specific_Column_Sorting.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_09_Disable_Specific_Column_Sorting.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_10_Header_Text_Alignment.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_10_Header_Text_Alignment.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_10_Header_Text_Alignment.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_10_Header_Text_Alignment.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_11_Grid_Cell_Alignment.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_11_Grid_Cell_Alignment.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_11_Grid_Cell_Alignment.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_11_Grid_Cell_Alignment.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_12_Grid_Cell_Formating.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_12_Grid_Cell_Formating.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_12_Grid_Cell_Formating.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_12_Grid_Cell_Formating.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_13_Grid_Cell_Nowrap.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_13_Grid_Cell_Nowrap.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_13_Grid_Cell_Nowrap.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_13_Grid_Cell_Nowrap.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_15_Empty_Data.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_15_Empty_Data.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_15_Empty_Data.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_15_Empty_Data.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_16_Save_And_Load_Grid_Settings.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_16_Save_And_Load_Grid_Settings.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_16_Save_And_Load_Grid_Settings.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_16_Save_And_Load_Grid_Settings.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_17_A_Data_Parameter_Assign_Collection.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_17_A_Data_Parameter_Assign_Collection.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_17_A_Data_Parameter_Assign_Collection.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_17_A_Data_Parameter_Assign_Collection.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_17_B_Data_Parameter_Update_Collection.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_17_B_Data_Parameter_Update_Collection.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_17_B_Data_Parameter_Update_Collection.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_17_B_Data_Parameter_Update_Collection.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_18_Specify_Custom_Row_Class.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_18_Specify_Custom_Row_Class.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_18_Specify_Custom_Row_Class.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_18_Specify_Custom_Row_Class.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_19_Specify_Custom_Column_Class.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_19_Specify_Custom_Column_Class.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_19_Specify_Custom_Column_Class.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_19_Specify_Custom_Column_Class.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_20_Specify_Custom_Column_Header.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_20_Specify_Custom_Column_Header.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_20_Specify_Custom_Column_Header.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_20_Specify_Custom_Column_Header.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_21_Selection.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_21_Selection.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_21_Selection.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_21_Selection.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_22_Multiple_Selection.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_22_Multiple_Selection.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_22_Multiple_Selection.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_22_Multiple_Selection.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_23_Disable_Selection.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_23_Disable_Selection.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_23_Disable_Selection.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_23_Disable_Selection.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_24_Dynamic_Page_Size.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_24_Dynamic_Page_Size.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_24_Dynamic_Page_Size.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_24_Dynamic_Page_Size.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_25_Page_Size_Selection.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_25_Page_Size_Selection.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_25_Page_Size_Selection.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_25_Page_Size_Selection.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_26_Header_Row_CSS_Class.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_26_Header_Row_CSS_Class.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_26_Header_Row_CSS_Class.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_26_Header_Row_CSS_Class.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_27_Filters_Row_CSS_Class.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_27_Filters_Row_CSS_Class.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_27_Filters_Row_CSS_Class.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_27_Filters_Row_CSS_Class.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_28_Row_Click.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_28_Row_Click.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_28_Row_Click.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_28_Row_Click.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_29_Row_Double_Click.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_29_Row_Double_Click.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_29_Row_Double_Click.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_29_Row_Double_Click.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_30_Translations.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_30_Translations.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_30_Translations.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_30_Translations.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_31_Fixed_Header_A.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_31_Fixed_Header_A.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_31_Fixed_Header_A.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_31_Fixed_Header_A.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_31_Fixed_Header_B_With_Filters.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_31_Fixed_Header_B_With_Filters.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_31_Fixed_Header_B_With_Filters.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_31_Fixed_Header_B_With_Filters.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_32_Freeze_Column_A_Text_Nowrap.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_32_Freeze_Column_A_Text_Nowrap.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_32_Freeze_Column_A_Text_Nowrap.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_32_Freeze_Column_A_Text_Nowrap.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_32_Freeze_Column_B_Fixed_Header.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_32_Freeze_Column_B_Fixed_Header.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_32_Freeze_Column_B_Fixed_Header.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_32_Freeze_Column_B_Fixed_Header.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_32_Freeze_Column_C_Fixed_Header_With_Filters.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_32_Freeze_Column_C_Fixed_Header_With_Filters.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_32_Freeze_Column_C_Fixed_Header_With_Filters.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_32_Freeze_Column_C_Fixed_Header_With_Filters.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_33_AutoHide_Paging.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_33_AutoHide_Paging.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Grid/Grid_Demo_33_AutoHide_Paging.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Grid/Grid_Demo_33_AutoHide_Paging.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Icons/IconDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Icons/IconDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Icons/IconDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Icons/IconDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_02_Sizes.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_02_Sizes.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_02_Sizes.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_02_Sizes.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_03_Font_Awesome_Icons.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_03_Font_Awesome_Icons.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_03_Font_Awesome_Icons.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_03_Font_Awesome_Icons.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_04_Colors.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_04_Colors.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_04_Colors.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_04_Colors.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_05_Inline_Text_With_Icon.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_05_Inline_Text_With_Icon.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_05_Inline_Text_With_Icon.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_05_Inline_Text_With_Icon.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_06_A_Link_With_Icon.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_06_A_Link_With_Icon.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_06_A_Link_With_Icon.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_06_A_Link_With_Icon.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_06_B_Link_With_Custom_Icon.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_06_B_Link_With_Custom_Icon.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_06_B_Link_With_Custom_Icon.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_06_B_Link_With_Custom_Icon.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_07_A_Button_With_Icon_And_Text.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_07_A_Button_With_Icon_And_Text.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_07_A_Button_With_Icon_And_Text.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_07_A_Button_With_Icon_And_Text.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_07_B_Button_With_Icon_Only.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_07_B_Button_With_Icon_Only.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_07_B_Button_With_Icon_Only.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_07_B_Button_With_Icon_Only.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_07_C_Button_With_Font_Awesome_Icon.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_07_C_Button_With_Font_Awesome_Icon.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_07_C_Button_With_Font_Awesome_Icon.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_07_C_Button_With_Font_Awesome_Icon.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_09_Tooltip.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_09_Tooltip.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_09_Tooltip.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_09_Tooltip.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_10_Bootstrap_Icons.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_10_Bootstrap_Icons.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Icons/Icon_Demo_10_Bootstrap_Icons.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Icons/Icon_Demo_10_Bootstrap_Icons.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Index.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Index.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Index.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Index.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Layout/server/LayoutServerDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Layout/server/LayoutServerDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Layout/server/LayoutServerDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Layout/server/LayoutServerDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Layout/server/Layout_Server_Demo_01.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Layout/server/Layout_Server_Demo_01.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Layout/server/Layout_Server_Demo_01.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Layout/server/Layout_Server_Demo_01.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Layout/webassembly/LayoutWebAssemblyDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Layout/webassembly/LayoutWebAssemblyDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Layout/webassembly/LayoutWebAssemblyDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Layout/webassembly/LayoutWebAssemblyDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Layout/webassembly/Layout_WebAssembly_Demo_01.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Layout/webassembly/Layout_WebAssembly_Demo_01.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Layout/webassembly/Layout_WebAssembly_Demo_01.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Layout/webassembly/Layout_WebAssembly_Demo_01.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Modal/EmployeeDemoComponent1.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Modal/EmployeeDemoComponent1.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Modal/EmployeeDemoComponent1.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Modal/EmployeeDemoComponent1.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Modal/EmployeeDemoComponent2.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Modal/EmployeeDemoComponent2.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Modal/EmployeeDemoComponent2.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Modal/EmployeeDemoComponent2.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Modal/ModalDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Modal/ModalDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Modal/ModalDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Modal/ModalDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_02_A_Show_Dynamic_Component.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_02_A_Show_Dynamic_Component.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_02_A_Show_Dynamic_Component.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_02_A_Show_Dynamic_Component.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_02_B_Pass_Event_Callback_to_a_Dynamic_Component.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_02_B_Pass_Event_Callback_to_a_Dynamic_Component.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_02_B_Pass_Event_Callback_to_a_Dynamic_Component.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_02_B_Pass_Event_Callback_to_a_Dynamic_Component.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_02_Static_Backdrop.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_02_Static_Backdrop.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_02_Static_Backdrop.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_02_Static_Backdrop.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_03_Scrolling_Long_Content_A.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_03_Scrolling_Long_Content_A.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_03_Scrolling_Long_Content_A.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_03_Scrolling_Long_Content_A.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_03_Scrolling_Long_Content_B.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_03_Scrolling_Long_Content_B.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_03_Scrolling_Long_Content_B.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_03_Scrolling_Long_Content_B.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_04_Vertically_Centered.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_04_Vertically_Centered.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_04_Vertically_Centered.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_04_Vertically_Centered.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_04_Vertically_Centered_And_Scrollable.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_04_Vertically_Centered_And_Scrollable.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_04_Vertically_Centered_And_Scrollable.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_04_Vertically_Centered_And_Scrollable.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_05_Optional_Sizes.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_05_Optional_Sizes.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_05_Optional_Sizes.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_05_Optional_Sizes.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_06_Fullscreen_Modal.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_06_Fullscreen_Modal.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_06_Fullscreen_Modal.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_06_Fullscreen_Modal.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_07_Events.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_07_Events.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Modal/Modal_Demo_07_Events.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Modal/Modal_Demo_07_Events.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Offcanvas/EmployeeDemoComponent1.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/EmployeeDemoComponent1.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Offcanvas/EmployeeDemoComponent1.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/EmployeeDemoComponent1.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Offcanvas/EmployeeDemoComponent2.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/EmployeeDemoComponent2.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Offcanvas/EmployeeDemoComponent2.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/EmployeeDemoComponent2.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Offcanvas/OffcanvasDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/OffcanvasDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Offcanvas/OffcanvasDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/OffcanvasDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Offcanvas/Offcanvas_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/Offcanvas_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Offcanvas/Offcanvas_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/Offcanvas_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Offcanvas/Offcanvas_Demo_02_A_Show_Dynamic_Component.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/Offcanvas_Demo_02_A_Show_Dynamic_Component.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Offcanvas/Offcanvas_Demo_02_A_Show_Dynamic_Component.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/Offcanvas_Demo_02_A_Show_Dynamic_Component.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Offcanvas/Offcanvas_Demo_02_B_Pass_Event_Callback_to_a_Dynamic_Component.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/Offcanvas_Demo_02_B_Pass_Event_Callback_to_a_Dynamic_Component.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Offcanvas/Offcanvas_Demo_02_B_Pass_Event_Callback_to_a_Dynamic_Component.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/Offcanvas_Demo_02_B_Pass_Event_Callback_to_a_Dynamic_Component.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Offcanvas/Offcanvas_Demo_03_Placement.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/Offcanvas_Demo_03_Placement.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Offcanvas/Offcanvas_Demo_03_Placement.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/Offcanvas_Demo_03_Placement.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Offcanvas/Offcanvas_Demo_04_Static_Backdrop.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/Offcanvas_Demo_04_Static_Backdrop.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Offcanvas/Offcanvas_Demo_04_Static_Backdrop.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/Offcanvas_Demo_04_Static_Backdrop.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Offcanvas/Offcanvas_Demo_05_Sizes_A_Small.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/Offcanvas_Demo_05_Sizes_A_Small.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Offcanvas/Offcanvas_Demo_05_Sizes_A_Small.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/Offcanvas_Demo_05_Sizes_A_Small.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Offcanvas/Offcanvas_Demo_05_Sizes_B_Large.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/Offcanvas_Demo_05_Sizes_B_Large.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Offcanvas/Offcanvas_Demo_05_Sizes_B_Large.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/Offcanvas_Demo_05_Sizes_B_Large.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Offcanvas/Offcanvas_Demo_06_Events.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/Offcanvas_Demo_06_Events.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Offcanvas/Offcanvas_Demo_06_Events.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Offcanvas/Offcanvas_Demo_06_Events.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Pagination/PaginationDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Pagination/PaginationDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Pagination/PaginationDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Pagination/PaginationDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Pagination/Pagination_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Pagination/Pagination_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Pagination/Pagination_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Pagination/Pagination_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Pagination/Pagination_Demo_02_Working_With_Icons.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Pagination/Pagination_Demo_02_Working_With_Icons.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Pagination/Pagination_Demo_02_Working_With_Icons.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Pagination/Pagination_Demo_02_Working_With_Icons.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Pagination/Pagination_Demo_03_Disabled_And_Active_States.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Pagination/Pagination_Demo_03_Disabled_And_Active_States.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Pagination/Pagination_Demo_03_Disabled_And_Active_States.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Pagination/Pagination_Demo_03_Disabled_And_Active_States.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Pagination/Pagination_Demo_04_Sizing.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Pagination/Pagination_Demo_04_Sizing.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Pagination/Pagination_Demo_04_Sizing.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Pagination/Pagination_Demo_04_Sizing.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Pagination/Pagination_Demo_05_Alignment.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Pagination/Pagination_Demo_05_Alignment.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Pagination/Pagination_Demo_05_Alignment.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Pagination/Pagination_Demo_05_Alignment.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Pagination/Pagination_Demo_06_Events.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Pagination/Pagination_Demo_06_Events.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Pagination/Pagination_Demo_06_Events.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Pagination/Pagination_Demo_06_Events.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/PdfViewer/PdfViewerDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/PdfViewer/PdfViewerDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/PdfViewer/PdfViewerDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/PdfViewer/PdfViewerDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/PdfViewer/PdfViewer_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/PdfViewer/PdfViewer_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/PdfViewer/PdfViewer_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/PdfViewer/PdfViewer_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/PdfViewer/PdfViewer_Demo_02_Orientation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/PdfViewer/PdfViewer_Demo_02_Orientation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/PdfViewer/PdfViewer_Demo_02_Orientation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/PdfViewer/PdfViewer_Demo_02_Orientation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/PdfViewer/PdfViewer_Demo_03_Base64String.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/PdfViewer/PdfViewer_Demo_03_Base64String.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/PdfViewer/PdfViewer_Demo_03_Base64String.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/PdfViewer/PdfViewer_Demo_03_Base64String.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Placeholders/PlaceholderDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Placeholders/PlaceholderDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Placeholders/PlaceholderDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Placeholders/PlaceholderDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Placeholders/Placeholder_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Placeholders/Placeholder_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Placeholders/Placeholder_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Placeholders/Placeholder_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Placeholders/Placeholder_Demo_02_Width.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Placeholders/Placeholder_Demo_02_Width.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Placeholders/Placeholder_Demo_02_Width.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Placeholders/Placeholder_Demo_02_Width.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Placeholders/Placeholder_Demo_03_Color.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Placeholders/Placeholder_Demo_03_Color.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Placeholders/Placeholder_Demo_03_Color.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Placeholders/Placeholder_Demo_03_Color.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Placeholders/Placeholder_Demo_04_Sizing.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Placeholders/Placeholder_Demo_04_Sizing.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Placeholders/Placeholder_Demo_04_Sizing.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Placeholders/Placeholder_Demo_04_Sizing.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Placeholders/Placeholder_Demo_05_Animation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Placeholders/Placeholder_Demo_05_Animation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Placeholders/Placeholder_Demo_05_Animation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Placeholders/Placeholder_Demo_05_Animation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Preload/PreloadDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Preload/PreloadDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Preload/PreloadDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Preload/PreloadDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Preload/Preload_Demo_01_Global_Preload_For_Application_A.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Preload/Preload_Demo_01_Global_Preload_For_Application_A.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Preload/Preload_Demo_01_Global_Preload_For_Application_A.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Preload/Preload_Demo_01_Global_Preload_For_Application_A.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Preload/Preload_Demo_01_Global_Preload_For_Application_B.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Preload/Preload_Demo_01_Global_Preload_For_Application_B.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Preload/Preload_Demo_01_Global_Preload_For_Application_B.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Preload/Preload_Demo_01_Global_Preload_For_Application_B.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Preload/Preload_Demo_02_Loading_Text.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Preload/Preload_Demo_02_Loading_Text.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Preload/Preload_Demo_02_Loading_Text.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Preload/Preload_Demo_02_Loading_Text.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Preload/Preload_Demo_03_Change_Spinner_Color.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Preload/Preload_Demo_03_Change_Spinner_Color.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Preload/Preload_Demo_03_Change_Spinner_Color.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Preload/Preload_Demo_03_Change_Spinner_Color.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Progress/ProgressDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Progress/ProgressDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Progress/ProgressDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Progress/ProgressDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Progress/Progress_Demo_01_How_It_Works.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Progress/Progress_Demo_01_How_It_Works.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Progress/Progress_Demo_01_How_It_Works.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Progress/Progress_Demo_01_How_It_Works.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Progress/Progress_Demo_02_Labels.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Progress/Progress_Demo_02_Labels.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Progress/Progress_Demo_02_Labels.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Progress/Progress_Demo_02_Labels.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Progress/Progress_Demo_03_Set_Width_Programmatically.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Progress/Progress_Demo_03_Set_Width_Programmatically.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Progress/Progress_Demo_03_Set_Width_Programmatically.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Progress/Progress_Demo_03_Set_Width_Programmatically.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Progress/Progress_Demo_04_Height.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Progress/Progress_Demo_04_Height.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Progress/Progress_Demo_04_Height.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Progress/Progress_Demo_04_Height.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Progress/Progress_Demo_05_Backgrounds.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Progress/Progress_Demo_05_Backgrounds.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Progress/Progress_Demo_05_Backgrounds.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Progress/Progress_Demo_05_Backgrounds.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Progress/Progress_Demo_06_Set_Background_Programmatically.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Progress/Progress_Demo_06_Set_Background_Programmatically.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Progress/Progress_Demo_06_Set_Background_Programmatically.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Progress/Progress_Demo_06_Set_Background_Programmatically.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Progress/Progress_Demo_07_MultipleBars.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Progress/Progress_Demo_07_MultipleBars.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Progress/Progress_Demo_07_MultipleBars.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Progress/Progress_Demo_07_MultipleBars.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Progress/Progress_Demo_08_Striped.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Progress/Progress_Demo_08_Striped.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Progress/Progress_Demo_08_Striped.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Progress/Progress_Demo_08_Striped.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Progress/Progress_Demo_09_Animated_Stripes.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Progress/Progress_Demo_09_Animated_Stripes.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Progress/Progress_Demo_09_Animated_Stripes.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Progress/Progress_Demo_09_Animated_Stripes.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Progress/Progress_Demo_10_Dynamic_Progress.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Progress/Progress_Demo_10_Dynamic_Progress.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Progress/Progress_Demo_10_Dynamic_Progress.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Progress/Progress_Demo_10_Dynamic_Progress.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Ribbon/RibbonDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Ribbon/RibbonDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Ribbon/RibbonDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Ribbon/RibbonDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Ribbon/Ribbon_Demo_01_How_It_Works.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Ribbon/Ribbon_Demo_01_How_It_Works.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Ribbon/Ribbon_Demo_01_How_It_Works.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Ribbon/Ribbon_Demo_01_How_It_Works.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Ribbon/Ribbon_Demo_02_Images.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Ribbon/Ribbon_Demo_02_Images.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Ribbon/Ribbon_Demo_02_Images.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Ribbon/Ribbon_Demo_02_Images.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/ScriptLoader/ScriptLoaderDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/ScriptLoader/ScriptLoaderDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/ScriptLoader/ScriptLoaderDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/ScriptLoader/ScriptLoaderDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/ScriptLoader/ScriptLoader_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/ScriptLoader/ScriptLoader_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/ScriptLoader/ScriptLoader_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/ScriptLoader/ScriptLoader_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/ScriptLoader/ScriptLoader_Demo_02_Events.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/ScriptLoader/ScriptLoader_Demo_02_Events.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/ScriptLoader/ScriptLoader_Demo_02_Events.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/ScriptLoader/ScriptLoader_Demo_02_Events.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Services/ModalService/ModalServiceDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Services/ModalService/ModalServiceDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Services/ModalService/ModalServiceDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Services/ModalService/ModalServiceDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Services/ModalService/ModalService_Demo_01_How_It_Works.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Services/ModalService/ModalService_Demo_01_How_It_Works.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Services/ModalService/ModalService_Demo_01_How_It_Works.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Services/ModalService/ModalService_Demo_01_How_It_Works.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Services/ModalService/ModalService_Demo_02_Vertically_Centered_Modal.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Services/ModalService/ModalService_Demo_02_Vertically_Centered_Modal.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Services/ModalService/ModalService_Demo_02_Vertically_Centered_Modal.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Services/ModalService/ModalService_Demo_02_Vertically_Centered_Modal.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Services/ModalService/ModalService_Demo_03_Size.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Services/ModalService/ModalService_Demo_03_Size.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Services/ModalService/ModalService_Demo_03_Size.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Services/ModalService/ModalService_Demo_03_Size.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Services/ModalService/ModalService_Demo_04_Change_Footer_Button_Color_and_Text.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Services/ModalService/ModalService_Demo_04_Change_Footer_Button_Color_and_Text.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Services/ModalService/ModalService_Demo_04_Change_Footer_Button_Color_and_Text.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Services/ModalService/ModalService_Demo_04_Change_Footer_Button_Color_and_Text.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Services/ModalService/ModalService_Demo_05_Hide_Footer_Button.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Services/ModalService/ModalService_Demo_05_Hide_Footer_Button.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Services/ModalService/ModalService_Demo_05_Hide_Footer_Button.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Services/ModalService/ModalService_Demo_05_Hide_Footer_Button.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Services/ModalService/ModalService_Demo_06_Callback.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Services/ModalService/ModalService_Demo_06_Callback.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Services/ModalService/ModalService_Demo_06_Callback.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Services/ModalService/ModalService_Demo_06_Callback.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Services/ModalService/ModalService_Demo_100_Global_Modal_Service_For_Application_01.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Services/ModalService/ModalService_Demo_100_Global_Modal_Service_For_Application_01.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Services/ModalService/ModalService_Demo_100_Global_Modal_Service_For_Application_01.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Services/ModalService/ModalService_Demo_100_Global_Modal_Service_For_Application_01.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Services/ModalService/ModalService_Demo_100_Global_Modal_Service_For_Application_02.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Services/ModalService/ModalService_Demo_100_Global_Modal_Service_For_Application_02.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Services/ModalService/ModalService_Demo_100_Global_Modal_Service_For_Application_02.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Services/ModalService/ModalService_Demo_100_Global_Modal_Service_For_Application_02.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Sidebar/SidebarDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/SidebarDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Sidebar/SidebarDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/SidebarDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Sidebar/Sidebar_Demo_01_Basic_Usage.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_01_Basic_Usage.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Sidebar/Sidebar_Demo_01_Basic_Usage.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_01_Basic_Usage.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Sidebar/Sidebar_Demo_02_Two_level_navigation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_02_Two_level_navigation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Sidebar/Sidebar_Demo_02_Two_level_navigation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_02_Two_level_navigation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Sidebar/Sidebar_Demo_03_Change_Icons_Color.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_03_Change_Icons_Color.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Sidebar/Sidebar_Demo_03_Change_Icons_Color.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_03_Change_Icons_Color.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Sidebar/Sidebar_Demo_04_Full_layout_with_sidebar.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_04_Full_layout_with_sidebar.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Sidebar/Sidebar_Demo_04_Full_layout_with_sidebar.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_04_Full_layout_with_sidebar.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Sidebar/Sidebar_Demo_05_Toggle_Sidebar_to_Show_Icons_Only.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_05_Toggle_Sidebar_to_Show_Icons_Only.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Sidebar/Sidebar_Demo_05_Toggle_Sidebar_to_Show_Icons_Only.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_05_Toggle_Sidebar_to_Show_Icons_Only.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Sidebar/Sidebar_Demo_06_Show_Badge.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_06_Show_Badge.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Sidebar/Sidebar_Demo_06_Show_Badge.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_06_Show_Badge.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Sidebar/Sidebar_Demo_07_Custom_Brand_Icon.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_07_Custom_Brand_Icon.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Sidebar/Sidebar_Demo_07_Custom_Brand_Icon.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_07_Custom_Brand_Icon.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Sidebar/Sidebar_Demo_08_Show_Image_as_Brand_Logo.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_08_Show_Image_as_Brand_Logo.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Sidebar/Sidebar_Demo_08_Show_Image_as_Brand_Logo.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_08_Show_Image_as_Brand_Logo.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Sidebar/Sidebar_Demo_09_Customize_Sidebar.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_09_Customize_Sidebar.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Sidebar/Sidebar_Demo_09_Customize_Sidebar.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_09_Customize_Sidebar.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Sidebar/Sidebar_Demo_10_Apply_Custom_CSS_Class_to_NavItem.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_10_Apply_Custom_CSS_Class_to_NavItem.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Sidebar/Sidebar_Demo_10_Apply_Custom_CSS_Class_to_NavItem.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar/Sidebar_Demo_10_Apply_Custom_CSS_Class_to_NavItem.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Sidebar2/Sidebar2Documentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2Documentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Sidebar2/Sidebar2Documentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2Documentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Sidebar2/Sidebar2_Demo_01_Basic_Usage.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_01_Basic_Usage.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Sidebar2/Sidebar2_Demo_01_Basic_Usage.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_01_Basic_Usage.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Sidebar2/Sidebar2_Demo_02_More_Nested_Levels.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_02_More_Nested_Levels.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Sidebar2/Sidebar2_Demo_02_More_Nested_Levels.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_02_More_Nested_Levels.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Sidebar2/Sidebar2_Demo_03_Change_Icons_Color.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_03_Change_Icons_Color.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Sidebar2/Sidebar2_Demo_03_Change_Icons_Color.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_03_Change_Icons_Color.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Sidebar2/Sidebar2_Demo_04_Full_layout_with_sidebar.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_04_Full_layout_with_sidebar.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Sidebar2/Sidebar2_Demo_04_Full_layout_with_sidebar.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_04_Full_layout_with_sidebar.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Sidebar2/Sidebar2_Demo_07_Custom_Brand_Icon.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_07_Custom_Brand_Icon.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Sidebar2/Sidebar2_Demo_07_Custom_Brand_Icon.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_07_Custom_Brand_Icon.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Sidebar2/Sidebar2_Demo_08_Show_Image_as_Brand_Logo.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_08_Show_Image_as_Brand_Logo.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Sidebar2/Sidebar2_Demo_08_Show_Image_as_Brand_Logo.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Sidebar2/Sidebar2_Demo_08_Show_Image_as_Brand_Logo.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableListDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableListDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableListDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableListDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_00_Setup.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_00_Setup.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_00_Setup.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_00_Setup.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_02_Shared_Lists_A.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_02_Shared_Lists_A.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_02_Shared_Lists_A.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_02_Shared_Lists_A.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_02_Shared_Lists_B_Three_Lists.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_02_Shared_Lists_B_Three_Lists.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_02_Shared_Lists_B_Three_Lists.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_02_Shared_Lists_B_Three_Lists.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_03_Cloning.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_03_Cloning.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_03_Cloning.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_03_Cloning.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_04_Disable_Sorting.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_04_Disable_Sorting.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_04_Disable_Sorting.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_04_Disable_Sorting.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_05_Handle.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_05_Handle.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_05_Handle.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_05_Handle.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_06_Disable_Item.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_06_Disable_Item.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_06_Disable_Item.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_06_Disable_Item.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_07_Nested_Sortables.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_07_Nested_Sortables.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_07_Nested_Sortables.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_07_Nested_Sortables.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_08_Dynamic_Data.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_08_Dynamic_Data.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_08_Dynamic_Data.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_08_Dynamic_Data.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_09_Empty_Data.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_09_Empty_Data.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/SortableList/SortableList_Demo_09_Empty_Data.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/SortableList/SortableList_Demo_09_Empty_Data.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Spinners/SpinnersDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/SpinnersDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Spinners/SpinnersDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/SpinnersDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_01_Border_Spinner.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_01_Border_Spinner.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_01_Border_Spinner.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_01_Border_Spinner.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_02_Colors.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_02_Colors.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_02_Colors.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_02_Colors.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_03_Grow_spinner_A.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_03_Grow_spinner_A.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_03_Grow_spinner_A.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_03_Grow_spinner_A.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_03_Grow_spinner_B.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_03_Grow_spinner_B.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_03_Grow_spinner_B.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_03_Grow_spinner_B.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_04_Loading_dots_spinner_A.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_04_Loading_dots_spinner_A.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_04_Loading_dots_spinner_A.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_04_Loading_dots_spinner_A.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_04_Loading_dots_spinner_B.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_04_Loading_dots_spinner_B.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_04_Loading_dots_spinner_B.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_04_Loading_dots_spinner_B.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_05_Alignment_A_Margin.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_05_Alignment_A_Margin.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_05_Alignment_A_Margin.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_05_Alignment_A_Margin.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_05_Alignment_B_Palcement_Flex_01.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_05_Alignment_B_Palcement_Flex_01.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_05_Alignment_B_Palcement_Flex_01.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_05_Alignment_B_Palcement_Flex_01.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_05_Alignment_B_Palcement_Flex_02.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_05_Alignment_B_Palcement_Flex_02.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_05_Alignment_B_Palcement_Flex_02.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_05_Alignment_B_Palcement_Flex_02.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_05_Alignment_C_Palcement_Floats.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_05_Alignment_C_Palcement_Floats.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_05_Alignment_C_Palcement_Floats.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_05_Alignment_C_Palcement_Floats.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_05_Alignment_D_Palcement_Text_align.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_05_Alignment_D_Palcement_Text_align.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_05_Alignment_D_Palcement_Text_align.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_05_Alignment_D_Palcement_Text_align.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_06_Size_A_Border.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_06_Size_A_Border.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_06_Size_A_Border.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_06_Size_A_Border.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_06_Size_B_Grow.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_06_Size_B_Grow.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_06_Size_B_Grow.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_06_Size_B_Grow.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_06_Size_C_Dots.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_06_Size_C_Dots.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_06_Size_C_Dots.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_06_Size_C_Dots.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_07_Visible.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_07_Visible.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Spinners/Spinners_Demo_07_Visible.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Spinners/Spinners_Demo_07_Visible.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tabs/TabsDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/TabsDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tabs/TabsDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/TabsDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_02_Enable_FadeEffect.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_02_Enable_FadeEffect.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_02_Enable_FadeEffect.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_02_Enable_FadeEffect.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_03_Title_with_Icon.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_03_Title_with_Icon.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_03_Title_with_Icon.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_03_Title_with_Icon.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_04_Disable_Tab.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_04_Disable_Tab.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_04_Disable_Tab.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_04_Disable_Tab.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_05_Nav_Style_Pills.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_05_Nav_Style_Pills.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_05_Nav_Style_Pills.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_05_Nav_Style_Pills.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_06_Nav_Style_Underline.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_06_Nav_Style_Underline.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_06_Nav_Style_Underline.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_06_Nav_Style_Underline.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_07_Vertical_A.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_07_Vertical_A.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_07_Vertical_A.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_07_Vertical_A.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_07_Vertical_B_Pills.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_07_Vertical_B_Pills.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_07_Vertical_B_Pills.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_07_Vertical_B_Pills.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_07_Vertical_C_Underline.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_07_Vertical_C_Underline.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_07_Vertical_C_Underline.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_07_Vertical_C_Underline.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_08_Activate_Individual_Tabs.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_08_Activate_Individual_Tabs.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_08_Activate_Individual_Tabs.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_08_Activate_Individual_Tabs.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_09_Events_Order.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_09_Events_Order.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_09_Events_Order.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_09_Events_Order.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_10_Events_Example.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_10_Events_Example.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_10_Events_Example.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_10_Events_Example.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_11_Methods_Set_Active_Tab_OnAfterRender.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_11_Methods_Set_Active_Tab_OnAfterRender.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_11_Methods_Set_Active_Tab_OnAfterRender.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_11_Methods_Set_Active_Tab_OnAfterRender.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_12_Tab_Callback_Event_OnClick.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_12_Tab_Callback_Event_OnClick.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_12_Tab_Callback_Event_OnClick.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_12_Tab_Callback_Event_OnClick.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_13_Dynamic_Tabs.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_13_Dynamic_Tabs.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_13_Dynamic_Tabs.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_13_Dynamic_Tabs.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_14_Remove_Dynamic_Tabs.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_14_Remove_Dynamic_Tabs.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tabs/Tabs_Demo_14_Remove_Dynamic_Tabs.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tabs/Tabs_Demo_14_Remove_Dynamic_Tabs.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Toasts/ToastsDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Toasts/ToastsDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Toasts/ToastsDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Toasts/ToastsDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Toasts/Toasts_Demo_01_Toast_With_Title.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Toasts/Toasts_Demo_01_Toast_With_Title.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Toasts/Toasts_Demo_01_Toast_With_Title.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Toasts/Toasts_Demo_01_Toast_With_Title.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Toasts/Toasts_Demo_02_Toast_Without_Title.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Toasts/Toasts_Demo_02_Toast_Without_Title.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Toasts/Toasts_Demo_02_Toast_Without_Title.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Toasts/Toasts_Demo_02_Toast_Without_Title.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Toasts/Toasts_Demo_03_A_Auto_Hide.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Toasts/Toasts_Demo_03_A_Auto_Hide.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Toasts/Toasts_Demo_03_A_Auto_Hide.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Toasts/Toasts_Demo_03_A_Auto_Hide.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Toasts/Toasts_Demo_03_B_Auto_Hide_Individual_Messages.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Toasts/Toasts_Demo_03_B_Auto_Hide_Individual_Messages.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Toasts/Toasts_Demo_03_B_Auto_Hide_Individual_Messages.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Toasts/Toasts_Demo_03_B_Auto_Hide_Individual_Messages.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Toasts/Toasts_Demo_04_Placement.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Toasts/Toasts_Demo_04_Placement.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Toasts/Toasts_Demo_04_Placement.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Toasts/Toasts_Demo_04_Placement.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Toasts/Toasts_Demo_05_StackLength.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Toasts/Toasts_Demo_05_StackLength.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Toasts/Toasts_Demo_05_StackLength.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Toasts/Toasts_Demo_05_StackLength.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Toasts/Toasts_Demo_06_Global_Toasts_Service_For_Application_01.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Toasts/Toasts_Demo_06_Global_Toasts_Service_For_Application_01.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Toasts/Toasts_Demo_06_Global_Toasts_Service_For_Application_01.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Toasts/Toasts_Demo_06_Global_Toasts_Service_For_Application_01.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Toasts/Toasts_Demo_06_Global_Toasts_Service_For_Application_02.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Toasts/Toasts_Demo_06_Global_Toasts_Service_For_Application_02.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Toasts/Toasts_Demo_06_Global_Toasts_Service_For_Application_02.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Toasts/Toasts_Demo_06_Global_Toasts_Service_For_Application_02.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tooltips/TooltipsDocumentation.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tooltips/TooltipsDocumentation.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tooltips/TooltipsDocumentation.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tooltips/TooltipsDocumentation.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tooltips/Tooltips_Demo_01_Examples.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tooltips/Tooltips_Demo_01_Examples.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tooltips/Tooltips_Demo_01_Examples.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tooltips/Tooltips_Demo_01_Examples.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tooltips/Tooltips_Demo_02_Disabled_Button_With_Tooltip.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tooltips/Tooltips_Demo_02_Disabled_Button_With_Tooltip.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tooltips/Tooltips_Demo_02_Disabled_Button_With_Tooltip.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tooltips/Tooltips_Demo_02_Disabled_Button_With_Tooltip.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tooltips/Tooltips_Demo_03_Icon_With_Click_Event.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tooltips/Tooltips_Demo_03_Icon_With_Click_Event.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tooltips/Tooltips_Demo_03_Icon_With_Click_Event.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tooltips/Tooltips_Demo_03_Icon_With_Click_Event.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tooltips/Tooltips_Demo_04_Dynamically_Update_Tooltip_Text.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tooltips/Tooltips_Demo_04_Dynamically_Update_Tooltip_Text.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tooltips/Tooltips_Demo_04_Dynamically_Update_Tooltip_Text.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tooltips/Tooltips_Demo_04_Dynamically_Update_Tooltip_Text.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tooltips/Tooltips_Demo_05_Tooltip_With_Navigation_Link.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tooltips/Tooltips_Demo_05_Tooltip_With_Navigation_Link.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tooltips/Tooltips_Demo_05_Tooltip_With_Navigation_Link.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tooltips/Tooltips_Demo_05_Tooltip_With_Navigation_Link.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tooltips/Tooltips_Demo_06_Colors.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tooltips/Tooltips_Demo_06_Colors.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tooltips/Tooltips_Demo_06_Colors.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tooltips/Tooltips_Demo_06_Colors.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tooltips/Tooltips_Demo_07_Dynamically_Change_Color.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tooltips/Tooltips_Demo_07_Dynamically_Change_Color.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tooltips/Tooltips_Demo_07_Dynamically_Change_Color.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tooltips/Tooltips_Demo_07_Dynamically_Change_Color.razor
diff --git a/BlazorBootstrap.Demo.RCL/Pages/Tooltips/Tooltips_Demo_08_HTML.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Tooltips/Tooltips_Demo_08_HTML.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Pages/Tooltips/Tooltips_Demo_08_HTML.razor
rename to BlazorBootstrap.Demo.RCL/Components/Pages/Tooltips/Tooltips_Demo_08_HTML.razor
diff --git a/BlazorBootstrap.Demo.RCL/Shared/Components/CarbonAds.razor b/BlazorBootstrap.Demo.RCL/Components/Shared/CarbonAds.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Shared/Components/CarbonAds.razor
rename to BlazorBootstrap.Demo.RCL/Components/Shared/CarbonAds.razor
diff --git a/BlazorBootstrap.Demo.RCL/Shared/Components/CarbonAds.razor.cs b/BlazorBootstrap.Demo.RCL/Components/Shared/CarbonAds.razor.cs
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Shared/Components/CarbonAds.razor.cs
rename to BlazorBootstrap.Demo.RCL/Components/Shared/CarbonAds.razor.cs
diff --git a/BlazorBootstrap.Demo.RCL/Shared/Components/CodeSnippet.cs b/BlazorBootstrap.Demo.RCL/Components/Shared/CodeSnippet.cs
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Shared/Components/CodeSnippet.cs
rename to BlazorBootstrap.Demo.RCL/Components/Shared/CodeSnippet.cs
diff --git a/BlazorBootstrap.Demo.RCL/Shared/Components/Demo.razor b/BlazorBootstrap.Demo.RCL/Components/Shared/Demo.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Shared/Components/Demo.razor
rename to BlazorBootstrap.Demo.RCL/Components/Shared/Demo.razor
diff --git a/BlazorBootstrap.Demo.RCL/Shared/Components/Demo.razor.cs b/BlazorBootstrap.Demo.RCL/Components/Shared/Demo.razor.cs
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Shared/Components/Demo.razor.cs
rename to BlazorBootstrap.Demo.RCL/Components/Shared/Demo.razor.cs
diff --git a/BlazorBootstrap.Demo.RCL/Shared/Components/Demo.razor.css b/BlazorBootstrap.Demo.RCL/Components/Shared/Demo.razor.css
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Shared/Components/Demo.razor.css
rename to BlazorBootstrap.Demo.RCL/Components/Shared/Demo.razor.css
diff --git a/BlazorBootstrap.Demo.RCL/Shared/Components/MetaTags.razor b/BlazorBootstrap.Demo.RCL/Components/Shared/MetaTags.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Shared/Components/MetaTags.razor
rename to BlazorBootstrap.Demo.RCL/Components/Shared/MetaTags.razor
diff --git a/BlazorBootstrap.Demo.RCL/Shared/Components/MetaTags.razor.cs b/BlazorBootstrap.Demo.RCL/Components/Shared/MetaTags.razor.cs
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Shared/Components/MetaTags.razor.cs
rename to BlazorBootstrap.Demo.RCL/Components/Shared/MetaTags.razor.cs
diff --git a/BlazorBootstrap.Demo.RCL/Shared/Components/SectionHeading.razor b/BlazorBootstrap.Demo.RCL/Components/Shared/SectionHeading.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Shared/Components/SectionHeading.razor
rename to BlazorBootstrap.Demo.RCL/Components/Shared/SectionHeading.razor
diff --git a/BlazorBootstrap.Demo.RCL/Shared/Components/SectionHeading.razor.cs b/BlazorBootstrap.Demo.RCL/Components/Shared/SectionHeading.razor.cs
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Shared/Components/SectionHeading.razor.cs
rename to BlazorBootstrap.Demo.RCL/Components/Shared/SectionHeading.razor.cs
diff --git a/BlazorBootstrap.Demo.RCL/Shared/Components/Skippy.razor b/BlazorBootstrap.Demo.RCL/Components/Shared/Skippy.razor
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Shared/Components/Skippy.razor
rename to BlazorBootstrap.Demo.RCL/Components/Shared/Skippy.razor
diff --git a/BlazorBootstrap.Demo.RCL/Shared/Components/Skippy.razor.cs b/BlazorBootstrap.Demo.RCL/Components/Shared/Skippy.razor.cs
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Shared/Components/Skippy.razor.cs
rename to BlazorBootstrap.Demo.RCL/Components/Shared/Skippy.razor.cs
diff --git a/BlazorBootstrap.Demo.RCL/Shared/Components/Skippy.razor.css b/BlazorBootstrap.Demo.RCL/Components/Shared/Skippy.razor.css
similarity index 100%
rename from BlazorBootstrap.Demo.RCL/Shared/Components/Skippy.razor.css
rename to BlazorBootstrap.Demo.RCL/Components/Shared/Skippy.razor.css
diff --git a/BlazorBootstrap.Demo.Server/BlazorBootstrap.Demo.Server.csproj b/BlazorBootstrap.Demo.Server/BlazorBootstrap.Demo.Server.csproj
index e7fe3f7fd..e8e922a1b 100644
--- a/BlazorBootstrap.Demo.Server/BlazorBootstrap.Demo.Server.csproj
+++ b/BlazorBootstrap.Demo.Server/BlazorBootstrap.Demo.Server.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/BlazorBootstrap.Demo.Server/Pages/_Host.cshtml b/BlazorBootstrap.Demo.Server/Components/App.razor
similarity index 90%
rename from BlazorBootstrap.Demo.Server/Pages/_Host.cshtml
rename to BlazorBootstrap.Demo.Server/Components/App.razor
index 090912de3..467bac08e 100644
--- a/BlazorBootstrap.Demo.Server/Pages/_Host.cshtml
+++ b/BlazorBootstrap.Demo.Server/Components/App.razor
@@ -1,15 +1,11 @@
-@page "/"
-@using Microsoft.AspNetCore.Components.Web
-@namespace BlazorBootstrap.Demo.Server.Pages
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
-
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Blazor Bootstrap Demos & Examples | Enterprise-class Blazor Bootstrap Component library built on the Blazor and Bootstrap CSS framework | Blazor Bootstrap</title>
-    <base href="~/" />
+    <base href="/" />
     <link href="images/logo/128X128.png" rel="icon" type="image/png" />
     <!-- CSS only -->
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
@@ -41,12 +37,13 @@
         })(window, document, "clarity", "script", "eyusedpimp");
     </script>
 
-    <component type="typeof(HeadOutlet)" render-mode="ServerPrerendered" />
+    <HeadOutlet @rendermode="InteractiveServer" />
 </head>
+
 <body>
-    <component type="typeof(App)" render-mode="ServerPrerendered" />
+    <Routes @rendermode="InteractiveServer" />
+    <script src="_framework/blazor.web.js"></script>
 
-    <script src="_framework/blazor.server.js" autostart="false" asp-append-version="true"></script>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
     <!-- Add chart.js reference if chart components are used in your application. -->
     <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.0.1/chart.umd.js" integrity="sha512-gQhCDsnnnUfaRzD8k1L5llCCV6O9HN09zClIzzeJ8OJ9MpGmIlCxm+pdCkqTwqJ4JcjbojFr79rl2F1mzcoLMQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
@@ -58,8 +55,6 @@
     <script src="_content/BlazorBootstrap.Demo.RCL/js/blazorbootstrap.demo.rcl.js" asp-append-version="true"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/prism.min.js" integrity="sha512-7Z9J3l1+EYfeaPKcGXu3MS/7T+w19WtKQY/n+xzmw4hZhJ9tyYmcUS+4QqAlzhicE5LAfMQSF3iFTK9bQdTxXg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/plugins/autoloader/prism-autoloader.min.js" integrity="sha512-SkmBfuA2hqjzEVpmnMt/LINrjop3GKWqsuLSSB3e7iBmYK7JuWw4ldmmxwD9mdm2IRTTi0OxSAfEGvgEi0i2Kw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <script>
-        Blazor.start();
-    </script>
 </body>
+
 </html>
diff --git a/BlazorBootstrap.Demo.Server/App.razor b/BlazorBootstrap.Demo.Server/Components/Routes.razor
similarity index 75%
rename from BlazorBootstrap.Demo.Server/App.razor
rename to BlazorBootstrap.Demo.Server/Components/Routes.razor
index 94953bc3e..7792d4ae0 100644
--- a/BlazorBootstrap.Demo.Server/App.razor
+++ b/BlazorBootstrap.Demo.Server/Components/Routes.razor
@@ -1,4 +1,4 @@
-<Router AppAssembly="@typeof(App).Assembly" PreferExactMatches="@true" AdditionalAssemblies="new []{ typeof(BlazorBootstrap.Demo.RCL.App).Assembly }">
+<Router AppAssembly="typeof(Program).Assembly" AdditionalAssemblies="new []{ typeof(BlazorBootstrap.Demo.RCL.App).Assembly }">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(BlazorBootstrap.Demo.RCL.MainLayout)" />
         <FocusOnNavigate RouteData="@routeData" Selector="h1" />
diff --git a/BlazorBootstrap.Demo.Server/_Imports.razor b/BlazorBootstrap.Demo.Server/Components/_Imports.razor
similarity index 67%
rename from BlazorBootstrap.Demo.Server/_Imports.razor
rename to BlazorBootstrap.Demo.Server/Components/_Imports.razor
index 4a64d3b6a..74b407f2d 100644
--- a/BlazorBootstrap.Demo.Server/_Imports.razor
+++ b/BlazorBootstrap.Demo.Server/Components/_Imports.razor
@@ -1,10 +1,10 @@
 @using System.Net.Http
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Authorization
+@using System.Net.Http.Json
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
+@using static Microsoft.AspNetCore.Components.Web.RenderMode
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.JSInterop
-@using BlazorBootstrap;
 @using BlazorBootstrap.Demo.Server
+@using BlazorBootstrap.Demo.Server.Components
diff --git a/BlazorBootstrap.Demo.Server/Program.cs b/BlazorBootstrap.Demo.Server/Program.cs
index bfcad5a8e..30dc3cfa3 100644
--- a/BlazorBootstrap.Demo.Server/Program.cs
+++ b/BlazorBootstrap.Demo.Server/Program.cs
@@ -9,15 +9,15 @@
 builder.Services.AddBlazorBootstrap();
 builder.Services.AddDemoServices();
 
-builder.Services.AddRazorPages();
-builder.Services.AddServerSideBlazor();
+builder.Services.AddRazorComponents()
+    .AddInteractiveServerComponents();
 
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.
 if (!app.Environment.IsDevelopment())
 {
-    app.UseExceptionHandler("/Error");
+    app.UseExceptionHandler("/Error", createScopeForErrors: true);
     // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
     app.UseHsts();
 }
@@ -25,10 +25,10 @@
 app.UseHttpsRedirection();
 
 app.UseStaticFiles();
+app.UseAntiforgery();
 
-app.UseRouting();
-
-app.MapBlazorHub();
-app.MapFallbackToPage("/_Host");
+app.MapRazorComponents<BlazorBootstrap.Demo.Server.Components.App>()
+    .AddInteractiveServerRenderMode()
+    .AddAdditionalAssemblies(typeof(BlazorBootstrap.Demo.RCL.App).Assembly); ;
 
 app.Run();
diff --git a/BlazorBootstrap.Demo.Server/Properties/launchSettings.json b/BlazorBootstrap.Demo.Server/Properties/launchSettings.json
index 6ede2d4a9..81912e14f 100644
--- a/BlazorBootstrap.Demo.Server/Properties/launchSettings.json
+++ b/BlazorBootstrap.Demo.Server/Properties/launchSettings.json
@@ -1,27 +1,28 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:12444",
-      "sslPort": 44308
-    }
-  },
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+    "iisSettings": {
+      "windowsAuthentication": false,
+      "anonymousAuthentication": true,
+      "iisExpress": {
+        "applicationUrl": "http://localhost:32797",
+        "sslPort": 44390
+      }
+    },
   "profiles": {
-    "http": {
+    "https": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5247",
+      "applicationUrl": "https://localhost:5031;http://localhost:5030",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "https": {
+    "http": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:5031;http://localhost:5030",
+      "applicationUrl": "http://localhost:5030",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
@@ -34,4 +35,4 @@
       }
     }
   }
-}
+  }
diff --git a/BlazorBootstrap.Demo.Server/Usings.cs b/BlazorBootstrap.Demo.Server/Usings.cs
index 7c1cdc2e8..b09149a0b 100644
--- a/BlazorBootstrap.Demo.Server/Usings.cs
+++ b/BlazorBootstrap.Demo.Server/Usings.cs
@@ -1 +1,2 @@
 global using BlazorBootstrap.Demo.RCL;
+global using BlazorBootstrap.Demo.Server.Components;
diff --git a/BlazorBootstrap.Demo.Server/appsettings.Development.json b/BlazorBootstrap.Demo.Server/appsettings.Development.json
index 770d3e931..48b263888 100644
--- a/BlazorBootstrap.Demo.Server/appsettings.Development.json
+++ b/BlazorBootstrap.Demo.Server/appsettings.Development.json
@@ -3,7 +3,9 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information",
+      "Microsoft.AspNetCore.SignalR": "Debug"
     }
   }
 }
diff --git a/BlazorBootstrap.Demo.WebAssembly/App.razor b/BlazorBootstrap.Demo.WebAssembly/App.razor
index 06c39f8af..f0f0afe72 100644
--- a/BlazorBootstrap.Demo.WebAssembly/App.razor
+++ b/BlazorBootstrap.Demo.WebAssembly/App.razor
@@ -1,4 +1,4 @@
-<Router AppAssembly="@typeof(Program).Assembly" PreferExactMatches="@true" AdditionalAssemblies="new []{ typeof(BlazorBootstrap.Demo.RCL.App).Assembly }">
+<Router AppAssembly="@typeof(Program).Assembly" AdditionalAssemblies="new []{ typeof(BlazorBootstrap.Demo.RCL.App).Assembly }">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(BlazorBootstrap.Demo.RCL.MainLayout)" />
         <FocusOnNavigate RouteData="@routeData" Selector="h1" />
diff --git a/BlazorBootstrap.Demo.WebAssembly/BlazorBootstrap.Demo.WebAssembly.csproj b/BlazorBootstrap.Demo.WebAssembly/BlazorBootstrap.Demo.WebAssembly.csproj
index 670805c4c..324566609 100644
--- a/BlazorBootstrap.Demo.WebAssembly/BlazorBootstrap.Demo.WebAssembly.csproj
+++ b/BlazorBootstrap.Demo.WebAssembly/BlazorBootstrap.Demo.WebAssembly.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.15" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.15" PrivateAssets="all" />
-    <PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.4" PrivateAssets="all" />
+    <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/BlazorBootstrap.Demo.WebAssembly/Program.cs b/BlazorBootstrap.Demo.WebAssembly/Program.cs
index 85bc733b7..2b80cb76f 100644
--- a/BlazorBootstrap.Demo.WebAssembly/Program.cs
+++ b/BlazorBootstrap.Demo.WebAssembly/Program.cs
@@ -1,4 +1,5 @@
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
+
 builder.RootComponents.Add<BlazorBootstrap.Demo.WebAssembly.App>("#app");
 builder.RootComponents.Add<HeadOutlet>("head::after");
 
diff --git a/BlazorBootstrap.Demo.WebAssembly/Properties/launchSettings.json b/BlazorBootstrap.Demo.WebAssembly/Properties/launchSettings.json
index d541ca392..9f68692b3 100644
--- a/BlazorBootstrap.Demo.WebAssembly/Properties/launchSettings.json
+++ b/BlazorBootstrap.Demo.WebAssembly/Properties/launchSettings.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "http://json.schemastore.org/launchsettings.json",
   "iisSettings": {
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
@@ -8,9 +9,9 @@
     }
   },
   "profiles": {
-    "BlazorBootstrap.Demo": {
+    "https": {
       "commandName": "Project",
-      "dotnetRunMessages": "true",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
       "applicationUrl": "https://localhost:5011;http://localhost:5010",
@@ -18,6 +19,16 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "applicationUrl": "http://localhost:5010",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
diff --git a/BlazorBootstrap.Demo.WebAssembly/_Imports.razor b/BlazorBootstrap.Demo.WebAssembly/_Imports.razor
index 48b6d57d6..bd4de64b2 100644
--- a/BlazorBootstrap.Demo.WebAssembly/_Imports.razor
+++ b/BlazorBootstrap.Demo.WebAssembly/_Imports.razor
@@ -1,5 +1,6 @@
 @using System.Net.Http
 @using System.Net.Http.Json
+@using System.Threading.Tasks
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
@@ -8,4 +9,3 @@
 @using Microsoft.JSInterop
 @using BlazorBootstrap
 @using BlazorBootstrap.Demo.WebAssembly
-@using System.Threading.Tasks
diff --git a/BlazorBootstrap.Demo.WebAssembly/wwwroot/index.html b/BlazorBootstrap.Demo.WebAssembly/wwwroot/index.html
index ff6bcec29..f3efef6d0 100644
--- a/BlazorBootstrap.Demo.WebAssembly/wwwroot/index.html
+++ b/BlazorBootstrap.Demo.WebAssembly/wwwroot/index.html
@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Demos & Examples | Enterprise-class Blazor Bootstrap Component library built on the Blazor and Bootstrap CSS framework | Blazor Bootstrap</title>
     <base href="/" />
     <link href="images/logo/128X128.png" rel="icon" type="image/png" />
diff --git a/blazorbootstrap.sln b/blazorbootstrap.sln
index 9daa09e4f..4b155b171 100644
--- a/blazorbootstrap.sln
+++ b/blazorbootstrap.sln
@@ -13,12 +13,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBootstrap.Demo.Hosted
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBootstrap.Demo.Hosted.Client", "BlazorBootstrap.Demo.Hosted\Client\BlazorBootstrap.Demo.Hosted.Client.csproj", "{CA121C94-88EC-4902-9FCD-8394BDEB0355}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBootstrap.Demo.Server", "BlazorBootstrap.Demo.Server\BlazorBootstrap.Demo.Server.csproj", "{7103F2DB-2A6E-4164-B531-34D6CCC72458}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBootstrap.Demo.RCL", "BlazorBootstrap.Demo.RCL\BlazorBootstrap.Demo.RCL.csproj", "{190E07ED-8888-4F3B-8484-46BF6FC4C982}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBootstrap.Demo.WebAssembly", "BlazorBootstrap.Demo.WebAssembly\BlazorBootstrap.Demo.WebAssembly.csproj", "{710E0A10-0567-495D-AA48-A99293D2EA62}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorBootstrap.Demo.Server", "BlazorBootstrap.Demo.Server\BlazorBootstrap.Demo.Server.csproj", "{B133D9CF-EC94-416B-A4A6-6E2BD8DAF0C1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -37,10 +37,6 @@ Global
 		{CA121C94-88EC-4902-9FCD-8394BDEB0355}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CA121C94-88EC-4902-9FCD-8394BDEB0355}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CA121C94-88EC-4902-9FCD-8394BDEB0355}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7103F2DB-2A6E-4164-B531-34D6CCC72458}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7103F2DB-2A6E-4164-B531-34D6CCC72458}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7103F2DB-2A6E-4164-B531-34D6CCC72458}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7103F2DB-2A6E-4164-B531-34D6CCC72458}.Release|Any CPU.Build.0 = Release|Any CPU
 		{190E07ED-8888-4F3B-8484-46BF6FC4C982}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{190E07ED-8888-4F3B-8484-46BF6FC4C982}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{190E07ED-8888-4F3B-8484-46BF6FC4C982}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -49,6 +45,10 @@ Global
 		{710E0A10-0567-495D-AA48-A99293D2EA62}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{710E0A10-0567-495D-AA48-A99293D2EA62}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{710E0A10-0567-495D-AA48-A99293D2EA62}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B133D9CF-EC94-416B-A4A6-6E2BD8DAF0C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B133D9CF-EC94-416B-A4A6-6E2BD8DAF0C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B133D9CF-EC94-416B-A4A6-6E2BD8DAF0C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B133D9CF-EC94-416B-A4A6-6E2BD8DAF0C1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -57,9 +57,9 @@ Global
 		{23D9E8D8-8F90-457A-96B5-4BDA599D37AE} = {74FC2FB9-8E21-439A-8646-DF30A02041A1}
 		{D8A68986-BC6C-46AD-A089-7F325884E966} = {7DABA756-9F2F-48A6-B8D3-B104262D11B1}
 		{CA121C94-88EC-4902-9FCD-8394BDEB0355} = {7DABA756-9F2F-48A6-B8D3-B104262D11B1}
-		{7103F2DB-2A6E-4164-B531-34D6CCC72458} = {7DABA756-9F2F-48A6-B8D3-B104262D11B1}
 		{190E07ED-8888-4F3B-8484-46BF6FC4C982} = {7DABA756-9F2F-48A6-B8D3-B104262D11B1}
 		{710E0A10-0567-495D-AA48-A99293D2EA62} = {7DABA756-9F2F-48A6-B8D3-B104262D11B1}
+		{B133D9CF-EC94-416B-A4A6-6E2BD8DAF0C1} = {7DABA756-9F2F-48A6-B8D3-B104262D11B1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {810B19D0-6AB6-4959-A8D7-340A2F72DF6F}