diff --git a/frontend/app/components/panels/controllers/watchers-panel.controller.js b/frontend/app/components/wp-panels/watchers-panel/watchers-panel.controller.js
similarity index 100%
rename from frontend/app/components/panels/controllers/watchers-panel.controller.js
rename to frontend/app/components/wp-panels/watchers-panel/watchers-panel.controller.js
diff --git a/frontend/app/components/panels/controllers/watchers-panel.controller.test.js b/frontend/app/components/wp-panels/watchers-panel/watchers-panel.controller.test.js
similarity index 100%
rename from frontend/app/components/panels/controllers/watchers-panel.controller.test.js
rename to frontend/app/components/wp-panels/watchers-panel/watchers-panel.controller.test.js
diff --git a/frontend/app/components/panels/directives/watchers-panel.directive.html b/frontend/app/components/wp-panels/watchers-panel/watchers-panel.directive.html
similarity index 100%
rename from frontend/app/components/panels/directives/watchers-panel.directive.html
rename to frontend/app/components/wp-panels/watchers-panel/watchers-panel.directive.html
diff --git a/frontend/app/components/panels/directives/watchers-panel.directive.js b/frontend/app/components/wp-panels/watchers-panel/watchers-panel.directive.js
similarity index 94%
rename from frontend/app/components/panels/directives/watchers-panel.directive.js
rename to frontend/app/components/wp-panels/watchers-panel/watchers-panel.directive.js
index 3c2a6af509..a89c19459d 100644
--- a/frontend/app/components/panels/directives/watchers-panel.directive.js
+++ b/frontend/app/components/wp-panels/watchers-panel/watchers-panel.directive.js
@@ -33,7 +33,7 @@ angular
 function watchersPanel()  {
   return {
     restrict: 'E',
-    templateUrl: '/components/panels/directives/watchers-panel.directive.html',
+    templateUrl: '/components/wp-panels/directives/watchers-panel.directive.html',
     scope: {
       workPackage: '='
     },
diff --git a/frontend/app/components/panels/services/wp-watchers.service.js b/frontend/app/components/wp-panels/watchers-panel/wp-watchers.service.js
similarity index 100%
rename from frontend/app/components/panels/services/wp-watchers.service.js
rename to frontend/app/components/wp-panels/watchers-panel/wp-watchers.service.js
diff --git a/frontend/app/components/panels/services/wp-watchers.service.test.js b/frontend/app/components/wp-panels/watchers-panel/wp-watchers.service.test.js
similarity index 100%
rename from frontend/app/components/panels/services/wp-watchers.service.test.js
rename to frontend/app/components/wp-panels/watchers-panel/wp-watchers.service.test.js