diff --git a/src/SharpIDE.Photino/Components/TerminalOutputDisplay.razor b/src/SharpIDE.Photino/Components/BuildOutputDisplay.razor
similarity index 100%
rename from src/SharpIDE.Photino/Components/TerminalOutputDisplay.razor
rename to src/SharpIDE.Photino/Components/BuildOutputDisplay.razor
diff --git a/src/SharpIDE.Photino/Components/RunOutputDisplay.razor b/src/SharpIDE.Photino/Components/Run/RunOutputDisplay.razor
similarity index 100%
rename from src/SharpIDE.Photino/Components/RunOutputDisplay.razor
rename to src/SharpIDE.Photino/Components/Run/RunOutputDisplay.razor
diff --git a/src/SharpIDE.Photino/Components/RunPanel.razor b/src/SharpIDE.Photino/Components/Run/RunPanel.razor
similarity index 100%
rename from src/SharpIDE.Photino/Components/RunPanel.razor
rename to src/SharpIDE.Photino/Components/Run/RunPanel.razor
diff --git a/src/SharpIDE.Photino/Components/RunPopover.razor b/src/SharpIDE.Photino/Components/Run/RunPopover.razor
similarity index 100%
rename from src/SharpIDE.Photino/Components/RunPopover.razor
rename to src/SharpIDE.Photino/Components/Run/RunPopover.razor
diff --git a/src/SharpIDE.Photino/Layout/MainLayout.razor b/src/SharpIDE.Photino/Layout/MainLayout.razor
index 0feecf4..bb78ba2 100644
--- a/src/SharpIDE.Photino/Layout/MainLayout.razor
+++ b/src/SharpIDE.Photino/Layout/MainLayout.razor
@@ -89,7 +89,7 @@
 							<RunPanel SolutionModel="@_solutionModel"/>
 						</DisplayNoneComponent>
 						<DisplayNoneComponent Visible="@(_selectedBottomPanel is BottomPanelType.Build)">
-							<TerminalOutputDisplay/>
+							<BuildOutputDisplay/>
 						</DisplayNoneComponent>
 					}
 				</div>
diff --git a/src/SharpIDE.Photino/_Imports.razor b/src/SharpIDE.Photino/_Imports.razor
index df8c6af..7df55fd 100644
--- a/src/SharpIDE.Photino/_Imports.razor
+++ b/src/SharpIDE.Photino/_Imports.razor
@@ -10,3 +10,5 @@
 @using MudBlazor
 @using SharpIDE.Photino.Layout
 @using SharpIDE.Photino.Components
+@using SharpIDE.Photino.Components.Problems
+@using SharpIDE.Photino.Components.Run