diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/readme.md b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/readme.md
new file mode 100644
index 0000000000..8feb0377db
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/readme.md
@@ -0,0 +1,3 @@
+#Obsolete directives
+
+Folder contains directives we plan to remove in the next major version of umbraco (8.0) these are not recommended to use.
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbtabview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbtabview.directive.js
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/common/directives/html/umbtabview.directive.js
rename to src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbtabview.directive.js
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbtab.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtab.directive.js
similarity index 60%
rename from src/Umbraco.Web.UI.Client/src/common/directives/html/umbtab.directive.js
rename to src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtab.directive.js
index f12544646b..eea0329d25 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbtab.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtab.directive.js
@@ -1,14 +1,14 @@
 /**
 * @ngdoc directive
-* @name umbraco.directives.directive:umbTab 
+* @name umbraco.directives.directive:umbTab
 * @restrict E
 **/
 angular.module("umbraco.directives")
 .directive('umbTab', function ($parse, $timeout) {
     return {
 		restrict: 'E',
-		replace: true,		
+		replace: true,
         transclude: 'true',
-		templateUrl: 'views/directives/umb-tab.html'		
+		templateUrl: 'views/directives/components/umb-tab.html'		
     };
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabcontainer.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabcontainer.directive.js
deleted file mode 100644
index 7635b5d23e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabcontainer.directive.js
+++ /dev/null
@@ -1,9 +0,0 @@
-angular.module("umbraco.directives.html")
-    .directive('umbTabContainer', function () {
-        return {
-            transclude: true,
-            restrict: 'E',
-            replace: true,        
-            templateUrl: 'views/components/tabs/umb-tab-container.html'
-        };
-    });
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtablist.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtablist.directive.js
deleted file mode 100644
index a2fd6cdcae..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtablist.directive.js
+++ /dev/null
@@ -1,9 +0,0 @@
-angular.module("umbraco.directives.html")
-    .directive('umbTabList', function () {
-        return {
-            transclude: true,
-            restrict: 'E',
-            replace: true,        
-            templateUrl: 'views/components/tabs/umb-tab-list.html'
-        };
-    });
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbtabs.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabs.directive.js
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/common/directives/html/umbtabs.directive.js
rename to src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabs.directive.js
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbtabscontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabscontent.directive.js
similarity index 84%
rename from src/Umbraco.Web.UI.Client/src/common/directives/html/umbtabscontent.directive.js
rename to src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabscontent.directive.js
index d7ec570764..5bd40ae630 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbtabscontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabscontent.directive.js
@@ -13,7 +13,7 @@
       restrict: "E",
       replace: true,
       transclude: 'true',
-      templateUrl: "views/directives/umb-tabs-content.html",
+      templateUrl: "views/directives/components/umb-tabs-content.html",
       link: link
     };
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbtabsnav.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabsnav.directive.js
similarity index 94%
rename from src/Umbraco.Web.UI.Client/src/common/directives/html/umbtabsnav.directive.js
rename to src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabsnav.directive.js
index ca2781d22a..bb04b14f77 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbtabsnav.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabsnav.directive.js
@@ -40,7 +40,7 @@
     var directive = {
       restrict: "E",
       replace: true,
-      templateUrl: "views/directives/umb-tabs-nav.html",
+      templateUrl: "views/components/umb-tabs-nav.html",
       scope: {
         model: "=",
         tabdrop: "="
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-tab.html b/src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tab.html
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/directives/umb-tab.html
rename to src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tab.html
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-tabs-content.html b/src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tabs-content.html
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/directives/umb-tabs-content.html
rename to src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tabs-content.html
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-tabs-nav.html b/src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tabs-nav.html
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/directives/umb-tabs-nav.html
rename to src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tabs-nav.html
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-tab-view.html b/src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-tab-view.html
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/directives/umb-tab-view.html
rename to src/Umbraco.Web.UI.Client/src/views/directives/_obsolete/umb-tab-view.html