diff --git a/.gitignore b/.gitignore
index d76218e6c4..d301d10004 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 .idea
 *.iml
 .vagrant
-Berksfile.lock
 *~
 *#
 .#*
diff --git a/Berksfile b/Berksfile
deleted file mode 100644
index 17690d6207..0000000000
--- a/Berksfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-# To add a new cookbook dependency or to change version for an existing dependency
-# uncomment the following line to enable the public Chef supermarket endpoint
-# source 'https://supermarket.chef.io'
-source chef_repo: "."
-
-metadata
-
-cookbook "iptables", path: "./cookbooks/third-party/iptables-8.0.0"
-cookbook "line", path: "./cookbooks/third-party/line-4.5.21"
-cookbook "nfs", path: "./cookbooks/third-party/nfs-5.1.5"
-cookbook "openssh", path: "./cookbooks/third-party/openssh-2.11.14"
-cookbook "yum", path: "./cookbooks/third-party/yum-7.4.20"
-cookbook "yum-epel", path: "./cookbooks/third-party/yum-epel-5.0.8"
-
-cookbook "aws-parallelcluster-awsbatch", path: "./cookbooks/aws-parallelcluster-awsbatch"
-cookbook "aws-parallelcluster-computefleet", path: "./cookbooks/aws-parallelcluster-computefleet"
-cookbook "aws-parallelcluster-entrypoints", path: "./cookbooks/aws-parallelcluster-entrypoints"
-cookbook "aws-parallelcluster-environment", path: "./cookbooks/aws-parallelcluster-environment"
-cookbook "aws-parallelcluster-platform", path: "./cookbooks/aws-parallelcluster-platform"
-cookbook "aws-parallelcluster-shared", path: "./cookbooks/aws-parallelcluster-shared"
-cookbook "aws-parallelcluster-slurm", path: "./cookbooks/aws-parallelcluster-slurm"
-cookbook "aws-parallelcluster-tests", path: "./cookbooks/aws-parallelcluster-tests"
diff --git a/Gemfile b/Gemfile
index 62cabcb790..7b08149e7d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,8 +2,6 @@
 
 source 'https://rubygems.org'
 
-gem 'berkshelf'
-
 group :style do
   gem 'cookstyle', '~> 7.25.9'
   gem 'rake', '~> 13.0.1'
diff --git a/README.md b/README.md
index 2f780ad52b..8bd831ed22 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,8 @@ This repo contains the AWS ParallelCluster Chef cookbook used in AWS ParallelClu
 
 # Code structure
 
