diff --git a/cdashdisplay/display.go b/cdashdisplay/display.go
index 03c68b1..48fc545 100644
--- a/cdashdisplay/display.go
+++ b/cdashdisplay/display.go
@@ -98,28 +98,6 @@ func (s *FString32) UnmarshalYAML(value *yaml.Node) error {
 	return nil
 }
 
-type LayoutTree struct {
-	Windows map[int16]*UIWindow `yaml:"Windows"`
-}
-
-func NewLayoutTree() *LayoutTree {
-	return &LayoutTree{
-		Windows: make(map[int16]*UIWindow),
-	}
-}
-
-func (l *LayoutTree) AddWindow(idx int16, w UIWindow) {
-	pLogger.Debug(fmt.Sprintf("adding window '%d' - %v", idx, w))
-	l.Windows[idx] = &w
-	pLogger.Debug(fmt.Sprintf("new map - %v", l.Windows))
-}
-
-func (l *LayoutTree) RemoveWindow(idx int16) {
-	pLogger.Debug(fmt.Sprintf("removing window '%d'", idx))
-	delete(l.Windows, idx)
-	pLogger.Debug(fmt.Sprintf("new map - %v", l.Windows))
-}
-
 type CDashState struct {
 	Layout *LayoutTree
 }
diff --git a/cdashdisplay/layoutManager.go b/cdashdisplay/layoutManager.go
index 19318f5..661f477 100644
--- a/cdashdisplay/layoutManager.go
+++ b/cdashdisplay/layoutManager.go
@@ -1,4 +1,25 @@
 package cdashdisplay
 
-type layoutManager struct {
+import "fmt"
+
+type LayoutTree struct {
+	Windows map[int16]*UIWindow `yaml:"Windows"`
+}
+
+func NewLayoutTree() *LayoutTree {
+	return &LayoutTree{
+		Windows: make(map[int16]*UIWindow),
+	}
+}
+
+func (l *LayoutTree) AddWindow(idx int16, w UIWindow) {
+	pLogger.Debug(fmt.Sprintf("adding window '%d' - %v", idx, w))
+	l.Windows[idx] = &w
+	pLogger.Debug(fmt.Sprintf("new map - %v", l.Windows))
+}
+
+func (l *LayoutTree) RemoveWindow(idx int16) {
+	pLogger.Debug(fmt.Sprintf("removing window '%d'", idx))
+	delete(l.Windows, idx)
+	pLogger.Debug(fmt.Sprintf("new map - %v", l.Windows))
 }