5 files changed, 19 insertions, 9 deletions
diff --git a/danger/plugins/changelog.rb b/danger/plugins/changelog.rb
index 84f399e9e97..fd2dad5932a 100644
--- a/danger/plugins/changelog.rb
+++ b/danger/plugins/changelog.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative '../../lib/gitlab/danger/changelog'
+require_relative '../../tooling/danger/changelog'
 
 module Danger
   class Changelog < Plugin
     # Put the helper code somewhere it can be tested
-    include Gitlab::Danger::Changelog
+    include Tooling::Danger::Changelog
   end
 end
diff --git a/danger/plugins/feature_flag.rb b/danger/plugins/feature_flag.rb
new file mode 100644
index 00000000000..8db8daba6d9
--- /dev/null
+++ b/danger/plugins/feature_flag.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require_relative '../../tooling/danger/feature_flag'
+
+module Danger
+  class FeatureFlag < Plugin
+    # Put the helper code somewhere it can be tested
+    include Tooling::Danger::FeatureFlag
+  end
+end
diff --git a/danger/plugins/helper.rb b/danger/plugins/helper.rb
index 2d7a933e801..8602868d817 100644
--- a/danger/plugins/helper.rb
+++ b/danger/plugins/helper.rb
@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative '../../lib/gitlab/danger/helper'
+require_relative '../../tooling/danger/helper'
 
 module Danger
-  # Common helper functions for our danger scripts. See Gitlab::Danger::Helper
+  # Common helper functions for our danger scripts. See Tooling::Danger::Helper
   # for more details
   class Helper < Plugin
     # Put the helper code somewhere it can be tested
-    include Gitlab::Danger::Helper
+    include Tooling::Danger::Helper
   end
 end
diff --git a/danger/plugins/roulette.rb b/danger/plugins/roulette.rb
index 7c62cff0c92..2aa0132852e 100644
--- a/danger/plugins/roulette.rb
+++ b/danger/plugins/roulette.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative '../../lib/gitlab/danger/roulette'
+require_relative '../../tooling/danger/roulette'
 
 module Danger
   class Roulette < Plugin
     # Put the helper code somewhere it can be tested
-    include Gitlab::Danger::Roulette
+    include Tooling::Danger::Roulette
   end
 end
diff --git a/danger/plugins/sidekiq_queues.rb b/danger/plugins/sidekiq_queues.rb
index 1edeb6da3d5..dd436e5cb2b 100644
--- a/danger/plugins/sidekiq_queues.rb
+++ b/danger/plugins/sidekiq_queues.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative '../../lib/gitlab/danger/sidekiq_queues'
+require_relative '../../tooling/danger/sidekiq_queues'
 
 module Danger
   class SidekiqQueues < Plugin
     # Put the helper code somewhere it can be tested
-    include Gitlab::Danger::SidekiqQueues
+    include Tooling::Danger::SidekiqQueues
   end
 end