-The root folder of the cookbook repository can be considered the main cookbook, since it contains two files: `Berksfile` and `metadata.rb`.
-These files are used by the CLI (build image time) and `user-data.sh` code to [vendor](https://docs.chef.io/workstation/berkshelf/#berks-vendor)
-the other sub-cookbooks and third party cookbooks.
+The root folder of the cookbook repository can be considered the main cookbook, since it contains two files: `Policyfile.rb` and `metadata.rb`.
+These files are used by the CLI (build image time) and `user-data.sh` code to vendor the other sub-cookbooks and third party cookbooks.
 
 The main cookbook does not contain any recipe, attribute or library. They are distributed in the functional cookbooks under the `cookbooks` folder
 defined as follows:
@@ -391,13 +390,14 @@ If you interrupt it and try to run `kitchen verify`, you see authentication fail
 This happens because Ubuntu22 does not accept authentication via RSA key. You need to re-create a key pair 
 using `ED25519` key type.
 
-### Known issues with Berks
+### Known issues with Policyfiles
 
 #### Kitchen doesn't see your changes
 
 If Kitchen doesn't detect your changes, try
 ```
-berks shelf uninstall ${COOKBOOK_NAME}
+chef install
+chef push kitchen
 ```
 
 ## About python tests
diff --git a/cookbooks/aws-parallelcluster-awsbatch/Berksfile b/cookbooks/aws-parallelcluster-awsbatch/Berksfile
deleted file mode 100644
index 17ed74b6a6..0000000000
--- a/cookbooks/aws-parallelcluster-awsbatch/Berksfile
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-source chef_repo: "."
-metadata
-
-cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"
-
-# Add all the cookbooks for Kitchen tests
-# TODO find a way to avoid this
-cookbook "aws-parallelcluster-environment", path: "../aws-parallelcluster-environment"
-cookbook "aws-parallelcluster-platform", path: "../aws-parallelcluster-platform"
-cookbook "aws-parallelcluster-computefleet", path: "../aws-parallelcluster-computefleet"
-cookbook "aws-parallelcluster-tests", path: "../aws-parallelcluster-tests"
-cookbook "aws-parallelcluster-slurm", path: "../aws-parallelcluster-slurm"
-
-cookbook "iptables", path: "../third-party/iptables-8.0.0"
-cookbook "line", path: "../third-party/line-4.5.21"
-cookbook "nfs", path: "../third-party/nfs-5.1.5"
-cookbook "openssh", path: "../third-party/openssh-2.11.14"
-cookbook "yum", path: "../third-party/yum-7.4.20"
-cookbook "yum-epel", path: "../third-party/yum-epel-5.0.8"
diff --git a/cookbooks/aws-parallelcluster-computefleet/Berksfile b/cookbooks/aws-parallelcluster-computefleet/Berksfile
deleted file mode 100644
index 67d69496cf..0000000000
--- a/cookbooks/aws-parallelcluster-computefleet/Berksfile
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-source chef_repo: "."
-metadata
-
-cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"
-
-# for shared cookbook
-cookbook "yum", path: "../third-party/yum-7.4.20"
-cookbook "yum-epel", path: "../third-party/yum-epel-5.0.8"
diff --git a/cookbooks/aws-parallelcluster-computefleet/spec/spec_helper.rb b/cookbooks/aws-parallelcluster-computefleet/spec/spec_helper.rb
index cc0958dc59..2e24fd550a 100644
--- a/cookbooks/aws-parallelcluster-computefleet/spec/spec_helper.rb
+++ b/cookbooks/aws-parallelcluster-computefleet/spec/spec_helper.rb
@@ -1,4 +1,3 @@
 require 'chefspec'
-require 'chefspec/berkshelf'
 
 require_relative '../../aws-parallelcluster-shared/spec/spec_helper'
diff --git a/cookbooks/aws-parallelcluster-entrypoints/Berksfile b/cookbooks/aws-parallelcluster-entrypoints/Berksfile
deleted file mode 100644
index 17756fe5eb..0000000000
--- a/cookbooks/aws-parallelcluster-entrypoints/Berksfile
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-source chef_repo: "."
-metadata
-
-cookbook "aws-parallelcluster-awsbatch", path: "../aws-parallelcluster-awsbatch"
-cookbook "aws-parallelcluster-computefleet", path: "../aws-parallelcluster-computefleet"
-cookbook "aws-parallelcluster-environment", path: "../aws-parallelcluster-environment"
-cookbook "aws-parallelcluster-platform", path: "../aws-parallelcluster-platform"
-cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"
-cookbook "aws-parallelcluster-slurm", path: "../aws-parallelcluster-slurm"
-
-cookbook "iptables", path: "../third-party/iptables-8.0.0"
-cookbook "line", path: "../third-party/line-4.5.21"
-cookbook "nfs", path: "../third-party/nfs-5.1.5"
-cookbook "openssh", path: "../third-party/openssh-2.11.14"
-cookbook "yum", path: "../third-party/yum-7.4.20"
-cookbook "yum-epel", path: "../third-party/yum-epel-5.0.8"
-
-group :integration do
-  cookbook 'aws-parallelcluster-tests', path: '../aws-parallelcluster-tests'
-end
diff --git a/cookbooks/aws-parallelcluster-entrypoints/spec/spec_helper.rb b/cookbooks/aws-parallelcluster-entrypoints/spec/spec_helper.rb
index cc0958dc59..2e24fd550a 100644
--- a/cookbooks/aws-parallelcluster-entrypoints/spec/spec_helper.rb
+++ b/cookbooks/aws-parallelcluster-entrypoints/spec/spec_helper.rb
@@ -1,4 +1,3 @@
 require 'chefspec'
-require 'chefspec/berkshelf'
 
 require_relative '../../aws-parallelcluster-shared/spec/spec_helper'
diff --git a/cookbooks/aws-parallelcluster-environment/Berksfile b/cookbooks/aws-parallelcluster-environment/Berksfile
deleted file mode 100644
index 5ba124538e..0000000000
--- a/cookbooks/aws-parallelcluster-environment/Berksfile
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-source chef_repo: "."
-metadata
-
-cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"
-
-cookbook "nfs", path: "../third-party/nfs-5.1.5"
-
-# dependency od nfs
-cookbook "line", path: "../third-party/line-4.5.21"
-
-# for shared cookbook
-cookbook "yum", path: "../third-party/yum-7.4.20"
-cookbook "yum-epel", path: "../third-party/yum-epel-5.0.8"
diff --git a/cookbooks/aws-parallelcluster-environment/spec/spec_helper.rb b/cookbooks/aws-parallelcluster-environment/spec/spec_helper.rb
index 2a6af0c46d..d265763621 100644
--- a/cookbooks/aws-parallelcluster-environment/spec/spec_helper.rb
+++ b/cookbooks/aws-parallelcluster-environment/spec/spec_helper.rb
@@ -1,5 +1,4 @@
 require 'chefspec'
-require 'chefspec/berkshelf'
 
 require_relative '../../aws-parallelcluster-shared/spec/spec_helper'
 
diff --git a/cookbooks/aws-parallelcluster-platform/Berksfile b/cookbooks/aws-parallelcluster-platform/Berksfile
deleted file mode 100644
index b751289d22..0000000000
--- a/cookbooks/aws-parallelcluster-platform/Berksfile
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-source chef_repo: "."
-metadata
-
-cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"
-
-cookbook "line", path: "../third-party/line-4.5.21"
-
-# for shared cookbook
-cookbook "yum", path: "../third-party/yum-7.4.20"
-cookbook "yum-epel", path: "../third-party/yum-epel-5.0.8"
diff --git a/cookbooks/aws-parallelcluster-platform/spec/spec_helper.rb b/cookbooks/aws-parallelcluster-platform/spec/spec_helper.rb
index ec28989c90..98f8338f52 100644
--- a/cookbooks/aws-parallelcluster-platform/spec/spec_helper.rb
+++ b/cookbooks/aws-parallelcluster-platform/spec/spec_helper.rb
@@ -1,5 +1,4 @@
 require 'chefspec'
-require 'chefspec/berkshelf'
 
 require_relative '../../aws-parallelcluster-shared/spec/spec_helper'
 
diff --git a/cookbooks/aws-parallelcluster-shared/Berksfile b/cookbooks/aws-parallelcluster-shared/Berksfile
deleted file mode 100644
index 5794a56d45..0000000000
--- a/cookbooks/aws-parallelcluster-shared/Berksfile
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-source chef_repo: "."
-
-metadata
-
-cookbook "yum", path: "../third-party/yum-7.4.20"
-cookbook "yum-epel", path: "../third-party/yum-epel-5.0.8"
diff --git a/cookbooks/aws-parallelcluster-shared/spec/spec_helper.rb b/cookbooks/aws-parallelcluster-shared/spec/spec_helper.rb
index 70045f0360..1241afb5a3 100644
--- a/cookbooks/aws-parallelcluster-shared/spec/spec_helper.rb
+++ b/cookbooks/aws-parallelcluster-shared/spec/spec_helper.rb
@@ -1,10 +1,22 @@
 require 'chefspec'
-require 'chefspec/berkshelf'
 
 # Chef::Mixin::ShellOut is required to mock shellout
 include Chef::Mixin::ShellOut
 
 RSpec.configure do |c|
+  c.before(:suite) do
+    # Copy third-party cookbooks to cookbooks directory for ChefSpec tests
+    require 'fileutils'
+    third_party_path = File.expand_path('../../third-party', __dir__)
+    cookbooks_path = File.expand_path('../..', __dir__)
+    if Dir.exist?(third_party_path)
+      Dir.glob(File.join(third_party_path, '*')).each do |cookbook|
+        next unless File.directory?(cookbook)
+        FileUtils.cp_r(cookbook, cookbooks_path)
+      end
+    end
+  end
+
   c.before(:each) do
     allow(File).to receive(:exist?).and_call_original
     allow(Dir).to receive(:exist?).and_call_original
diff --git a/cookbooks/aws-parallelcluster-slurm/Berksfile b/cookbooks/aws-parallelcluster-slurm/Berksfile
deleted file mode 100644
index dcbf3cf120..0000000000
--- a/cookbooks/aws-parallelcluster-slurm/Berksfile
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-source chef_repo: "."
-metadata
-
-cookbook "aws-parallelcluster-computefleet", path: "../aws-parallelcluster-computefleet"
-cookbook "aws-parallelcluster-environment", path: "../aws-parallelcluster-environment"
-cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"
-cookbook "aws-parallelcluster-platform", path: "../aws-parallelcluster-platform"
-
-cookbook "iptables", path: "../third-party/iptables-8.0.0"
-cookbook "line", path: "../third-party/line-4.5.21"
-cookbook "nfs", path: "../third-party/nfs-5.1.5"
-cookbook "openssh", path: "../third-party/openssh-2.11.14"
-cookbook "yum", path: "../third-party/yum-7.4.20"
-cookbook "yum-epel", path: "../third-party/yum-epel-5.0.8"
diff --git a/cookbooks/aws-parallelcluster-slurm/spec/spec_helper.rb b/cookbooks/aws-parallelcluster-slurm/spec/spec_helper.rb
index 2a6b68f0dd..e5b73a74a5 100644
--- a/cookbooks/aws-parallelcluster-slurm/spec/spec_helper.rb
+++ b/cookbooks/aws-parallelcluster-slurm/spec/spec_helper.rb
@@ -1,5 +1,4 @@
 require 'chefspec'
-require 'chefspec/berkshelf'
 
 require_relative '../../aws-parallelcluster-shared/spec/spec_helper'
 
diff --git a/cookbooks/aws-parallelcluster-tests/Berksfile b/cookbooks/aws-parallelcluster-tests/Berksfile
deleted file mode 100644
index da6695d9ec..0000000000
--- a/cookbooks/aws-parallelcluster-tests/Berksfile
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-# To add a new cookbook dependency or to change version for an existing dependency
-# uncomment the following line to enable the public Chef supermarket endpoint
-# source 'https://supermarket.chef.io'
-source chef_repo: "."
-
-metadata
diff --git a/cookbooks/third-party/iptables-8.0.0/.delivery/project.toml b/cookbooks/third-party/iptables/.delivery/project.toml
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/.delivery/project.toml
rename to cookbooks/third-party/iptables/.delivery/project.toml
diff --git a/cookbooks/third-party/iptables-8.0.0/.editorconfig b/cookbooks/third-party/iptables/.editorconfig
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/.editorconfig
rename to cookbooks/third-party/iptables/.editorconfig
diff --git a/cookbooks/third-party/iptables-8.0.0/.gitattributes b/cookbooks/third-party/iptables/.gitattributes
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/.gitattributes
rename to cookbooks/third-party/iptables/.gitattributes
diff --git a/cookbooks/third-party/iptables-8.0.0/.github/CODEOWNERS b/cookbooks/third-party/iptables/.github/CODEOWNERS
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/.github/CODEOWNERS
rename to cookbooks/third-party/iptables/.github/CODEOWNERS
diff --git a/cookbooks/third-party/iptables-8.0.0/.github/workflows/branchcleanup.yml b/cookbooks/third-party/iptables/.github/workflows/branchcleanup.yml
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/.github/workflows/branchcleanup.yml
rename to cookbooks/third-party/iptables/.github/workflows/branchcleanup.yml
diff --git a/cookbooks/third-party/iptables-8.0.0/.github/workflows/ci.yml b/cookbooks/third-party/iptables/.github/workflows/ci.yml
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/.github/workflows/ci.yml
rename to cookbooks/third-party/iptables/.github/workflows/ci.yml
diff --git a/cookbooks/third-party/iptables-8.0.0/.gitignore b/cookbooks/third-party/iptables/.gitignore
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/.gitignore
rename to cookbooks/third-party/iptables/.gitignore
diff --git a/cookbooks/third-party/iptables-8.0.0/Berksfile b/cookbooks/third-party/iptables/Berksfile
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/Berksfile
rename to cookbooks/third-party/iptables/Berksfile
diff --git a/cookbooks/third-party/iptables-8.0.0/CHANGELOG.md b/cookbooks/third-party/iptables/CHANGELOG.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/CHANGELOG.md
rename to cookbooks/third-party/iptables/CHANGELOG.md
diff --git a/cookbooks/third-party/iptables-8.0.0/CODE_OF_CONDUCT.md b/cookbooks/third-party/iptables/CODE_OF_CONDUCT.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/CODE_OF_CONDUCT.md
rename to cookbooks/third-party/iptables/CODE_OF_CONDUCT.md
diff --git a/cookbooks/third-party/iptables-8.0.0/CONTRIBUTING.md b/cookbooks/third-party/iptables/CONTRIBUTING.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/CONTRIBUTING.md
rename to cookbooks/third-party/iptables/CONTRIBUTING.md
diff --git a/cookbooks/third-party/iptables-8.0.0/Gemfile b/cookbooks/third-party/iptables/Gemfile
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/Gemfile
rename to cookbooks/third-party/iptables/Gemfile
diff --git a/cookbooks/third-party/iptables-8.0.0/LICENSE b/cookbooks/third-party/iptables/LICENSE
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/LICENSE
rename to cookbooks/third-party/iptables/LICENSE
diff --git a/cookbooks/third-party/iptables-8.0.0/README.md b/cookbooks/third-party/iptables/README.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/README.md
rename to cookbooks/third-party/iptables/README.md
diff --git a/cookbooks/third-party/iptables-8.0.0/TESTING.md b/cookbooks/third-party/iptables/TESTING.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/TESTING.md
rename to cookbooks/third-party/iptables/TESTING.md
diff --git a/cookbooks/third-party/iptables-8.0.0/UPGRADING.md b/cookbooks/third-party/iptables/UPGRADING.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/UPGRADING.md
rename to cookbooks/third-party/iptables/UPGRADING.md
diff --git a/cookbooks/third-party/iptables-8.0.0/attributes/default.rb b/cookbooks/third-party/iptables/attributes/default.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/attributes/default.rb
rename to cookbooks/third-party/iptables/attributes/default.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/chefignore b/cookbooks/third-party/iptables/chefignore
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/chefignore
rename to cookbooks/third-party/iptables/chefignore
diff --git a/cookbooks/third-party/iptables-8.0.0/documentation/iptables_chain.md b/cookbooks/third-party/iptables/documentation/iptables_chain.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/documentation/iptables_chain.md
rename to cookbooks/third-party/iptables/documentation/iptables_chain.md
diff --git a/cookbooks/third-party/iptables-8.0.0/documentation/iptables_packages.md b/cookbooks/third-party/iptables/documentation/iptables_packages.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/documentation/iptables_packages.md
rename to cookbooks/third-party/iptables/documentation/iptables_packages.md
diff --git a/cookbooks/third-party/iptables-8.0.0/documentation/iptables_rule.md b/cookbooks/third-party/iptables/documentation/iptables_rule.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/documentation/iptables_rule.md
rename to cookbooks/third-party/iptables/documentation/iptables_rule.md
diff --git a/cookbooks/third-party/iptables-8.0.0/documentation/iptables_service.md b/cookbooks/third-party/iptables/documentation/iptables_service.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/documentation/iptables_service.md
rename to cookbooks/third-party/iptables/documentation/iptables_service.md
diff --git a/cookbooks/third-party/iptables-8.0.0/kitchen.dokken.yml b/cookbooks/third-party/iptables/kitchen.dokken.yml
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/kitchen.dokken.yml
rename to cookbooks/third-party/iptables/kitchen.dokken.yml
diff --git a/cookbooks/third-party/iptables-8.0.0/kitchen.yml b/cookbooks/third-party/iptables/kitchen.yml
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/kitchen.yml
rename to cookbooks/third-party/iptables/kitchen.yml
diff --git a/cookbooks/third-party/iptables-8.0.0/libraries/helpers.rb b/cookbooks/third-party/iptables/libraries/helpers.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/libraries/helpers.rb
rename to cookbooks/third-party/iptables/libraries/helpers.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/metadata.rb b/cookbooks/third-party/iptables/metadata.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/metadata.rb
rename to cookbooks/third-party/iptables/metadata.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/recipes/_package.rb b/cookbooks/third-party/iptables/recipes/_package.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/recipes/_package.rb
rename to cookbooks/third-party/iptables/recipes/_package.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/recipes/default.rb b/cookbooks/third-party/iptables/recipes/default.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/recipes/default.rb
rename to cookbooks/third-party/iptables/recipes/default.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/recipes/disabled.rb b/cookbooks/third-party/iptables/recipes/disabled.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/recipes/disabled.rb
rename to cookbooks/third-party/iptables/recipes/disabled.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/resources/chain.rb b/cookbooks/third-party/iptables/resources/chain.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/resources/chain.rb
rename to cookbooks/third-party/iptables/resources/chain.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/resources/chain6.rb b/cookbooks/third-party/iptables/resources/chain6.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/resources/chain6.rb
rename to cookbooks/third-party/iptables/resources/chain6.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/resources/packages.rb b/cookbooks/third-party/iptables/resources/packages.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/resources/packages.rb
rename to cookbooks/third-party/iptables/resources/packages.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/resources/rule.rb b/cookbooks/third-party/iptables/resources/rule.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/resources/rule.rb
rename to cookbooks/third-party/iptables/resources/rule.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/resources/rule6.rb b/cookbooks/third-party/iptables/resources/rule6.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/resources/rule6.rb
rename to cookbooks/third-party/iptables/resources/rule6.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/resources/service.rb b/cookbooks/third-party/iptables/resources/service.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/resources/service.rb
rename to cookbooks/third-party/iptables/resources/service.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/spec/libraries/helpers_spec.rb b/cookbooks/third-party/iptables/spec/libraries/helpers_spec.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/spec/libraries/helpers_spec.rb
rename to cookbooks/third-party/iptables/spec/libraries/helpers_spec.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/spec/resources/chain_spec.rb b/cookbooks/third-party/iptables/spec/resources/chain_spec.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/spec/resources/chain_spec.rb
rename to cookbooks/third-party/iptables/spec/resources/chain_spec.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/spec/resources/rule_spec.rb b/cookbooks/third-party/iptables/spec/resources/rule_spec.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/spec/resources/rule_spec.rb
rename to cookbooks/third-party/iptables/spec/resources/rule_spec.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/spec/spec_helper.rb b/cookbooks/third-party/iptables/spec/spec_helper.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/spec/spec_helper.rb
rename to cookbooks/third-party/iptables/spec/spec_helper.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/templates/default/iptables-config.erb b/cookbooks/third-party/iptables/templates/default/iptables-config.erb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/templates/default/iptables-config.erb
rename to cookbooks/third-party/iptables/templates/default/iptables-config.erb
diff --git a/cookbooks/third-party/iptables-8.0.0/templates/default/iptables.erb b/cookbooks/third-party/iptables/templates/default/iptables.erb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/templates/default/iptables.erb
rename to cookbooks/third-party/iptables/templates/default/iptables.erb
diff --git a/cookbooks/third-party/iptables-8.0.0/templates/default/iptables_load.erb b/cookbooks/third-party/iptables/templates/default/iptables_load.erb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/templates/default/iptables_load.erb
rename to cookbooks/third-party/iptables/templates/default/iptables_load.erb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/cookbooks/test/README.md b/cookbooks/third-party/iptables/test/cookbooks/test/README.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/test/cookbooks/test/README.md
rename to cookbooks/third-party/iptables/test/cookbooks/test/README.md
diff --git a/cookbooks/third-party/iptables-8.0.0/test/cookbooks/test/metadata.rb b/cookbooks/third-party/iptables/test/cookbooks/test/metadata.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/test/cookbooks/test/metadata.rb
rename to cookbooks/third-party/iptables/test/cookbooks/test/metadata.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/cookbooks/test/recipes/all-tables.rb b/cookbooks/third-party/iptables/test/cookbooks/test/recipes/all-tables.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/test/cookbooks/test/recipes/all-tables.rb
rename to cookbooks/third-party/iptables/test/cookbooks/test/recipes/all-tables.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/cookbooks/test/recipes/centos-6-helper.rb b/cookbooks/third-party/iptables/test/cookbooks/test/recipes/centos-6-helper.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/test/cookbooks/test/recipes/centos-6-helper.rb
rename to cookbooks/third-party/iptables/test/cookbooks/test/recipes/centos-6-helper.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/cookbooks/test/recipes/install-and-remove.rb b/cookbooks/third-party/iptables/test/cookbooks/test/recipes/install-and-remove.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/test/cookbooks/test/recipes/install-and-remove.rb
rename to cookbooks/third-party/iptables/test/cookbooks/test/recipes/install-and-remove.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/cookbooks/test/recipes/rule-line-number.rb b/cookbooks/third-party/iptables/test/cookbooks/test/recipes/rule-line-number.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/test/cookbooks/test/recipes/rule-line-number.rb
rename to cookbooks/third-party/iptables/test/cookbooks/test/recipes/rule-line-number.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/cookbooks/test/recipes/rule-line.rb b/cookbooks/third-party/iptables/test/cookbooks/test/recipes/rule-line.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/test/cookbooks/test/recipes/rule-line.rb
rename to cookbooks/third-party/iptables/test/cookbooks/test/recipes/rule-line.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/cookbooks/test/recipes/rules.rb b/cookbooks/third-party/iptables/test/cookbooks/test/recipes/rules.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/test/cookbooks/test/recipes/rules.rb
rename to cookbooks/third-party/iptables/test/cookbooks/test/recipes/rules.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/integration/all-tables/all_tables_spec.rb b/cookbooks/third-party/iptables/test/integration/all-tables/all_tables_spec.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/test/integration/all-tables/all_tables_spec.rb
rename to cookbooks/third-party/iptables/test/integration/all-tables/all_tables_spec.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/integration/all-tables/rules_spec.rb b/cookbooks/third-party/iptables/test/integration/all-tables/rules_spec.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/test/integration/all-tables/rules_spec.rb
rename to cookbooks/third-party/iptables/test/integration/all-tables/rules_spec.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/integration/default/inspec/default_spec.rb b/cookbooks/third-party/iptables/test/integration/default/inspec/default_spec.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/test/integration/default/inspec/default_spec.rb
rename to cookbooks/third-party/iptables/test/integration/default/inspec/default_spec.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/integration/default/inspec/rules_spec.rb b/cookbooks/third-party/iptables/test/integration/default/inspec/rules_spec.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/test/integration/default/inspec/rules_spec.rb
rename to cookbooks/third-party/iptables/test/integration/default/inspec/rules_spec.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/integration/disabled/inspec/disabled_spec.rb b/cookbooks/third-party/iptables/test/integration/disabled/inspec/disabled_spec.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/test/integration/disabled/inspec/disabled_spec.rb
rename to cookbooks/third-party/iptables/test/integration/disabled/inspec/disabled_spec.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/integration/install-and-remove/install-and-remove.rb b/cookbooks/third-party/iptables/test/integration/install-and-remove/install-and-remove.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/test/integration/install-and-remove/install-and-remove.rb
rename to cookbooks/third-party/iptables/test/integration/install-and-remove/install-and-remove.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/integration/rule-line-number/rule-line-number.rb b/cookbooks/third-party/iptables/test/integration/rule-line-number/rule-line-number.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/test/integration/rule-line-number/rule-line-number.rb
rename to cookbooks/third-party/iptables/test/integration/rule-line-number/rule-line-number.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/integration/rule-line-number/rules_spec.rb b/cookbooks/third-party/iptables/test/integration/rule-line-number/rules_spec.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/test/integration/rule-line-number/rules_spec.rb
rename to cookbooks/third-party/iptables/test/integration/rule-line-number/rules_spec.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/integration/rule-line/rule-line.rb b/cookbooks/third-party/iptables/test/integration/rule-line/rule-line.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/test/integration/rule-line/rule-line.rb
rename to cookbooks/third-party/iptables/test/integration/rule-line/rule-line.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/integration/rule-line/rules_spec.rb b/cookbooks/third-party/iptables/test/integration/rule-line/rules_spec.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/test/integration/rule-line/rules_spec.rb
rename to cookbooks/third-party/iptables/test/integration/rule-line/rules_spec.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/integration/rules/rules.rb b/cookbooks/third-party/iptables/test/integration/rules/rules.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/test/integration/rules/rules.rb
rename to cookbooks/third-party/iptables/test/integration/rules/rules.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/integration/rules/rules_spec.rb b/cookbooks/third-party/iptables/test/integration/rules/rules_spec.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/test/integration/rules/rules_spec.rb
rename to cookbooks/third-party/iptables/test/integration/rules/rules_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/.editorconfig b/cookbooks/third-party/line/.editorconfig
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.editorconfig
rename to cookbooks/third-party/line/.editorconfig
diff --git a/cookbooks/third-party/line-4.5.21/.envrc b/cookbooks/third-party/line/.envrc
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.envrc
rename to cookbooks/third-party/line/.envrc
diff --git a/cookbooks/third-party/line-4.5.21/.gitattributes b/cookbooks/third-party/line/.gitattributes
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.gitattributes
rename to cookbooks/third-party/line/.gitattributes
diff --git a/cookbooks/third-party/line-4.5.21/.github/CODEOWNERS b/cookbooks/third-party/line/.github/CODEOWNERS
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.github/CODEOWNERS
rename to cookbooks/third-party/line/.github/CODEOWNERS
diff --git a/cookbooks/third-party/line-4.5.21/.github/lock.yml b/cookbooks/third-party/line/.github/lock.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.github/lock.yml
rename to cookbooks/third-party/line/.github/lock.yml
diff --git a/cookbooks/third-party/line-4.5.21/.github/workflows/ci.yml b/cookbooks/third-party/line/.github/workflows/ci.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.github/workflows/ci.yml
rename to cookbooks/third-party/line/.github/workflows/ci.yml
diff --git a/cookbooks/third-party/line-4.5.21/.github/workflows/stale.yml b/cookbooks/third-party/line/.github/workflows/stale.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.github/workflows/stale.yml
rename to cookbooks/third-party/line/.github/workflows/stale.yml
diff --git a/cookbooks/third-party/line-4.5.21/.gitignore b/cookbooks/third-party/line/.gitignore
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.gitignore
rename to cookbooks/third-party/line/.gitignore
diff --git a/cookbooks/third-party/line-4.5.21/.markdownlint-cli2.yaml b/cookbooks/third-party/line/.markdownlint-cli2.yaml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.markdownlint-cli2.yaml
rename to cookbooks/third-party/line/.markdownlint-cli2.yaml
diff --git a/cookbooks/third-party/line-4.5.21/.mdlrc b/cookbooks/third-party/line/.mdlrc
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.mdlrc
rename to cookbooks/third-party/line/.mdlrc
diff --git a/cookbooks/third-party/line-4.5.21/.overcommit.yml b/cookbooks/third-party/line/.overcommit.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.overcommit.yml
rename to cookbooks/third-party/line/.overcommit.yml
diff --git a/cookbooks/third-party/line-4.5.21/.yamllint b/cookbooks/third-party/line/.yamllint
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.yamllint
rename to cookbooks/third-party/line/.yamllint
diff --git a/cookbooks/third-party/line-4.5.21/Berksfile b/cookbooks/third-party/line/Berksfile
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/Berksfile
rename to cookbooks/third-party/line/Berksfile
diff --git a/cookbooks/third-party/line-4.5.21/CHANGELOG.md b/cookbooks/third-party/line/CHANGELOG.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/CHANGELOG.md
rename to cookbooks/third-party/line/CHANGELOG.md
diff --git a/cookbooks/third-party/line-4.5.21/CODE_OF_CONDUCT.md b/cookbooks/third-party/line/CODE_OF_CONDUCT.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/CODE_OF_CONDUCT.md
rename to cookbooks/third-party/line/CODE_OF_CONDUCT.md
diff --git a/cookbooks/third-party/line-4.5.21/CONTRIBUTING.md b/cookbooks/third-party/line/CONTRIBUTING.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/CONTRIBUTING.md
rename to cookbooks/third-party/line/CONTRIBUTING.md
diff --git a/cookbooks/third-party/line-4.5.21/Dangerfile b/cookbooks/third-party/line/Dangerfile
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/Dangerfile
rename to cookbooks/third-party/line/Dangerfile
diff --git a/cookbooks/third-party/line-4.5.21/FilterDevelopment.md b/cookbooks/third-party/line/FilterDevelopment.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/FilterDevelopment.md
rename to cookbooks/third-party/line/FilterDevelopment.md
diff --git a/cookbooks/third-party/line-4.5.21/LICENSE b/cookbooks/third-party/line/LICENSE
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/LICENSE
rename to cookbooks/third-party/line/LICENSE
diff --git a/cookbooks/third-party/line-4.5.21/README.md b/cookbooks/third-party/line/README.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/README.md
rename to cookbooks/third-party/line/README.md
diff --git a/cookbooks/third-party/line-4.5.21/TESTING.md b/cookbooks/third-party/line/TESTING.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/TESTING.md
rename to cookbooks/third-party/line/TESTING.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/.gitkeep b/cookbooks/third-party/line/documentation/.gitkeep
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/documentation/.gitkeep
rename to cookbooks/third-party/line/documentation/.gitkeep
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/add_to_list.md b/cookbooks/third-party/line/documentation/resources/add_to_list.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/documentation/resources/add_to_list.md
rename to cookbooks/third-party/line/documentation/resources/add_to_list.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/append_if_no_line.md b/cookbooks/third-party/line/documentation/resources/append_if_no_line.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/documentation/resources/append_if_no_line.md
rename to cookbooks/third-party/line/documentation/resources/append_if_no_line.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/delete_from_list.md b/cookbooks/third-party/line/documentation/resources/delete_from_list.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/documentation/resources/delete_from_list.md
rename to cookbooks/third-party/line/documentation/resources/delete_from_list.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/delete_lines.md b/cookbooks/third-party/line/documentation/resources/delete_lines.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/documentation/resources/delete_lines.md
rename to cookbooks/third-party/line/documentation/resources/delete_lines.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filter_lines.md b/cookbooks/third-party/line/documentation/resources/filter_lines.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/documentation/resources/filter_lines.md
rename to cookbooks/third-party/line/documentation/resources/filter_lines.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filters/after.md b/cookbooks/third-party/line/documentation/resources/filters/after.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/documentation/resources/filters/after.md
rename to cookbooks/third-party/line/documentation/resources/filters/after.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filters/before.md b/cookbooks/third-party/line/documentation/resources/filters/before.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/documentation/resources/filters/before.md
rename to cookbooks/third-party/line/documentation/resources/filters/before.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filters/between.md b/cookbooks/third-party/line/documentation/resources/filters/between.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/documentation/resources/filters/between.md
rename to cookbooks/third-party/line/documentation/resources/filters/between.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filters/comment.md b/cookbooks/third-party/line/documentation/resources/filters/comment.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/documentation/resources/filters/comment.md
rename to cookbooks/third-party/line/documentation/resources/filters/comment.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filters/delete_between.md b/cookbooks/third-party/line/documentation/resources/filters/delete_between.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/documentation/resources/filters/delete_between.md
rename to cookbooks/third-party/line/documentation/resources/filters/delete_between.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filters/missing.md b/cookbooks/third-party/line/documentation/resources/filters/missing.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/documentation/resources/filters/missing.md
rename to cookbooks/third-party/line/documentation/resources/filters/missing.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filters/replace.md b/cookbooks/third-party/line/documentation/resources/filters/replace.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/documentation/resources/filters/replace.md
rename to cookbooks/third-party/line/documentation/resources/filters/replace.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filters/replace_between.md b/cookbooks/third-party/line/documentation/resources/filters/replace_between.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/documentation/resources/filters/replace_between.md
rename to cookbooks/third-party/line/documentation/resources/filters/replace_between.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filters/stanza.md b/cookbooks/third-party/line/documentation/resources/filters/stanza.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/documentation/resources/filters/stanza.md
rename to cookbooks/third-party/line/documentation/resources/filters/stanza.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filters/substitute.md b/cookbooks/third-party/line/documentation/resources/filters/substitute.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/documentation/resources/filters/substitute.md
rename to cookbooks/third-party/line/documentation/resources/filters/substitute.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/replace_or_add.md b/cookbooks/third-party/line/documentation/resources/replace_or_add.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/documentation/resources/replace_or_add.md
rename to cookbooks/third-party/line/documentation/resources/replace_or_add.md
diff --git a/cookbooks/third-party/line-4.5.21/kitchen.dokken.yml b/cookbooks/third-party/line/kitchen.dokken.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/kitchen.dokken.yml
rename to cookbooks/third-party/line/kitchen.dokken.yml
diff --git a/cookbooks/third-party/line-4.5.21/kitchen.exec.yml b/cookbooks/third-party/line/kitchen.exec.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/kitchen.exec.yml
rename to cookbooks/third-party/line/kitchen.exec.yml
diff --git a/cookbooks/third-party/line-4.5.21/kitchen.global.yml b/cookbooks/third-party/line/kitchen.global.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/kitchen.global.yml
rename to cookbooks/third-party/line/kitchen.global.yml
diff --git a/cookbooks/third-party/line-4.5.21/kitchen.yml b/cookbooks/third-party/line/kitchen.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/kitchen.yml
rename to cookbooks/third-party/line/kitchen.yml
diff --git a/cookbooks/third-party/line-4.5.21/libraries/after_filter.rb b/cookbooks/third-party/line/libraries/after_filter.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/after_filter.rb
rename to cookbooks/third-party/line/libraries/after_filter.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/before_filter.rb b/cookbooks/third-party/line/libraries/before_filter.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/before_filter.rb
rename to cookbooks/third-party/line/libraries/before_filter.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/between.rb b/cookbooks/third-party/line/libraries/between.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/between.rb
rename to cookbooks/third-party/line/libraries/between.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/comment_filter.rb b/cookbooks/third-party/line/libraries/comment_filter.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/comment_filter.rb
rename to cookbooks/third-party/line/libraries/comment_filter.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/delete_between.rb b/cookbooks/third-party/line/libraries/delete_between.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/delete_between.rb
rename to cookbooks/third-party/line/libraries/delete_between.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/filter_helper.rb b/cookbooks/third-party/line/libraries/filter_helper.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/filter_helper.rb
rename to cookbooks/third-party/line/libraries/filter_helper.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/helper.rb b/cookbooks/third-party/line/libraries/helper.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/helper.rb
rename to cookbooks/third-party/line/libraries/helper.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/list_helper.rb b/cookbooks/third-party/line/libraries/list_helper.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/list_helper.rb
rename to cookbooks/third-party/line/libraries/list_helper.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/missing_filter.rb b/cookbooks/third-party/line/libraries/missing_filter.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/missing_filter.rb
rename to cookbooks/third-party/line/libraries/missing_filter.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/replace_between.rb b/cookbooks/third-party/line/libraries/replace_between.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/replace_between.rb
rename to cookbooks/third-party/line/libraries/replace_between.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/replace_filter.rb b/cookbooks/third-party/line/libraries/replace_filter.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/replace_filter.rb
rename to cookbooks/third-party/line/libraries/replace_filter.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/stanza_filter.rb b/cookbooks/third-party/line/libraries/stanza_filter.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/stanza_filter.rb
rename to cookbooks/third-party/line/libraries/stanza_filter.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/substitute_filter.rb b/cookbooks/third-party/line/libraries/substitute_filter.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/substitute_filter.rb
rename to cookbooks/third-party/line/libraries/substitute_filter.rb
diff --git a/cookbooks/third-party/line-4.5.21/metadata.rb b/cookbooks/third-party/line/metadata.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/metadata.rb
rename to cookbooks/third-party/line/metadata.rb
diff --git a/cookbooks/third-party/line-4.5.21/recipes/default.rb b/cookbooks/third-party/line/recipes/default.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/recipes/default.rb
rename to cookbooks/third-party/line/recipes/default.rb
diff --git a/cookbooks/third-party/line-4.5.21/renovate.json b/cookbooks/third-party/line/renovate.json
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/renovate.json
rename to cookbooks/third-party/line/renovate.json
diff --git a/cookbooks/third-party/line-4.5.21/resources/add_to_list.rb b/cookbooks/third-party/line/resources/add_to_list.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/resources/add_to_list.rb
rename to cookbooks/third-party/line/resources/add_to_list.rb
diff --git a/cookbooks/third-party/line-4.5.21/resources/append_if_no_line.rb b/cookbooks/third-party/line/resources/append_if_no_line.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/resources/append_if_no_line.rb
rename to cookbooks/third-party/line/resources/append_if_no_line.rb
diff --git a/cookbooks/third-party/line-4.5.21/resources/delete_from_list.rb b/cookbooks/third-party/line/resources/delete_from_list.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/resources/delete_from_list.rb
rename to cookbooks/third-party/line/resources/delete_from_list.rb
diff --git a/cookbooks/third-party/line-4.5.21/resources/delete_lines.rb b/cookbooks/third-party/line/resources/delete_lines.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/resources/delete_lines.rb
rename to cookbooks/third-party/line/resources/delete_lines.rb
diff --git a/cookbooks/third-party/line-4.5.21/resources/filter_lines.rb b/cookbooks/third-party/line/resources/filter_lines.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/resources/filter_lines.rb
rename to cookbooks/third-party/line/resources/filter_lines.rb
diff --git a/cookbooks/third-party/line-4.5.21/resources/replace_or_add.rb b/cookbooks/third-party/line/resources/replace_or_add.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/resources/replace_or_add.rb
rename to cookbooks/third-party/line/resources/replace_or_add.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/chefspec_helper.rb b/cookbooks/third-party/line/spec/chefspec_helper.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/chefspec_helper.rb
rename to cookbooks/third-party/line/spec/chefspec_helper.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/cookbook/documentation_spec.rb b/cookbooks/third-party/line/spec/cookbook/documentation_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/cookbook/documentation_spec.rb
rename to cookbooks/third-party/line/spec/cookbook/documentation_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/fixtures/cookbooks/spectest/README.md b/cookbooks/third-party/line/spec/fixtures/cookbooks/spectest/README.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/fixtures/cookbooks/spectest/README.md
rename to cookbooks/third-party/line/spec/fixtures/cookbooks/spectest/README.md
diff --git a/cookbooks/third-party/line-4.5.21/spec/fixtures/cookbooks/spectest/metadata.rb b/cookbooks/third-party/line/spec/fixtures/cookbooks/spectest/metadata.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/fixtures/cookbooks/spectest/metadata.rb
rename to cookbooks/third-party/line/spec/fixtures/cookbooks/spectest/metadata.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/fixtures/cookbooks/spectest/recipes/add_to_list_missing_file.rb b/cookbooks/third-party/line/spec/fixtures/cookbooks/spectest/recipes/add_to_list_missing_file.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/fixtures/cookbooks/spectest/recipes/add_to_list_missing_file.rb
rename to cookbooks/third-party/line/spec/fixtures/cookbooks/spectest/recipes/add_to_list_missing_file.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/fixtures/cookbooks/spectest/recipes/append_if_no_line_missing_file.rb b/cookbooks/third-party/line/spec/fixtures/cookbooks/spectest/recipes/append_if_no_line_missing_file.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/fixtures/cookbooks/spectest/recipes/append_if_no_line_missing_file.rb
rename to cookbooks/third-party/line/spec/fixtures/cookbooks/spectest/recipes/append_if_no_line_missing_file.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/fixtures/cookbooks/spectest/recipes/delete_from_list_missing_file.rb b/cookbooks/third-party/line/spec/fixtures/cookbooks/spectest/recipes/delete_from_list_missing_file.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/fixtures/cookbooks/spectest/recipes/delete_from_list_missing_file.rb
rename to cookbooks/third-party/line/spec/fixtures/cookbooks/spectest/recipes/delete_from_list_missing_file.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/fixtures/cookbooks/spectest/recipes/delete_lines_missing_file.rb b/cookbooks/third-party/line/spec/fixtures/cookbooks/spectest/recipes/delete_lines_missing_file.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/fixtures/cookbooks/spectest/recipes/delete_lines_missing_file.rb
rename to cookbooks/third-party/line/spec/fixtures/cookbooks/spectest/recipes/delete_lines_missing_file.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/fixtures/cookbooks/spectest/recipes/replace_or_add_missing_file.rb b/cookbooks/third-party/line/spec/fixtures/cookbooks/spectest/recipes/replace_or_add_missing_file.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/fixtures/cookbooks/spectest/recipes/replace_or_add_missing_file.rb
rename to cookbooks/third-party/line/spec/fixtures/cookbooks/spectest/recipes/replace_or_add_missing_file.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/rspec_helper.rb b/cookbooks/third-party/line/spec/rspec_helper.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/rspec_helper.rb
rename to cookbooks/third-party/line/spec/rspec_helper.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter/after_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter/after_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter/after_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter/after_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter/before_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter/before_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter/before_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter/before_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter/between_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter/between_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter/between_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter/between_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter/comment_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter/comment_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter/comment_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter/comment_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter/delete_between_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter/delete_between_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter/delete_between_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter/delete_between_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter/missing_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter/missing_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter/missing_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter/missing_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter/replace_between_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter/replace_between_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter/replace_between_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter/replace_between_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter/replace_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter/replace_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter/replace_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter/replace_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter/stanza_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter/stanza_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter/stanza_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter/stanza_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter/substitute_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter/substitute_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter/substitute_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter/substitute_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/chomp_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter_helper/chomp_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/chomp_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter_helper/chomp_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/expand_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter_helper/expand_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/expand_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter_helper/expand_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/match_insert_lines_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter_helper/match_insert_lines_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/match_insert_lines_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter_helper/match_insert_lines_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/match_limits_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter_helper/match_limits_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/match_limits_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter_helper/match_limits_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/missing_line_between_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter_helper/missing_line_between_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/missing_line_between_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter_helper/missing_line_between_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/next_match_after_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter_helper/next_match_after_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/next_match_after_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter_helper/next_match_after_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/options_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter_helper/options_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/options_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter_helper/options_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/string_to_lines_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter_helper/string_to_lines_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/string_to_lines_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter_helper/string_to_lines_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/verify_all_of_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter_helper/verify_all_of_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/verify_all_of_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter_helper/verify_all_of_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/verify_kind_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter_helper/verify_kind_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/verify_kind_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter_helper/verify_kind_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/verify_one_of_spec.rb b/cookbooks/third-party/line/spec/unit/library/filter_helper/verify_one_of_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/filter_helper/verify_one_of_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/filter_helper/verify_one_of_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/helper_spec.rb b/cookbooks/third-party/line/spec/unit/library/helper_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/helper_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/helper_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/list_helper_spec.rb b/cookbooks/third-party/line/spec/unit/library/list_helper_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/library/list_helper_spec.rb
rename to cookbooks/third-party/line/spec/unit/library/list_helper_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/recipes/add_to_list_missing_file_spec.rb b/cookbooks/third-party/line/spec/unit/recipes/add_to_list_missing_file_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/recipes/add_to_list_missing_file_spec.rb
rename to cookbooks/third-party/line/spec/unit/recipes/add_to_list_missing_file_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/recipes/append_if_no_line_missing_file_spec.rb b/cookbooks/third-party/line/spec/unit/recipes/append_if_no_line_missing_file_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/recipes/append_if_no_line_missing_file_spec.rb
rename to cookbooks/third-party/line/spec/unit/recipes/append_if_no_line_missing_file_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/recipes/delete_from_list_missing_file_spec.rb b/cookbooks/third-party/line/spec/unit/recipes/delete_from_list_missing_file_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/recipes/delete_from_list_missing_file_spec.rb
rename to cookbooks/third-party/line/spec/unit/recipes/delete_from_list_missing_file_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/recipes/delete_lines_missing_file_spec.rb b/cookbooks/third-party/line/spec/unit/recipes/delete_lines_missing_file_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/recipes/delete_lines_missing_file_spec.rb
rename to cookbooks/third-party/line/spec/unit/recipes/delete_lines_missing_file_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/recipes/replace_or_add_missing_file_spec.rb b/cookbooks/third-party/line/spec/unit/recipes/replace_or_add_missing_file_spec.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/unit/recipes/replace_or_add_missing_file_spec.rb
rename to cookbooks/third-party/line/spec/unit/recipes/replace_or_add_missing_file_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/libraries/resource_handler.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/libraries/resource_handler.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/libraries/resource_handler.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/libraries/resource_handler.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/metadata.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/metadata.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/metadata.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/metadata.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/add_to_list_1d.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/add_to_list_1d.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/add_to_list_1d.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/add_to_list_1d.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/add_to_list_1d_terminal.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/add_to_list_1d_terminal.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/add_to_list_1d_terminal.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/add_to_list_1d_terminal.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/add_to_list_2d.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/add_to_list_2d.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/add_to_list_2d.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/add_to_list_2d.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/add_to_list_2d_terminal.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/add_to_list_2d_terminal.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/add_to_list_2d_terminal.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/add_to_list_2d_terminal.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/add_to_list_3d.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/add_to_list_3d.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/add_to_list_3d.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/add_to_list_3d.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/add_to_list_3d_terminal.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/add_to_list_3d_terminal.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/add_to_list_3d_terminal.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/add_to_list_3d_terminal.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/add_to_list_empty.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/add_to_list_empty.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/add_to_list_empty.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/add_to_list_empty.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/append_if_no_line_empty.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/append_if_no_line_empty.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/append_if_no_line_empty.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/append_if_no_line_empty.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/append_if_no_line_single_line.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/append_if_no_line_single_line.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/append_if_no_line_single_line.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/append_if_no_line_single_line.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/append_if_no_line_template.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/append_if_no_line_template.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/append_if_no_line_template.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/append_if_no_line_template.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/delete_from_list_1d.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/delete_from_list_1d.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/delete_from_list_1d.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/delete_from_list_1d.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/delete_from_list_2d.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/delete_from_list_2d.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/delete_from_list_2d.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/delete_from_list_2d.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/delete_from_list_3d.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/delete_from_list_3d.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/delete_from_list_3d.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/delete_from_list_3d.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/delete_from_list_empty.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/delete_from_list_empty.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/delete_from_list_empty.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/delete_from_list_empty.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/delete_lines_empty.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/delete_lines_empty.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/delete_lines_empty.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/delete_lines_empty.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/delete_lines_regexp.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/delete_lines_regexp.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/delete_lines_regexp.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/delete_lines_regexp.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/delete_lines_string.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/delete_lines_string.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/delete_lines_string.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/delete_lines_string.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_after.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_after.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_after.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_after.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_before.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_before.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_before.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_before.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_between.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_between.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_between.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_between.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_comment.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_comment.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_comment.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_comment.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_delete_between.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_delete_between.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_delete_between.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_delete_between.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_inline.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_inline.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_inline.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_inline.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_misc.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_misc.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_misc.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_misc.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_multi.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_multi.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_multi.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_multi.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_replace.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_replace.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_replace.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_replace.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_replace_between.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_replace_between.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_replace_between.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_replace_between.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_stanza.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_stanza.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_stanza.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_stanza.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_substitute.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_substitute.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/filter_lines_substitute.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/filter_lines_substitute.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/replace_or_add_add_a_line_matching_pattern.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/replace_or_add_add_a_line_matching_pattern.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/replace_or_add_add_a_line_matching_pattern.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/replace_or_add_add_a_line_matching_pattern.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/replace_or_add_change_line_eof.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/replace_or_add_change_line_eof.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/replace_or_add_change_line_eof.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/replace_or_add_change_line_eof.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/replace_or_add_duplicate.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/replace_or_add_duplicate.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/replace_or_add_duplicate.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/replace_or_add_duplicate.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/replace_or_add_missing_file.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/replace_or_add_missing_file.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/replace_or_add_missing_file.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/replace_or_add_missing_file.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/replace_or_add_replace_only.rb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/replace_or_add_replace_only.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/recipes/replace_or_add_replace_only.rb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/recipes/replace_or_add_replace_only.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/templates/samplefile.erb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/templates/samplefile.erb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/templates/samplefile.erb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/templates/samplefile.erb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/templates/samplefile1.erb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/templates/samplefile1.erb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/templates/samplefile1.erb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/templates/samplefile1.erb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/templates/samplefile2.erb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/templates/samplefile2.erb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/templates/samplefile2.erb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/templates/samplefile2.erb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/templates/samplefile3.erb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/templates/samplefile3.erb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/templates/samplefile3.erb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/templates/samplefile3.erb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/templates/stanza.erb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/templates/stanza.erb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/templates/stanza.erb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/templates/stanza.erb
diff --git a/cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/templates/text_file.erb b/cookbooks/third-party/line/test/fixtures/cookbooks/test/templates/text_file.erb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/fixtures/cookbooks/test/templates/text_file.erb
rename to cookbooks/third-party/line/test/fixtures/cookbooks/test/templates/text_file.erb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/add_to_list/inspec/controls/add_to_list_1d.rb b/cookbooks/third-party/line/test/integration/add_to_list/inspec/controls/add_to_list_1d.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/add_to_list/inspec/controls/add_to_list_1d.rb
rename to cookbooks/third-party/line/test/integration/add_to_list/inspec/controls/add_to_list_1d.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/add_to_list/inspec/controls/add_to_list_1d_terminal.rb b/cookbooks/third-party/line/test/integration/add_to_list/inspec/controls/add_to_list_1d_terminal.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/add_to_list/inspec/controls/add_to_list_1d_terminal.rb
rename to cookbooks/third-party/line/test/integration/add_to_list/inspec/controls/add_to_list_1d_terminal.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/add_to_list/inspec/controls/add_to_list_2d.rb b/cookbooks/third-party/line/test/integration/add_to_list/inspec/controls/add_to_list_2d.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/add_to_list/inspec/controls/add_to_list_2d.rb
rename to cookbooks/third-party/line/test/integration/add_to_list/inspec/controls/add_to_list_2d.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/add_to_list/inspec/controls/add_to_list_2d_terminal.rb b/cookbooks/third-party/line/test/integration/add_to_list/inspec/controls/add_to_list_2d_terminal.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/add_to_list/inspec/controls/add_to_list_2d_terminal.rb
rename to cookbooks/third-party/line/test/integration/add_to_list/inspec/controls/add_to_list_2d_terminal.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/add_to_list/inspec/controls/add_to_list_3d.rb b/cookbooks/third-party/line/test/integration/add_to_list/inspec/controls/add_to_list_3d.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/add_to_list/inspec/controls/add_to_list_3d.rb
rename to cookbooks/third-party/line/test/integration/add_to_list/inspec/controls/add_to_list_3d.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/add_to_list/inspec/controls/add_to_list_3d_terminal.rb b/cookbooks/third-party/line/test/integration/add_to_list/inspec/controls/add_to_list_3d_terminal.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/add_to_list/inspec/controls/add_to_list_3d_terminal.rb
rename to cookbooks/third-party/line/test/integration/add_to_list/inspec/controls/add_to_list_3d_terminal.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/add_to_list/inspec/controls/add_to_list_empty.rb b/cookbooks/third-party/line/test/integration/add_to_list/inspec/controls/add_to_list_empty.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/add_to_list/inspec/controls/add_to_list_empty.rb
rename to cookbooks/third-party/line/test/integration/add_to_list/inspec/controls/add_to_list_empty.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/add_to_list/inspec/inspec.yml b/cookbooks/third-party/line/test/integration/add_to_list/inspec/inspec.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/add_to_list/inspec/inspec.yml
rename to cookbooks/third-party/line/test/integration/add_to_list/inspec/inspec.yml
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/append_if_no_line/inspec/controls/append_if_no_line_empty.rb b/cookbooks/third-party/line/test/integration/append_if_no_line/inspec/controls/append_if_no_line_empty.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/append_if_no_line/inspec/controls/append_if_no_line_empty.rb
rename to cookbooks/third-party/line/test/integration/append_if_no_line/inspec/controls/append_if_no_line_empty.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/append_if_no_line/inspec/controls/append_if_no_line_single_line.rb b/cookbooks/third-party/line/test/integration/append_if_no_line/inspec/controls/append_if_no_line_single_line.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/append_if_no_line/inspec/controls/append_if_no_line_single_line.rb
rename to cookbooks/third-party/line/test/integration/append_if_no_line/inspec/controls/append_if_no_line_single_line.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/append_if_no_line/inspec/controls/append_if_no_line_template.rb b/cookbooks/third-party/line/test/integration/append_if_no_line/inspec/controls/append_if_no_line_template.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/append_if_no_line/inspec/controls/append_if_no_line_template.rb
rename to cookbooks/third-party/line/test/integration/append_if_no_line/inspec/controls/append_if_no_line_template.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/append_if_no_line/inspec/inspec.yml b/cookbooks/third-party/line/test/integration/append_if_no_line/inspec/inspec.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/append_if_no_line/inspec/inspec.yml
rename to cookbooks/third-party/line/test/integration/append_if_no_line/inspec/inspec.yml
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/delete_from_list/inspec/controls/delete_from_list_1d.rb b/cookbooks/third-party/line/test/integration/delete_from_list/inspec/controls/delete_from_list_1d.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/delete_from_list/inspec/controls/delete_from_list_1d.rb
rename to cookbooks/third-party/line/test/integration/delete_from_list/inspec/controls/delete_from_list_1d.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/delete_from_list/inspec/controls/delete_from_list_2d.rb b/cookbooks/third-party/line/test/integration/delete_from_list/inspec/controls/delete_from_list_2d.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/delete_from_list/inspec/controls/delete_from_list_2d.rb
rename to cookbooks/third-party/line/test/integration/delete_from_list/inspec/controls/delete_from_list_2d.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/delete_from_list/inspec/controls/delete_from_list_3d.rb b/cookbooks/third-party/line/test/integration/delete_from_list/inspec/controls/delete_from_list_3d.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/delete_from_list/inspec/controls/delete_from_list_3d.rb
rename to cookbooks/third-party/line/test/integration/delete_from_list/inspec/controls/delete_from_list_3d.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/delete_from_list/inspec/controls/delete_from_list_empty.rb b/cookbooks/third-party/line/test/integration/delete_from_list/inspec/controls/delete_from_list_empty.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/delete_from_list/inspec/controls/delete_from_list_empty.rb
rename to cookbooks/third-party/line/test/integration/delete_from_list/inspec/controls/delete_from_list_empty.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/delete_from_list/inspec/inspec.yml b/cookbooks/third-party/line/test/integration/delete_from_list/inspec/inspec.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/delete_from_list/inspec/inspec.yml
rename to cookbooks/third-party/line/test/integration/delete_from_list/inspec/inspec.yml
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/delete_lines/inspec/controls/delete_lines_empty.rb b/cookbooks/third-party/line/test/integration/delete_lines/inspec/controls/delete_lines_empty.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/delete_lines/inspec/controls/delete_lines_empty.rb
rename to cookbooks/third-party/line/test/integration/delete_lines/inspec/controls/delete_lines_empty.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/delete_lines/inspec/controls/delete_lines_regexp.rb b/cookbooks/third-party/line/test/integration/delete_lines/inspec/controls/delete_lines_regexp.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/delete_lines/inspec/controls/delete_lines_regexp.rb
rename to cookbooks/third-party/line/test/integration/delete_lines/inspec/controls/delete_lines_regexp.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/delete_lines/inspec/controls/delete_lines_string.rb b/cookbooks/third-party/line/test/integration/delete_lines/inspec/controls/delete_lines_string.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/delete_lines/inspec/controls/delete_lines_string.rb
rename to cookbooks/third-party/line/test/integration/delete_lines/inspec/controls/delete_lines_string.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/delete_lines/inspec/inspec.yml b/cookbooks/third-party/line/test/integration/delete_lines/inspec/inspec.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/delete_lines/inspec/inspec.yml
rename to cookbooks/third-party/line/test/integration/delete_lines/inspec/inspec.yml
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_after.rb b/cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_after.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_after.rb
rename to cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_after.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_before.rb b/cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_before.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_before.rb
rename to cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_before.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_between.rb b/cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_between.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_between.rb
rename to cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_between.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_comment.rb b/cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_comment.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_comment.rb
rename to cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_comment.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_delete_between.rb b/cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_delete_between.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_delete_between.rb
rename to cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_delete_between.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_inline.rb b/cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_inline.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_inline.rb
rename to cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_inline.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_misc.rb b/cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_misc.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_misc.rb
rename to cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_misc.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_multi.rb b/cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_multi.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_multi.rb
rename to cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_multi.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_replace.rb b/cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_replace.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_replace.rb
rename to cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_replace.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_replace_between.rb b/cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_replace_between.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_replace_between.rb
rename to cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_replace_between.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_stanza.rb b/cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_stanza.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_stanza.rb
rename to cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_stanza.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_substitue.rb b/cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_substitue.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/filter_lines/controls/filter_lines_substitue.rb
rename to cookbooks/third-party/line/test/integration/filter_lines/controls/filter_lines_substitue.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/filter_lines/inspec.yml b/cookbooks/third-party/line/test/integration/filter_lines/inspec.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/filter_lines/inspec.yml
rename to cookbooks/third-party/line/test/integration/filter_lines/inspec.yml
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/line_resources/README.md b/cookbooks/third-party/line/test/integration/line_resources/README.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/line_resources/README.md
rename to cookbooks/third-party/line/test/integration/line_resources/README.md
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/line_resources/controls/dummy b/cookbooks/third-party/line/test/integration/line_resources/controls/dummy
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/line_resources/controls/dummy
rename to cookbooks/third-party/line/test/integration/line_resources/controls/dummy
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/line_resources/inspec.yml b/cookbooks/third-party/line/test/integration/line_resources/inspec.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/line_resources/inspec.yml
rename to cookbooks/third-party/line/test/integration/line_resources/inspec.yml
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/line_resources/libraries/file_ext.rb b/cookbooks/third-party/line/test/integration/line_resources/libraries/file_ext.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/line_resources/libraries/file_ext.rb
rename to cookbooks/third-party/line/test/integration/line_resources/libraries/file_ext.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/line_resources/libraries/matches.rb b/cookbooks/third-party/line/test/integration/line_resources/libraries/matches.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/line_resources/libraries/matches.rb
rename to cookbooks/third-party/line/test/integration/line_resources/libraries/matches.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/replace_or_add/controls/replace_or_add_add_a_line_matching_pattern.rb b/cookbooks/third-party/line/test/integration/replace_or_add/controls/replace_or_add_add_a_line_matching_pattern.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/replace_or_add/controls/replace_or_add_add_a_line_matching_pattern.rb
rename to cookbooks/third-party/line/test/integration/replace_or_add/controls/replace_or_add_add_a_line_matching_pattern.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/replace_or_add/controls/replace_or_add_change_line_eof.rb b/cookbooks/third-party/line/test/integration/replace_or_add/controls/replace_or_add_change_line_eof.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/replace_or_add/controls/replace_or_add_change_line_eof.rb
rename to cookbooks/third-party/line/test/integration/replace_or_add/controls/replace_or_add_change_line_eof.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/replace_or_add/controls/replace_or_add_duplicate.rb b/cookbooks/third-party/line/test/integration/replace_or_add/controls/replace_or_add_duplicate.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/replace_or_add/controls/replace_or_add_duplicate.rb
rename to cookbooks/third-party/line/test/integration/replace_or_add/controls/replace_or_add_duplicate.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/replace_or_add/controls/replace_or_add_missing_file.rb b/cookbooks/third-party/line/test/integration/replace_or_add/controls/replace_or_add_missing_file.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/replace_or_add/controls/replace_or_add_missing_file.rb
rename to cookbooks/third-party/line/test/integration/replace_or_add/controls/replace_or_add_missing_file.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/replace_or_add/controls/replace_or_add_replace_only.rb b/cookbooks/third-party/line/test/integration/replace_or_add/controls/replace_or_add_replace_only.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/replace_or_add/controls/replace_or_add_replace_only.rb
rename to cookbooks/third-party/line/test/integration/replace_or_add/controls/replace_or_add_replace_only.rb
diff --git a/cookbooks/third-party/line-4.5.21/test/integration/replace_or_add/inspec.yml b/cookbooks/third-party/line/test/integration/replace_or_add/inspec.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/test/integration/replace_or_add/inspec.yml
rename to cookbooks/third-party/line/test/integration/replace_or_add/inspec.yml
diff --git a/cookbooks/third-party/nfs-5.1.5/.editorconfig b/cookbooks/third-party/nfs/.editorconfig
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.editorconfig
rename to cookbooks/third-party/nfs/.editorconfig
diff --git a/cookbooks/third-party/nfs-5.1.5/.envrc b/cookbooks/third-party/nfs/.envrc
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.envrc
rename to cookbooks/third-party/nfs/.envrc
diff --git a/cookbooks/third-party/nfs-5.1.5/.gitattributes b/cookbooks/third-party/nfs/.gitattributes
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.gitattributes
rename to cookbooks/third-party/nfs/.gitattributes
diff --git a/cookbooks/third-party/nfs-5.1.5/.github/CODEOWNERS b/cookbooks/third-party/nfs/.github/CODEOWNERS
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.github/CODEOWNERS
rename to cookbooks/third-party/nfs/.github/CODEOWNERS
diff --git a/cookbooks/third-party/nfs-5.1.5/.github/workflows/ci.yml b/cookbooks/third-party/nfs/.github/workflows/ci.yml
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.github/workflows/ci.yml
rename to cookbooks/third-party/nfs/.github/workflows/ci.yml
diff --git a/cookbooks/third-party/nfs-5.1.5/.github/workflows/stale.yml b/cookbooks/third-party/nfs/.github/workflows/stale.yml
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.github/workflows/stale.yml
rename to cookbooks/third-party/nfs/.github/workflows/stale.yml
diff --git a/cookbooks/third-party/nfs-5.1.5/.gitignore b/cookbooks/third-party/nfs/.gitignore
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.gitignore
rename to cookbooks/third-party/nfs/.gitignore
diff --git a/cookbooks/third-party/nfs-5.1.5/.markdownlint-cli2.yaml b/cookbooks/third-party/nfs/.markdownlint-cli2.yaml
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.markdownlint-cli2.yaml
rename to cookbooks/third-party/nfs/.markdownlint-cli2.yaml
diff --git a/cookbooks/third-party/nfs-5.1.5/.mdlrc b/cookbooks/third-party/nfs/.mdlrc
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.mdlrc
rename to cookbooks/third-party/nfs/.mdlrc
diff --git a/cookbooks/third-party/nfs-5.1.5/.overcommit.yml b/cookbooks/third-party/nfs/.overcommit.yml
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.overcommit.yml
rename to cookbooks/third-party/nfs/.overcommit.yml
diff --git a/cookbooks/third-party/nfs-5.1.5/.yamllint b/cookbooks/third-party/nfs/.yamllint
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.yamllint
rename to cookbooks/third-party/nfs/.yamllint
diff --git a/cookbooks/third-party/nfs-5.1.5/Berksfile b/cookbooks/third-party/nfs/Berksfile
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/Berksfile
rename to cookbooks/third-party/nfs/Berksfile
diff --git a/cookbooks/third-party/nfs-5.1.5/CHANGELOG.md b/cookbooks/third-party/nfs/CHANGELOG.md
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/CHANGELOG.md
rename to cookbooks/third-party/nfs/CHANGELOG.md
diff --git a/cookbooks/third-party/nfs-5.1.5/CODE_OF_CONDUCT.md b/cookbooks/third-party/nfs/CODE_OF_CONDUCT.md
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/CODE_OF_CONDUCT.md
rename to cookbooks/third-party/nfs/CODE_OF_CONDUCT.md
diff --git a/cookbooks/third-party/nfs-5.1.5/CONTRIBUTING.md b/cookbooks/third-party/nfs/CONTRIBUTING.md
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/CONTRIBUTING.md
rename to cookbooks/third-party/nfs/CONTRIBUTING.md
diff --git a/cookbooks/third-party/nfs-5.1.5/Dangerfile b/cookbooks/third-party/nfs/Dangerfile
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/Dangerfile
rename to cookbooks/third-party/nfs/Dangerfile
diff --git a/cookbooks/third-party/nfs-5.1.5/LICENSE b/cookbooks/third-party/nfs/LICENSE
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/LICENSE
rename to cookbooks/third-party/nfs/LICENSE
diff --git a/cookbooks/third-party/nfs-5.1.5/README.md b/cookbooks/third-party/nfs/README.md
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/README.md
rename to cookbooks/third-party/nfs/README.md
diff --git a/cookbooks/third-party/nfs-5.1.5/Rakefile b/cookbooks/third-party/nfs/Rakefile
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/Rakefile
rename to cookbooks/third-party/nfs/Rakefile
diff --git a/cookbooks/third-party/nfs-5.1.5/TESTING.md b/cookbooks/third-party/nfs/TESTING.md
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/TESTING.md
rename to cookbooks/third-party/nfs/TESTING.md
diff --git a/cookbooks/third-party/nfs-5.1.5/attributes/default.rb b/cookbooks/third-party/nfs/attributes/default.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/attributes/default.rb
rename to cookbooks/third-party/nfs/attributes/default.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/chefignore b/cookbooks/third-party/nfs/chefignore
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/chefignore
rename to cookbooks/third-party/nfs/chefignore
diff --git a/cookbooks/third-party/nfs-5.1.5/documentation/.gitkeep b/cookbooks/third-party/nfs/documentation/.gitkeep
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/documentation/.gitkeep
rename to cookbooks/third-party/nfs/documentation/.gitkeep
diff --git a/cookbooks/third-party/nfs-5.1.5/kitchen.dokken.yml b/cookbooks/third-party/nfs/kitchen.dokken.yml
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/kitchen.dokken.yml
rename to cookbooks/third-party/nfs/kitchen.dokken.yml
diff --git a/cookbooks/third-party/nfs-5.1.5/kitchen.yml b/cookbooks/third-party/nfs/kitchen.yml
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/kitchen.yml
rename to cookbooks/third-party/nfs/kitchen.yml
diff --git a/cookbooks/third-party/nfs-5.1.5/libraries/helpers.rb b/cookbooks/third-party/nfs/libraries/helpers.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/libraries/helpers.rb
rename to cookbooks/third-party/nfs/libraries/helpers.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/metadata.rb b/cookbooks/third-party/nfs/metadata.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/metadata.rb
rename to cookbooks/third-party/nfs/metadata.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/recipes/_common.rb b/cookbooks/third-party/nfs/recipes/_common.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/recipes/_common.rb
rename to cookbooks/third-party/nfs/recipes/_common.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/recipes/_idmap.rb b/cookbooks/third-party/nfs/recipes/_idmap.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/recipes/_idmap.rb
rename to cookbooks/third-party/nfs/recipes/_idmap.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/recipes/_sysctl.rb b/cookbooks/third-party/nfs/recipes/_sysctl.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/recipes/_sysctl.rb
rename to cookbooks/third-party/nfs/recipes/_sysctl.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/recipes/client4.rb b/cookbooks/third-party/nfs/recipes/client4.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/recipes/client4.rb
rename to cookbooks/third-party/nfs/recipes/client4.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/recipes/default.rb b/cookbooks/third-party/nfs/recipes/default.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/recipes/default.rb
rename to cookbooks/third-party/nfs/recipes/default.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/recipes/server.rb b/cookbooks/third-party/nfs/recipes/server.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/recipes/server.rb
rename to cookbooks/third-party/nfs/recipes/server.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/recipes/server4.rb b/cookbooks/third-party/nfs/recipes/server4.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/recipes/server4.rb
rename to cookbooks/third-party/nfs/recipes/server4.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/recipes/undo.rb b/cookbooks/third-party/nfs/recipes/undo.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/recipes/undo.rb
rename to cookbooks/third-party/nfs/recipes/undo.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/resources/export.rb b/cookbooks/third-party/nfs/resources/export.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/resources/export.rb
rename to cookbooks/third-party/nfs/resources/export.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/spec/spec_helper.rb b/cookbooks/third-party/nfs/spec/spec_helper.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/spec/spec_helper.rb
rename to cookbooks/third-party/nfs/spec/spec_helper.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/spec/unit/recipes/client4_spec.rb b/cookbooks/third-party/nfs/spec/unit/recipes/client4_spec.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/spec/unit/recipes/client4_spec.rb
rename to cookbooks/third-party/nfs/spec/unit/recipes/client4_spec.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/spec/unit/recipes/common_spec.rb b/cookbooks/third-party/nfs/spec/unit/recipes/common_spec.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/spec/unit/recipes/common_spec.rb
rename to cookbooks/third-party/nfs/spec/unit/recipes/common_spec.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/spec/unit/recipes/default_spec.rb b/cookbooks/third-party/nfs/spec/unit/recipes/default_spec.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/spec/unit/recipes/default_spec.rb
rename to cookbooks/third-party/nfs/spec/unit/recipes/default_spec.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/spec/unit/recipes/idmap_spec.rb b/cookbooks/third-party/nfs/spec/unit/recipes/idmap_spec.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/spec/unit/recipes/idmap_spec.rb
rename to cookbooks/third-party/nfs/spec/unit/recipes/idmap_spec.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/spec/unit/recipes/server4_spec.rb b/cookbooks/third-party/nfs/spec/unit/recipes/server4_spec.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/spec/unit/recipes/server4_spec.rb
rename to cookbooks/third-party/nfs/spec/unit/recipes/server4_spec.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/spec/unit/recipes/server_spec.rb b/cookbooks/third-party/nfs/spec/unit/recipes/server_spec.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/spec/unit/recipes/server_spec.rb
rename to cookbooks/third-party/nfs/spec/unit/recipes/server_spec.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/spec/unit/resources/export_spec.rb b/cookbooks/third-party/nfs/spec/unit/resources/export_spec.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/spec/unit/resources/export_spec.rb
rename to cookbooks/third-party/nfs/spec/unit/resources/export_spec.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/templates/default/exports.erb b/cookbooks/third-party/nfs/templates/default/exports.erb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/templates/default/exports.erb
rename to cookbooks/third-party/nfs/templates/default/exports.erb
diff --git a/cookbooks/third-party/nfs-5.1.5/templates/default/idmapd.conf.erb b/cookbooks/third-party/nfs/templates/default/idmapd.conf.erb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/templates/default/idmapd.conf.erb
rename to cookbooks/third-party/nfs/templates/default/idmapd.conf.erb
diff --git a/cookbooks/third-party/nfs-5.1.5/templates/default/mountd.erb b/cookbooks/third-party/nfs/templates/default/mountd.erb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/templates/default/mountd.erb
rename to cookbooks/third-party/nfs/templates/default/mountd.erb
diff --git a/cookbooks/third-party/nfs-5.1.5/templates/default/nfs-common.erb b/cookbooks/third-party/nfs/templates/default/nfs-common.erb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/templates/default/nfs-common.erb
rename to cookbooks/third-party/nfs/templates/default/nfs-common.erb
diff --git a/cookbooks/third-party/nfs-5.1.5/templates/default/nfs.conf.erb b/cookbooks/third-party/nfs/templates/default/nfs.conf.erb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/templates/default/nfs.conf.erb
rename to cookbooks/third-party/nfs/templates/default/nfs.conf.erb
diff --git a/cookbooks/third-party/nfs-5.1.5/templates/default/nfs.erb b/cookbooks/third-party/nfs/templates/default/nfs.erb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/templates/default/nfs.erb
rename to cookbooks/third-party/nfs/templates/default/nfs.erb
diff --git a/cookbooks/third-party/nfs-5.1.5/test/cookbooks/nfs_test/metadata.rb b/cookbooks/third-party/nfs/test/cookbooks/nfs_test/metadata.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/test/cookbooks/nfs_test/metadata.rb
rename to cookbooks/third-party/nfs/test/cookbooks/nfs_test/metadata.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/test/cookbooks/nfs_test/recipes/default.rb b/cookbooks/third-party/nfs/test/cookbooks/nfs_test/recipes/default.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/test/cookbooks/nfs_test/recipes/default.rb
rename to cookbooks/third-party/nfs/test/cookbooks/nfs_test/recipes/default.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/test/cookbooks/nfs_test/recipes/issue46.rb b/cookbooks/third-party/nfs/test/cookbooks/nfs_test/recipes/issue46.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/test/cookbooks/nfs_test/recipes/issue46.rb
rename to cookbooks/third-party/nfs/test/cookbooks/nfs_test/recipes/issue46.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/test/integration/default/controls/default_control.rb b/cookbooks/third-party/nfs/test/integration/default/controls/default_control.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/test/integration/default/controls/default_control.rb
rename to cookbooks/third-party/nfs/test/integration/default/controls/default_control.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/test/integration/default/inspec.yml b/cookbooks/third-party/nfs/test/integration/default/inspec.yml
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/test/integration/default/inspec.yml
rename to cookbooks/third-party/nfs/test/integration/default/inspec.yml
diff --git a/cookbooks/third-party/nfs-5.1.5/test/integration/server/controls/server_control.rb b/cookbooks/third-party/nfs/test/integration/server/controls/server_control.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/test/integration/server/controls/server_control.rb
rename to cookbooks/third-party/nfs/test/integration/server/controls/server_control.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/test/integration/server/inspec.yml b/cookbooks/third-party/nfs/test/integration/server/inspec.yml
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/test/integration/server/inspec.yml
rename to cookbooks/third-party/nfs/test/integration/server/inspec.yml
diff --git a/cookbooks/third-party/openssh-2.11.14/.editorconfig b/cookbooks/third-party/openssh/.editorconfig
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.editorconfig
rename to cookbooks/third-party/openssh/.editorconfig
diff --git a/cookbooks/third-party/openssh-2.11.14/.envrc b/cookbooks/third-party/openssh/.envrc
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.envrc
rename to cookbooks/third-party/openssh/.envrc
diff --git a/cookbooks/third-party/openssh-2.11.14/.gitattributes b/cookbooks/third-party/openssh/.gitattributes
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.gitattributes
rename to cookbooks/third-party/openssh/.gitattributes
diff --git a/cookbooks/third-party/openssh-2.11.14/.github/CODEOWNERS b/cookbooks/third-party/openssh/.github/CODEOWNERS
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.github/CODEOWNERS
rename to cookbooks/third-party/openssh/.github/CODEOWNERS
diff --git a/cookbooks/third-party/openssh-2.11.14/.github/workflows/ci.yml b/cookbooks/third-party/openssh/.github/workflows/ci.yml
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.github/workflows/ci.yml
rename to cookbooks/third-party/openssh/.github/workflows/ci.yml
diff --git a/cookbooks/third-party/openssh-2.11.14/.github/workflows/stale.yml b/cookbooks/third-party/openssh/.github/workflows/stale.yml
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.github/workflows/stale.yml
rename to cookbooks/third-party/openssh/.github/workflows/stale.yml
diff --git a/cookbooks/third-party/openssh-2.11.14/.gitignore b/cookbooks/third-party/openssh/.gitignore
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.gitignore
rename to cookbooks/third-party/openssh/.gitignore
diff --git a/cookbooks/third-party/openssh-2.11.14/.markdownlint-cli2.yaml b/cookbooks/third-party/openssh/.markdownlint-cli2.yaml
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.markdownlint-cli2.yaml
rename to cookbooks/third-party/openssh/.markdownlint-cli2.yaml
diff --git a/cookbooks/third-party/openssh-2.11.14/.mdlrc b/cookbooks/third-party/openssh/.mdlrc
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.mdlrc
rename to cookbooks/third-party/openssh/.mdlrc
diff --git a/cookbooks/third-party/openssh-2.11.14/.overcommit.yml b/cookbooks/third-party/openssh/.overcommit.yml
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.overcommit.yml
rename to cookbooks/third-party/openssh/.overcommit.yml
diff --git a/cookbooks/third-party/openssh-2.11.14/.yamllint b/cookbooks/third-party/openssh/.yamllint
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.yamllint
rename to cookbooks/third-party/openssh/.yamllint
diff --git a/cookbooks/third-party/openssh-2.11.14/Berksfile b/cookbooks/third-party/openssh/Berksfile
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/Berksfile
rename to cookbooks/third-party/openssh/Berksfile
diff --git a/cookbooks/third-party/openssh-2.11.14/CHANGELOG.md b/cookbooks/third-party/openssh/CHANGELOG.md
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/CHANGELOG.md
rename to cookbooks/third-party/openssh/CHANGELOG.md
diff --git a/cookbooks/third-party/openssh-2.11.14/CODE_OF_CONDUCT.md b/cookbooks/third-party/openssh/CODE_OF_CONDUCT.md
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/CODE_OF_CONDUCT.md
rename to cookbooks/third-party/openssh/CODE_OF_CONDUCT.md
diff --git a/cookbooks/third-party/openssh-2.11.14/CONTRIBUTING.md b/cookbooks/third-party/openssh/CONTRIBUTING.md
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/CONTRIBUTING.md
rename to cookbooks/third-party/openssh/CONTRIBUTING.md
diff --git a/cookbooks/third-party/openssh-2.11.14/Dangerfile b/cookbooks/third-party/openssh/Dangerfile
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/Dangerfile
rename to cookbooks/third-party/openssh/Dangerfile
diff --git a/cookbooks/third-party/openssh-2.11.14/README.md b/cookbooks/third-party/openssh/README.md
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/README.md
rename to cookbooks/third-party/openssh/README.md
diff --git a/cookbooks/third-party/openssh-2.11.14/TESTING.md b/cookbooks/third-party/openssh/TESTING.md
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/TESTING.md
rename to cookbooks/third-party/openssh/TESTING.md
diff --git a/cookbooks/third-party/openssh-2.11.14/attributes/default.rb b/cookbooks/third-party/openssh/attributes/default.rb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/attributes/default.rb
rename to cookbooks/third-party/openssh/attributes/default.rb
diff --git a/cookbooks/third-party/openssh-2.11.14/chefignore b/cookbooks/third-party/openssh/chefignore
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/chefignore
rename to cookbooks/third-party/openssh/chefignore
diff --git a/cookbooks/third-party/openssh-2.11.14/documentation/.gitkeep b/cookbooks/third-party/openssh/documentation/.gitkeep
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/documentation/.gitkeep
rename to cookbooks/third-party/openssh/documentation/.gitkeep
diff --git a/cookbooks/third-party/openssh-2.11.14/kitchen.dokken.yml b/cookbooks/third-party/openssh/kitchen.dokken.yml
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/kitchen.dokken.yml
rename to cookbooks/third-party/openssh/kitchen.dokken.yml
diff --git a/cookbooks/third-party/openssh-2.11.14/kitchen.exec.yml b/cookbooks/third-party/openssh/kitchen.exec.yml
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/kitchen.exec.yml
rename to cookbooks/third-party/openssh/kitchen.exec.yml
diff --git a/cookbooks/third-party/openssh-2.11.14/kitchen.global.yml b/cookbooks/third-party/openssh/kitchen.global.yml
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/kitchen.global.yml
rename to cookbooks/third-party/openssh/kitchen.global.yml
diff --git a/cookbooks/third-party/openssh-2.11.14/kitchen.yml b/cookbooks/third-party/openssh/kitchen.yml
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/kitchen.yml
rename to cookbooks/third-party/openssh/kitchen.yml
diff --git a/cookbooks/third-party/openssh-2.11.14/libraries/helpers.rb b/cookbooks/third-party/openssh/libraries/helpers.rb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/libraries/helpers.rb
rename to cookbooks/third-party/openssh/libraries/helpers.rb
diff --git a/cookbooks/third-party/openssh-2.11.14/metadata.rb b/cookbooks/third-party/openssh/metadata.rb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/metadata.rb
rename to cookbooks/third-party/openssh/metadata.rb
diff --git a/cookbooks/third-party/openssh-2.11.14/mlc_config.json b/cookbooks/third-party/openssh/mlc_config.json
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/mlc_config.json
rename to cookbooks/third-party/openssh/mlc_config.json
diff --git a/cookbooks/third-party/openssh-2.11.14/recipes/default.rb b/cookbooks/third-party/openssh/recipes/default.rb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/recipes/default.rb
rename to cookbooks/third-party/openssh/recipes/default.rb
diff --git a/cookbooks/third-party/openssh-2.11.14/recipes/iptables.rb b/cookbooks/third-party/openssh/recipes/iptables.rb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/recipes/iptables.rb
rename to cookbooks/third-party/openssh/recipes/iptables.rb
diff --git a/cookbooks/third-party/openssh-2.11.14/renovate.json b/cookbooks/third-party/openssh/renovate.json
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/renovate.json
rename to cookbooks/third-party/openssh/renovate.json
diff --git a/cookbooks/third-party/openssh-2.11.14/spec/spec_helper.rb b/cookbooks/third-party/openssh/spec/spec_helper.rb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/spec/spec_helper.rb
rename to cookbooks/third-party/openssh/spec/spec_helper.rb
diff --git a/cookbooks/third-party/openssh-2.11.14/spec/unit/recipes/default_spec.rb b/cookbooks/third-party/openssh/spec/unit/recipes/default_spec.rb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/spec/unit/recipes/default_spec.rb
rename to cookbooks/third-party/openssh/spec/unit/recipes/default_spec.rb
diff --git a/cookbooks/third-party/openssh-2.11.14/spec/unit/recipes/default_windows_spec.rb b/cookbooks/third-party/openssh/spec/unit/recipes/default_windows_spec.rb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/spec/unit/recipes/default_windows_spec.rb
rename to cookbooks/third-party/openssh/spec/unit/recipes/default_windows_spec.rb
diff --git a/cookbooks/third-party/openssh-2.11.14/spec/unit/recipes/iptables_spec.rb b/cookbooks/third-party/openssh/spec/unit/recipes/iptables_spec.rb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/spec/unit/recipes/iptables_spec.rb
rename to cookbooks/third-party/openssh/spec/unit/recipes/iptables_spec.rb
diff --git a/cookbooks/third-party/openssh-2.11.14/templates/ca_keys.erb b/cookbooks/third-party/openssh/templates/ca_keys.erb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/templates/ca_keys.erb
rename to cookbooks/third-party/openssh/templates/ca_keys.erb
diff --git a/cookbooks/third-party/openssh-2.11.14/templates/port_ssh.erb b/cookbooks/third-party/openssh/templates/port_ssh.erb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/templates/port_ssh.erb
rename to cookbooks/third-party/openssh/templates/port_ssh.erb
diff --git a/cookbooks/third-party/openssh-2.11.14/templates/revoked_keys.erb b/cookbooks/third-party/openssh/templates/revoked_keys.erb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/templates/revoked_keys.erb
rename to cookbooks/third-party/openssh/templates/revoked_keys.erb
diff --git a/cookbooks/third-party/openssh-2.11.14/templates/ssh_config.erb b/cookbooks/third-party/openssh/templates/ssh_config.erb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/templates/ssh_config.erb
rename to cookbooks/third-party/openssh/templates/ssh_config.erb
diff --git a/cookbooks/third-party/openssh-2.11.14/templates/sshd_config.erb b/cookbooks/third-party/openssh/templates/sshd_config.erb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/templates/sshd_config.erb
rename to cookbooks/third-party/openssh/templates/sshd_config.erb
diff --git a/cookbooks/third-party/openssh-2.11.14/test/integration/default/default_spec.rb b/cookbooks/third-party/openssh/test/integration/default/default_spec.rb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/test/integration/default/default_spec.rb
rename to cookbooks/third-party/openssh/test/integration/default/default_spec.rb
diff --git a/cookbooks/third-party/openssh-2.11.14/test/integration/iptables/default_spec.rb b/cookbooks/third-party/openssh/test/integration/iptables/default_spec.rb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/test/integration/iptables/default_spec.rb
rename to cookbooks/third-party/openssh/test/integration/iptables/default_spec.rb
diff --git a/cookbooks/third-party/openssh-2.11.14/test/integration/windows-default/default_spec.rb b/cookbooks/third-party/openssh/test/integration/windows-default/default_spec.rb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/test/integration/windows-default/default_spec.rb
rename to cookbooks/third-party/openssh/test/integration/windows-default/default_spec.rb
diff --git a/cookbooks/third-party/yum-7.4.20/.editorconfig b/cookbooks/third-party/yum-epel/.editorconfig
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.editorconfig
rename to cookbooks/third-party/yum-epel/.editorconfig
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.envrc b/cookbooks/third-party/yum-epel/.envrc
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/.envrc
rename to cookbooks/third-party/yum-epel/.envrc
diff --git a/cookbooks/third-party/yum-7.4.20/.gitattributes b/cookbooks/third-party/yum-epel/.gitattributes
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.gitattributes
rename to cookbooks/third-party/yum-epel/.gitattributes
diff --git a/cookbooks/third-party/yum-7.4.20/.github/CODEOWNERS b/cookbooks/third-party/yum-epel/.github/CODEOWNERS
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.github/CODEOWNERS
rename to cookbooks/third-party/yum-epel/.github/CODEOWNERS
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.github/workflows/ci.yml b/cookbooks/third-party/yum-epel/.github/workflows/ci.yml
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/.github/workflows/ci.yml
rename to cookbooks/third-party/yum-epel/.github/workflows/ci.yml
diff --git a/cookbooks/third-party/yum-7.4.20/.github/workflows/stale.yml b/cookbooks/third-party/yum-epel/.github/workflows/stale.yml
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.github/workflows/stale.yml
rename to cookbooks/third-party/yum-epel/.github/workflows/stale.yml
diff --git a/cookbooks/third-party/yum-7.4.20/.gitignore b/cookbooks/third-party/yum-epel/.gitignore
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.gitignore
rename to cookbooks/third-party/yum-epel/.gitignore
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.markdownlint-cli2.yaml b/cookbooks/third-party/yum-epel/.markdownlint-cli2.yaml
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/.markdownlint-cli2.yaml
rename to cookbooks/third-party/yum-epel/.markdownlint-cli2.yaml
diff --git a/cookbooks/third-party/yum-7.4.20/.mdlrc b/cookbooks/third-party/yum-epel/.mdlrc
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.mdlrc
rename to cookbooks/third-party/yum-epel/.mdlrc
diff --git a/cookbooks/third-party/yum-7.4.20/.overcommit.yml b/cookbooks/third-party/yum-epel/.overcommit.yml
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.overcommit.yml
rename to cookbooks/third-party/yum-epel/.overcommit.yml
diff --git a/cookbooks/third-party/yum-7.4.20/.yamllint b/cookbooks/third-party/yum-epel/.yamllint
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.yamllint
rename to cookbooks/third-party/yum-epel/.yamllint
diff --git a/cookbooks/third-party/yum-epel-5.0.8/Berksfile b/cookbooks/third-party/yum-epel/Berksfile
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/Berksfile
rename to cookbooks/third-party/yum-epel/Berksfile
diff --git a/cookbooks/third-party/yum-epel-5.0.8/CHANGELOG.md b/cookbooks/third-party/yum-epel/CHANGELOG.md
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/CHANGELOG.md
rename to cookbooks/third-party/yum-epel/CHANGELOG.md
diff --git a/cookbooks/third-party/yum-epel-5.0.8/README.md b/cookbooks/third-party/yum-epel/README.md
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/README.md
rename to cookbooks/third-party/yum-epel/README.md
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/default.rb b/cookbooks/third-party/yum-epel/attributes/default.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/attributes/default.rb
rename to cookbooks/third-party/yum-epel/attributes/default.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/epel-debuginfo.rb b/cookbooks/third-party/yum-epel/attributes/epel-debuginfo.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/attributes/epel-debuginfo.rb
rename to cookbooks/third-party/yum-epel/attributes/epel-debuginfo.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/epel-next-debuginfo.rb b/cookbooks/third-party/yum-epel/attributes/epel-next-debuginfo.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/attributes/epel-next-debuginfo.rb
rename to cookbooks/third-party/yum-epel/attributes/epel-next-debuginfo.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/epel-next-source.rb b/cookbooks/third-party/yum-epel/attributes/epel-next-source.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/attributes/epel-next-source.rb
rename to cookbooks/third-party/yum-epel/attributes/epel-next-source.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/epel-next-testing-debuginfo.rb b/cookbooks/third-party/yum-epel/attributes/epel-next-testing-debuginfo.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/attributes/epel-next-testing-debuginfo.rb
rename to cookbooks/third-party/yum-epel/attributes/epel-next-testing-debuginfo.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/epel-next-testing-source.rb b/cookbooks/third-party/yum-epel/attributes/epel-next-testing-source.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/attributes/epel-next-testing-source.rb
rename to cookbooks/third-party/yum-epel/attributes/epel-next-testing-source.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/epel-next-testing.rb b/cookbooks/third-party/yum-epel/attributes/epel-next-testing.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/attributes/epel-next-testing.rb
rename to cookbooks/third-party/yum-epel/attributes/epel-next-testing.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/epel-next.rb b/cookbooks/third-party/yum-epel/attributes/epel-next.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/attributes/epel-next.rb
rename to cookbooks/third-party/yum-epel/attributes/epel-next.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/epel-source.rb b/cookbooks/third-party/yum-epel/attributes/epel-source.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/attributes/epel-source.rb
rename to cookbooks/third-party/yum-epel/attributes/epel-source.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/epel-testing-debuginfo.rb b/cookbooks/third-party/yum-epel/attributes/epel-testing-debuginfo.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/attributes/epel-testing-debuginfo.rb
rename to cookbooks/third-party/yum-epel/attributes/epel-testing-debuginfo.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/epel-testing-source.rb b/cookbooks/third-party/yum-epel/attributes/epel-testing-source.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/attributes/epel-testing-source.rb
rename to cookbooks/third-party/yum-epel/attributes/epel-testing-source.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/epel-testing.rb b/cookbooks/third-party/yum-epel/attributes/epel-testing.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/attributes/epel-testing.rb
rename to cookbooks/third-party/yum-epel/attributes/epel-testing.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/epel.rb b/cookbooks/third-party/yum-epel/attributes/epel.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/attributes/epel.rb
rename to cookbooks/third-party/yum-epel/attributes/epel.rb
diff --git a/cookbooks/third-party/yum-7.4.20/documentation/.gitkeep b/cookbooks/third-party/yum-epel/documentation/.gitkeep
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/documentation/.gitkeep
rename to cookbooks/third-party/yum-epel/documentation/.gitkeep
diff --git a/cookbooks/third-party/yum-epel-5.0.8/kitchen.yml b/cookbooks/third-party/yum-epel/kitchen.yml
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/kitchen.yml
rename to cookbooks/third-party/yum-epel/kitchen.yml
diff --git a/cookbooks/third-party/yum-epel-5.0.8/libraries/helpers.rb b/cookbooks/third-party/yum-epel/libraries/helpers.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/libraries/helpers.rb
rename to cookbooks/third-party/yum-epel/libraries/helpers.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/metadata.rb b/cookbooks/third-party/yum-epel/metadata.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/metadata.rb
rename to cookbooks/third-party/yum-epel/metadata.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/recipes/default.rb b/cookbooks/third-party/yum-epel/recipes/default.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/recipes/default.rb
rename to cookbooks/third-party/yum-epel/recipes/default.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/spec/default_spec.rb b/cookbooks/third-party/yum-epel/spec/default_spec.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/spec/default_spec.rb
rename to cookbooks/third-party/yum-epel/spec/default_spec.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/spec/spec_helper.rb b/cookbooks/third-party/yum-epel/spec/spec_helper.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/spec/spec_helper.rb
rename to cookbooks/third-party/yum-epel/spec/spec_helper.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/test/integration/all/all_spec.rb b/cookbooks/third-party/yum-epel/test/integration/all/all_spec.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/test/integration/all/all_spec.rb
rename to cookbooks/third-party/yum-epel/test/integration/all/all_spec.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/test/integration/default/default_spec.rb b/cookbooks/third-party/yum-epel/test/integration/default/default_spec.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/test/integration/default/default_spec.rb
rename to cookbooks/third-party/yum-epel/test/integration/default/default_spec.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.editorconfig b/cookbooks/third-party/yum/.editorconfig
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/.editorconfig
rename to cookbooks/third-party/yum/.editorconfig
diff --git a/cookbooks/third-party/yum-7.4.20/.envrc b/cookbooks/third-party/yum/.envrc
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.envrc
rename to cookbooks/third-party/yum/.envrc
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.gitattributes b/cookbooks/third-party/yum/.gitattributes
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/.gitattributes
rename to cookbooks/third-party/yum/.gitattributes
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.github/CODEOWNERS b/cookbooks/third-party/yum/.github/CODEOWNERS
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/.github/CODEOWNERS
rename to cookbooks/third-party/yum/.github/CODEOWNERS
diff --git a/cookbooks/third-party/yum-7.4.20/.github/workflows/ci.yml b/cookbooks/third-party/yum/.github/workflows/ci.yml
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.github/workflows/ci.yml
rename to cookbooks/third-party/yum/.github/workflows/ci.yml
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.github/workflows/stale.yml b/cookbooks/third-party/yum/.github/workflows/stale.yml
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/.github/workflows/stale.yml
rename to cookbooks/third-party/yum/.github/workflows/stale.yml
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.gitignore b/cookbooks/third-party/yum/.gitignore
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/.gitignore
rename to cookbooks/third-party/yum/.gitignore
diff --git a/cookbooks/third-party/yum-7.4.20/.markdownlint-cli2.yaml b/cookbooks/third-party/yum/.markdownlint-cli2.yaml
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.markdownlint-cli2.yaml
rename to cookbooks/third-party/yum/.markdownlint-cli2.yaml
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.mdlrc b/cookbooks/third-party/yum/.mdlrc
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/.mdlrc
rename to cookbooks/third-party/yum/.mdlrc
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.overcommit.yml b/cookbooks/third-party/yum/.overcommit.yml
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/.overcommit.yml
rename to cookbooks/third-party/yum/.overcommit.yml
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.yamllint b/cookbooks/third-party/yum/.yamllint
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/.yamllint
rename to cookbooks/third-party/yum/.yamllint
diff --git a/cookbooks/third-party/yum-7.4.20/Berksfile b/cookbooks/third-party/yum/Berksfile
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/Berksfile
rename to cookbooks/third-party/yum/Berksfile
diff --git a/cookbooks/third-party/yum-7.4.20/CHANGELOG.md b/cookbooks/third-party/yum/CHANGELOG.md
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/CHANGELOG.md
rename to cookbooks/third-party/yum/CHANGELOG.md
diff --git a/cookbooks/third-party/yum-7.4.20/CODE_OF_CONDUCT.md b/cookbooks/third-party/yum/CODE_OF_CONDUCT.md
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/CODE_OF_CONDUCT.md
rename to cookbooks/third-party/yum/CODE_OF_CONDUCT.md
diff --git a/cookbooks/third-party/yum-7.4.20/CONTRIBUTING.md b/cookbooks/third-party/yum/CONTRIBUTING.md
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/CONTRIBUTING.md
rename to cookbooks/third-party/yum/CONTRIBUTING.md
diff --git a/cookbooks/third-party/yum-7.4.20/Dangerfile b/cookbooks/third-party/yum/Dangerfile
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/Dangerfile
rename to cookbooks/third-party/yum/Dangerfile
diff --git a/cookbooks/third-party/yum-7.4.20/LICENSE b/cookbooks/third-party/yum/LICENSE
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/LICENSE
rename to cookbooks/third-party/yum/LICENSE
diff --git a/cookbooks/third-party/yum-7.4.20/README.md b/cookbooks/third-party/yum/README.md
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/README.md
rename to cookbooks/third-party/yum/README.md
diff --git a/cookbooks/third-party/yum-7.4.20/TESTING.md b/cookbooks/third-party/yum/TESTING.md
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/TESTING.md
rename to cookbooks/third-party/yum/TESTING.md
diff --git a/cookbooks/third-party/yum-7.4.20/attributes/main.rb b/cookbooks/third-party/yum/attributes/main.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/attributes/main.rb
rename to cookbooks/third-party/yum/attributes/main.rb
diff --git a/cookbooks/third-party/yum-7.4.20/chefignore b/cookbooks/third-party/yum/chefignore
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/chefignore
rename to cookbooks/third-party/yum/chefignore
diff --git a/cookbooks/third-party/yum-epel-5.0.8/documentation/.gitkeep b/cookbooks/third-party/yum/documentation/.gitkeep
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/documentation/.gitkeep
rename to cookbooks/third-party/yum/documentation/.gitkeep
diff --git a/cookbooks/third-party/yum-7.4.20/documentation/dnf_module.md b/cookbooks/third-party/yum/documentation/dnf_module.md
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/documentation/dnf_module.md
rename to cookbooks/third-party/yum/documentation/dnf_module.md
diff --git a/cookbooks/third-party/yum-7.4.20/documentation/yum_globalconfig.md b/cookbooks/third-party/yum/documentation/yum_globalconfig.md
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/documentation/yum_globalconfig.md
rename to cookbooks/third-party/yum/documentation/yum_globalconfig.md
diff --git a/cookbooks/third-party/yum-7.4.20/kitchen.dokken.yml b/cookbooks/third-party/yum/kitchen.dokken.yml
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/kitchen.dokken.yml
rename to cookbooks/third-party/yum/kitchen.dokken.yml
diff --git a/cookbooks/third-party/yum-7.4.20/kitchen.exec.yml b/cookbooks/third-party/yum/kitchen.exec.yml
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/kitchen.exec.yml
rename to cookbooks/third-party/yum/kitchen.exec.yml
diff --git a/cookbooks/third-party/yum-7.4.20/kitchen.global.yml b/cookbooks/third-party/yum/kitchen.global.yml
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/kitchen.global.yml
rename to cookbooks/third-party/yum/kitchen.global.yml
diff --git a/cookbooks/third-party/yum-7.4.20/kitchen.yml b/cookbooks/third-party/yum/kitchen.yml
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/kitchen.yml
rename to cookbooks/third-party/yum/kitchen.yml
diff --git a/cookbooks/third-party/yum-7.4.20/metadata.rb b/cookbooks/third-party/yum/metadata.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/metadata.rb
rename to cookbooks/third-party/yum/metadata.rb
diff --git a/cookbooks/third-party/yum-7.4.20/recipes/default.rb b/cookbooks/third-party/yum/recipes/default.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/recipes/default.rb
rename to cookbooks/third-party/yum/recipes/default.rb
diff --git a/cookbooks/third-party/yum-7.4.20/renovate.json b/cookbooks/third-party/yum/renovate.json
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/renovate.json
rename to cookbooks/third-party/yum/renovate.json
diff --git a/cookbooks/third-party/yum-7.4.20/resources/dnf_module.rb b/cookbooks/third-party/yum/resources/dnf_module.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/resources/dnf_module.rb
rename to cookbooks/third-party/yum/resources/dnf_module.rb
diff --git a/cookbooks/third-party/yum-7.4.20/resources/globalconfig.rb b/cookbooks/third-party/yum/resources/globalconfig.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/resources/globalconfig.rb
rename to cookbooks/third-party/yum/resources/globalconfig.rb
diff --git a/cookbooks/third-party/yum-7.4.20/spec/spec_helper.rb b/cookbooks/third-party/yum/spec/spec_helper.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/spec/spec_helper.rb
rename to cookbooks/third-party/yum/spec/spec_helper.rb
diff --git a/cookbooks/third-party/yum-7.4.20/spec/unit/recipes/default_spec.rb b/cookbooks/third-party/yum/spec/unit/recipes/default_spec.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/spec/unit/recipes/default_spec.rb
rename to cookbooks/third-party/yum/spec/unit/recipes/default_spec.rb
diff --git a/cookbooks/third-party/yum-7.4.20/spec/unit/resources/dnf_module_spec.rb b/cookbooks/third-party/yum/spec/unit/resources/dnf_module_spec.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/spec/unit/resources/dnf_module_spec.rb
rename to cookbooks/third-party/yum/spec/unit/resources/dnf_module_spec.rb
diff --git a/cookbooks/third-party/yum-7.4.20/spec/unit/resources/test_globalconfig_one_spec.rb b/cookbooks/third-party/yum/spec/unit/resources/test_globalconfig_one_spec.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/spec/unit/resources/test_globalconfig_one_spec.rb
rename to cookbooks/third-party/yum/spec/unit/resources/test_globalconfig_one_spec.rb
diff --git a/cookbooks/third-party/yum-7.4.20/spec/unit/resources/test_globalconfig_two_spec.rb b/cookbooks/third-party/yum/spec/unit/resources/test_globalconfig_two_spec.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/spec/unit/resources/test_globalconfig_two_spec.rb
rename to cookbooks/third-party/yum/spec/unit/resources/test_globalconfig_two_spec.rb
diff --git a/cookbooks/third-party/yum-7.4.20/templates/main.erb b/cookbooks/third-party/yum/templates/main.erb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/templates/main.erb
rename to cookbooks/third-party/yum/templates/main.erb
diff --git a/cookbooks/third-party/yum-7.4.20/test/cookbooks/test/metadata.rb b/cookbooks/third-party/yum/test/cookbooks/test/metadata.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/test/cookbooks/test/metadata.rb
rename to cookbooks/third-party/yum/test/cookbooks/test/metadata.rb
diff --git a/cookbooks/third-party/yum-7.4.20/test/cookbooks/test/recipes/dnf_module.rb b/cookbooks/third-party/yum/test/cookbooks/test/recipes/dnf_module.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/test/cookbooks/test/recipes/dnf_module.rb
rename to cookbooks/third-party/yum/test/cookbooks/test/recipes/dnf_module.rb
diff --git a/cookbooks/third-party/yum-7.4.20/test/cookbooks/test/recipes/test_globalconfig_one.rb b/cookbooks/third-party/yum/test/cookbooks/test/recipes/test_globalconfig_one.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/test/cookbooks/test/recipes/test_globalconfig_one.rb
rename to cookbooks/third-party/yum/test/cookbooks/test/recipes/test_globalconfig_one.rb
diff --git a/cookbooks/third-party/yum-7.4.20/test/cookbooks/test/recipes/test_globalconfig_two.rb b/cookbooks/third-party/yum/test/cookbooks/test/recipes/test_globalconfig_two.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/test/cookbooks/test/recipes/test_globalconfig_two.rb
rename to cookbooks/third-party/yum/test/cookbooks/test/recipes/test_globalconfig_two.rb
diff --git a/cookbooks/third-party/yum-7.4.20/test/integration/default/inspec/default_spec.rb b/cookbooks/third-party/yum/test/integration/default/inspec/default_spec.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/test/integration/default/inspec/default_spec.rb
rename to cookbooks/third-party/yum/test/integration/default/inspec/default_spec.rb
diff --git a/cookbooks/third-party/yum-7.4.20/test/integration/dnf_module/inspec/module_spec.rb b/cookbooks/third-party/yum/test/integration/dnf_module/inspec/module_spec.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/test/integration/dnf_module/inspec/module_spec.rb
rename to cookbooks/third-party/yum/test/integration/dnf_module/inspec/module_spec.rb
diff --git a/kitchen.global.yml b/kitchen.global.yml
index c12c8e6f3f..20e499186c 100644
--- a/kitchen.global.yml
+++ b/kitchen.global.yml
@@ -7,6 +7,8 @@ verifier:
 provisioner:
   data_path: test/data
   environments_path: test/environments
+  policy_name: aws-parallelcluster
+  policy_group: kitchen
   client_rb:
     environment: kitchen
   attributes:
diff --git a/util/cinc-install.sh b/util/cinc-install.sh
index bd413b5818..43fd8d22c5 100644
--- a/util/cinc-install.sh
+++ b/util/cinc-install.sh
@@ -11,7 +11,7 @@
 # - improvement in the dpkg installation to avoid conflicts with other running installations.
 #
 # When updating this modified file, please remember to bump the version and reference it in the CI/CD.
-# - cinc-install.sh v1.3.0
+# - cinc-install.sh v1.4.0
 #
 # WARNING: REQUIRES /bin/bash
 #
@@ -75,6 +75,7 @@ checksum_mismatch() {
 unable_to_retrieve_package() {
   echo "Unable to retrieve a valid package!"
   report_bug
+  echo "Metadata URL: $metadata_url"
   if test "x$download_url" != "x"; then
     echo "Download URL: $download_url"
   fi
@@ -106,6 +107,7 @@ http_404_error() {
   echo "that $platform is not supported."
   echo ""
   # deliberately do not call report_bug to suppress bug report noise.
+  echo "Metadata URL: $metadata_url"
   if test "x$download_url" != "x"; then
     echo "Download URL: $download_url"
   fi
@@ -130,7 +132,7 @@ do_wget() {
   wget --user-agent="User-Agent: mixlib-install/3.12.30" -O "$2" "$1" 2>$tmp_dir/stderr
   rc=$?
   # check for 404
-  grep "ERROR 404" $tmp_dir/stderr >/dev/null 2>&1
+  grep "ERROR 404" $tmp_dir/stderr 2>&1 >/dev/null
   if test $? -eq 0; then
     echo "ERROR 404"
     http_404_error
@@ -151,7 +153,7 @@ do_curl() {
   curl -A "User-Agent: mixlib-install/3.12.30" --retry 5 -sL -D $tmp_dir/stderr "$1" > "$2"
   rc=$?
   # check for 404
-  grep "404 Not Found" $tmp_dir/stderr >/dev/null 2>&1
+  grep "404 Not Found" $tmp_dir/stderr 2>&1 >/dev/null
   if test $? -eq 0; then
     echo "ERROR 404"
     http_404_error
@@ -181,7 +183,7 @@ do_perl() {
   perl -e 'use LWP::Simple; getprint($ARGV[0]);' "$1" > "$2" 2>$tmp_dir/stderr
   rc=$?
   # check for 404
-  grep "404 Not Found" $tmp_dir/stderr >/dev/null 2>&1
+  grep "404 Not Found" $tmp_dir/stderr 2>&1 >/dev/null
   if test $? -eq 0; then
     echo "ERROR 404"
     http_404_error
@@ -202,7 +204,7 @@ do_python() {
   python -c "import sys,urllib2; sys.stdout.write(urllib2.urlopen(urllib2.Request(sys.argv[1], headers={ 'User-Agent': 'mixlib-install/3.12.30' })).read())" "$1" > "$2" 2>$tmp_dir/stderr
   rc=$?
   # check for 404
-  grep "HTTP Error 404" $tmp_dir/stderr >/dev/null 2>&1
+  grep "HTTP Error 404" $tmp_dir/stderr 2>&1 >/dev/null
   if test $? -eq 0; then
     echo "ERROR 404"
     http_404_error
@@ -379,6 +381,7 @@ tmp_dir="$tmp/install.sh.$$"
 #
 # Outputs:
 # $version: Requested version to be installed.
+# $channel: Channel to install the product from
 # $project: Project to be installed
 # $cmdline_filename: Name of the package downloaded on local disk.
 # $cmdline_dl_dir: Name of the directory downloaded package will be saved to on local disk.
@@ -388,14 +391,17 @@ tmp_dir="$tmp/install.sh.$$"
 ############
 
 # Defaults
+channel="stable"
 project="cinc"
 
-while getopts v:b:f:P:d:s:l:a opt
+while getopts pnv:c:f:P:d:s:l:a opt
 do
   case "$opt" in
 
     v)  version="$OPTARG";;
-    b)  bucket="$OPTARG";; # WARNING: custom option, to override default bucket for downloading CINC client
+    c)  channel="$OPTARG";;
+    p)  channel="current";; # compat for prerelease option
+    n)  channel="current";; # compat for nightlies option
     f)  cmdline_filename="$OPTARG";;
     P)  project="$OPTARG";;
     d)  cmdline_dl_dir="$OPTARG";;
