diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index cac661ed..09f36473 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -427,6 +427,26 @@
 			path = FormUIHelpers;
 			sourceTree = "<group>";
 		};
+		D213347423842FE3008E41B3 /* Controllers */ = {
+			isa = PBXGroup;
+			children = (
+				D29DF29321E7ADB8003B2FB9 /* StackableViewController.h */,
+				D29DF28E21E7ADB8003B2FB9 /* StackableViewController.m */,
+				D29770F021F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsViewController.h */,
+				D29770F121F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsViewController.m */,
+				D29770EF21F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.h */,
+				D29770EE21F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m */,
+			);
+			path = Controllers;
+			sourceTree = "<group>";
+		};
+		D213347523842FF5008E41B3 /* Views */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
 		D224798823142BF2003FCCF9 /* SwitchMolecules */ = {
 			isa = PBXGroup;
 			children = (
@@ -486,17 +506,13 @@
 			path = Items;
 			sourceTree = "<group>";
 		};
-		D22D1F582204D2590077CEC0 /* LegacyControllers */ = {
+		D22D1F582204D2590077CEC0 /* Legacy */ = {
 			isa = PBXGroup;
 			children = (
-				D29DF29321E7ADB8003B2FB9 /* StackableViewController.h */,
-				D29DF28E21E7ADB8003B2FB9 /* StackableViewController.m */,
-				D29770F021F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsViewController.h */,
-				D29770F121F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsViewController.m */,
-				D29770EF21F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.h */,
-				D29770EE21F7C6D600B2F0D0 /* TopLabelsAndBottomButtonsTableViewController.m */,
+				D213347523842FF5008E41B3 /* Views */,
+				D213347423842FE3008E41B3 /* Controllers */,
 			);
-			path = LegacyControllers;
+			path = Legacy;
 			sourceTree = "<group>";
 		};
 		D29DF0C221E404D4003B2FB9 = {
@@ -527,7 +543,7 @@
 				D29DF13321E68604003B2FB9 /* Styles */,
 				D29DF11021E6805F003B2FB9 /* Categories */,
 				D29DF11921E68467003B2FB9 /* Containers */,
-				D22D1F582204D2590077CEC0 /* LegacyControllers */,
+				D22D1F582204D2590077CEC0 /* Legacy */,
 				D29DF10F21E67A7D003B2FB9 /* BaseControllers */,
 				D29DF11E21E6851E003B2FB9 /* TopAlert */,
 				D29DF10D21E67A70003B2FB9 /* Atoms */,
diff --git a/MVMCoreUI/Atoms/Views/GraphView.swift b/MVMCoreUI/Atoms/Views/GraphView.swift
index ebd074a0..eb2b2099 100644
--- a/MVMCoreUI/Atoms/Views/GraphView.swift
+++ b/MVMCoreUI/Atoms/Views/GraphView.swift
@@ -109,7 +109,7 @@ public struct GraphObject {
 }
 
 
-@objcMembers open class GraphView: View {
+@objcMembers open class GraphView: View, MVMCoreUIViewConstrainingProtocol {
     
     var heightConstraint: NSLayoutConstraint?
     var gradientLayer: CALayer?
@@ -240,6 +240,10 @@ public struct GraphObject {
         
         return containLayer
     }
+//MARK: MVMCoreUIViewConstrainingProtocol
+    public func needsToBeConstrained() -> Bool {
+        return true
+    }
     
 //MARK: Animation
     func rotationAnimation(_ object: GraphObject) {
diff --git a/MVMCoreUI/LegacyControllers/StackableViewController.h b/MVMCoreUI/Legacy/Controllers/StackableViewController.h
similarity index 100%
rename from MVMCoreUI/LegacyControllers/StackableViewController.h
rename to MVMCoreUI/Legacy/Controllers/StackableViewController.h
diff --git a/MVMCoreUI/LegacyControllers/StackableViewController.m b/MVMCoreUI/Legacy/Controllers/StackableViewController.m
similarity index 100%
rename from MVMCoreUI/LegacyControllers/StackableViewController.m
rename to MVMCoreUI/Legacy/Controllers/StackableViewController.m
diff --git a/MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsTableViewController.h b/MVMCoreUI/Legacy/Controllers/TopLabelsAndBottomButtonsTableViewController.h
similarity index 100%
rename from MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsTableViewController.h
rename to MVMCoreUI/Legacy/Controllers/TopLabelsAndBottomButtonsTableViewController.h
diff --git a/MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsTableViewController.m b/MVMCoreUI/Legacy/Controllers/TopLabelsAndBottomButtonsTableViewController.m
similarity index 100%
rename from MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsTableViewController.m
rename to MVMCoreUI/Legacy/Controllers/TopLabelsAndBottomButtonsTableViewController.m
diff --git a/MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.h b/MVMCoreUI/Legacy/Controllers/TopLabelsAndBottomButtonsViewController.h
similarity index 100%
rename from MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.h
rename to MVMCoreUI/Legacy/Controllers/TopLabelsAndBottomButtonsViewController.h
diff --git a/MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.m b/MVMCoreUI/Legacy/Controllers/TopLabelsAndBottomButtonsViewController.m
similarity index 100%
rename from MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.m
rename to MVMCoreUI/Legacy/Controllers/TopLabelsAndBottomButtonsViewController.m