@@ -404,12 +410,12 @@ do
     a)  checksum="$OPTARG";;
     \?)   # unknown flag
       echo >&2 \
-      "usage: $0 [-P project] [-v version] [-f filename | -d download_dir] [-s install_strategy] [-l download_url_override] [-a checksum] [-b bucket]"
+      "usage: $0 [-P project] [-c release_channel] [-v version] [-f filename | -d download_dir] [-s install_strategy] [-l download_url_override] [-a checksum]"
       exit 1;;
   esac
 done
 
-shift "$(expr $OPTIND - 1)"
+shift `expr $OPTIND - 1`
 
 
 if test -d "/opt/$project" && test "x$install_strategy" = "xonce"; then
@@ -469,7 +475,13 @@ elif test -f "/etc/redhat-release"; then
   platform=`sed 's/^\(.\+\) release.*/\1/' /etc/redhat-release | tr '[A-Z]' '[a-z]'`
   platform_version=`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release`
 
-  if test "$platform" = "xenserver"; then
+  if test "$platform" = "rocky linux"; then
+  	source /etc/os-release
+ 	os="${REDHAT_SUPPORT_PRODUCT}"
+  	platform_version="${ROCKY_SUPPORT_PRODUCT_VERSION}"
+        platform=$ID
+
+  elif test "$platform" = "xenserver"; then
     # Current XenServer 6.2 is based on CentOS 5, platform is not reset to "el" server should handle response
     platform="xenserver"
   else
@@ -502,6 +514,7 @@ elif test -f "/etc/system-release"; then
     esac
   esac
 
+
 # Apple macOS
 elif test -f "/usr/bin/sw_vers"; then
   platform="mac_os_x"
@@ -610,22 +623,6 @@ case $machine in
     ;;
 esac
 
-# WARNING: Custom case to manage download of ubuntu packages from S3.
-# This is not required when downloading from omnitruck because the url to use is in the metadata file.
-if test "$platform" = "ubuntu"; then
-  case $machine in
-    "arm64"|"aarch64")
-      machine="arm64"
-      ;;
-    "x86_64"|"amd64"|"x64")
-      machine="amd64"
-      ;;
-    "i386"|"i86pc"|"x86"|"i686")
-      machine="i386"
-      ;;
-  esac
-fi
-
 if test "x$platform_version" = "x"; then
   echo "Unable to determine platform version!"
   report_bug
@@ -638,24 +635,7 @@ if test "x$platform" = "xsolaris2"; then
   export PATH
 fi
 
-# WARNING: Custom code to detect AWS Region
-# shellcheck disable=SC2034 # instance_metadata_file is used below
-instance_metadata_file=$tmp_dir/instance_metadata
-get_region instance_metadata_file
-
-# WARNING: Custom code to detect AWS S3 Domain
-if [[ ${region} == cn-* ]]; then
-  download_domain="amazonaws.com.cn"
-elif [[ ${region} == us-iso-* ]]; then
-  download_domain="c2s.ic.gov"
-elif [[ ${region} == us-isob-* ]]; then
-  download_domain="sc2s.sgov.gov"
-else
-  download_domain="amazonaws.com"
-fi
-
-# WARNING: echo modified to return the region in the output
-echo "${platform} ${platform_version} ${machine} ${region}"
+echo "$platform $platform_version $machine"
 
 ############
 # end of platform_detection.sh
@@ -700,14 +680,13 @@ if test "x$no_proxy" != "x"; then
 fi
 
 
-# create_download_url.sh
+# fetch_metadata.sh
 ############
-# WARNING: This is a modified version of the original fetch_metadata.sh section,
-# the changes will permit to download cinc installer from S3 rather than from omintruck website.
-#
-# This section creates the url of the package to download.
+# This section calls omnitruck to get the information about the build to be
+#   installed.
 #
 # Inputs:
+# $channel:
 # $project:
 # $version:
 # $platform:
@@ -720,35 +699,30 @@ fi
 # $sha256:
 ############
 
-if test "x$bucket" = "x"; then
-  # Use official bucket if not specified
-  bucket="${region}-aws-parallelcluster"
-fi
+if test "x$download_url_override" = "x"; then
+  echo "Getting information for $project $channel $version for $platform..."
 
-bucket_url="https://${bucket}.s3.${region}.${download_domain}/archives/${project}/${platform}/${platform_version}/"
+  metadata_filename="$tmp_dir/metadata.txt"
+  metadata_url="https://omnitruck.cinc.sh/$channel/$project/metadata?v=$version&p=$platform&pv=$platform_version&m=$machine"
 
-if test "x$build" = "x"; then
-  # Build version set to 1 by default if not specified
-  build=1
-fi
+  do_download "$metadata_url"  "$metadata_filename"
 
-if test "x$download_url_override" = "x"; then
-  case "$platform" in
-  "debian"|"ubuntu")
-    package_file="${project}_${version}-${build}_${machine}.deb"
-    ;;
-  *)
-    package_file="${project}-${version}-${build}.${platform}${platform_version}.${machine}.rpm"
-    ;;
-  esac
+  cat "$metadata_filename"
 
-  download_url=${bucket_url}${package_file}
-  checksum_url="${download_url}.sha256"
+  echo ""
+  # check that all the mandatory fields in the downloaded metadata are there
+  if grep '^url' $metadata_filename > /dev/null && grep '^sha256' $metadata_filename > /dev/null; then
+    echo "downloaded metadata file looks valid..."
+  else
+    echo "downloaded metadata file is corrupted or an uncaught error was encountered in downloading the file..."
+    # this generally means one of the download methods downloaded a 404 or something like that and then reported a successful exit code,
+    # and this should be fixed in the function that was doing the download.
+    report_bug
+    exit 1
+  fi
 
-  # Extracting sha256 checksum
-  checksum_file=${tmp_dir}/${package_file}.sha256
-  do_download "${checksum_url}" ${checksum_file}
-  sha256=$(awk '{print $1}' ${checksum_file})
+  download_url=`awk '$1 == "url" { print $2 }' "$metadata_filename"`
+  sha256=`awk '$1 == "sha256" { print $2 }' "$metadata_filename"`
 else
   download_url=$download_url_override
   # Set sha256 to empty string if checksum not set
@@ -756,7 +730,7 @@ else
 fi
 
 ############
-# end of create_download_url.sh
+# end of fetch_metadata.sh
 ############
 
 
@@ -776,8 +750,7 @@ fi
 # $filetype: Type of the file downloaded.
 ############
 
-# WARNING: modified sed to be able to retrieve file name from S3 download url
-filename=`echo $download_url | sed -e 's/^.*\///'`
+filename=`echo $download_url | sed -e 's/?.*//' | sed -e 's/^.*\///'`
 filetype=`echo $filename | sed -e 's/^.*\.//'`
 
 # use either $tmp_dir, the provided directory (-d) or the provided filename (-f)