diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9c7a153467..01e525c353 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -95,7 +95,7 @@ jobs:
         uses: ludeeus/action-shellcheck@master
         with:
           severity: warning
-          ignore_paths: cookbooks/third-party
+          ignore_paths: cookbooks/iptables cookbooks/line cookbooks/nfs cookbooks/openssh cookbooks/yum cookbooks/yum-epel
   rspec:
     name: ChefSpec
     runs-on: ubuntu-latest
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/.rubocop.yml b/.rubocop.yml
index 1628c588e2..91a2b6b508 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -98,7 +98,12 @@ Lint/UnmodifiedReduceAccumulator: # (new in 1.1)
 AllCops:
   NewCops: enable
   Exclude:
-    - 'cookbooks/third-party/**/*'
+    - 'cookbooks/iptables/**/*'
+    - 'cookbooks/line/**/*'
+    - 'cookbooks/nfs/**/*'
+    - 'cookbooks/openssh/**/*'
+    - 'cookbooks/yum/**/*'
+    - 'cookbooks/yum-epel/**/*'
 
 Chef/Deprecations/ChefSpecCoverageReport:
   Enabled: false
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/CHANGELOG.md b/CHANGELOG.md
index 7a91d0b4f6..7d85df10d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste
 - Ubuntu 20.04 is no longer supported.
 - Upgrade Slurm to version 24.11.5.
 - Upgrade DCV to version 2024.0-19030.
+- Remove `berkshelf`. All cookbooks are local and do not need `berkshelf` dependency management.
 
 3.13.2
 ------
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..42e97ab9e7 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,7 @@ 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.
 
 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:
@@ -34,9 +32,9 @@ The `test` folder contains Python unit tests files and Kitchen [environment](htt
 
 The `kitchen` folder contains utility files used when running Inspec tests locally.
 
-The `cookbooks/third-party` folder contains cookbooks from marketplace. They must be regularly updated and should not be modified by hand.
+The `iptables`, `line`, `nfs`, `openssh`, `yum`, `yum-eple` are cookbooks from marketplace. They must be regularly updated and should not be modified by hand.
 They have been pre-downloaded and stored in our repository to avoid contacting Chef Marketplace at AMI build time and cluster creation.
-You can find more information about them in the `cookbooks/third-party/THIRD-PARTY-LICENSES.txt` file.
+You can find more information about them in the `cookbooks/THIRD-PARTY-LICENSES.txt` file.
 
 # Development
 
@@ -391,15 +389,6 @@ 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
-
-#### Kitchen doesn't see your changes
-
-If Kitchen doesn't detect your changes, try
-```
-berks shelf uninstall ${COOKBOOK_NAME}
-```
-
 ## About python tests
 
 Python tests are configured in `tox.ini` file, including paths to python files.
diff --git a/cookbooks/third-party/THIRD-PARTY-LICENSES.txt b/cookbooks/THIRD-PARTY-LICENSES.txt
similarity index 100%
rename from cookbooks/third-party/THIRD-PARTY-LICENSES.txt
rename to cookbooks/THIRD-PARTY-LICENSES.txt
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..fb0caa11d3 100644
--- a/cookbooks/aws-parallelcluster-shared/spec/spec_helper.rb
+++ b/cookbooks/aws-parallelcluster-shared/spec/spec_helper.rb
@@ -1,5 +1,4 @@
 require 'chefspec'
-require 'chefspec/berkshelf'
 
 # Chef::Mixin::ShellOut is required to mock shellout
 include Chef::Mixin::ShellOut
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/iptables/.delivery/project.toml
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/.delivery/project.toml
rename to cookbooks/iptables/.delivery/project.toml
diff --git a/cookbooks/third-party/iptables-8.0.0/.editorconfig b/cookbooks/iptables/.editorconfig
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/.editorconfig
rename to cookbooks/iptables/.editorconfig
diff --git a/cookbooks/third-party/iptables-8.0.0/.gitattributes b/cookbooks/iptables/.gitattributes
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/.gitattributes
rename to cookbooks/iptables/.gitattributes
diff --git a/cookbooks/third-party/iptables-8.0.0/.github/CODEOWNERS b/cookbooks/iptables/.github/CODEOWNERS
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/.github/CODEOWNERS
rename to cookbooks/iptables/.github/CODEOWNERS
diff --git a/cookbooks/third-party/iptables-8.0.0/.github/workflows/branchcleanup.yml b/cookbooks/iptables/.github/workflows/branchcleanup.yml
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/.github/workflows/branchcleanup.yml
rename to cookbooks/iptables/.github/workflows/branchcleanup.yml
diff --git a/cookbooks/third-party/iptables-8.0.0/.github/workflows/ci.yml b/cookbooks/iptables/.github/workflows/ci.yml
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/.github/workflows/ci.yml
rename to cookbooks/iptables/.github/workflows/ci.yml
diff --git a/cookbooks/third-party/iptables-8.0.0/.gitignore b/cookbooks/iptables/.gitignore
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/.gitignore
rename to cookbooks/iptables/.gitignore
diff --git a/cookbooks/third-party/iptables-8.0.0/Berksfile b/cookbooks/iptables/Berksfile
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/Berksfile
rename to cookbooks/iptables/Berksfile
diff --git a/cookbooks/third-party/iptables-8.0.0/CHANGELOG.md b/cookbooks/iptables/CHANGELOG.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/CHANGELOG.md
rename to cookbooks/iptables/CHANGELOG.md
diff --git a/cookbooks/third-party/iptables-8.0.0/CODE_OF_CONDUCT.md b/cookbooks/iptables/CODE_OF_CONDUCT.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/CODE_OF_CONDUCT.md
rename to cookbooks/iptables/CODE_OF_CONDUCT.md
diff --git a/cookbooks/third-party/iptables-8.0.0/CONTRIBUTING.md b/cookbooks/iptables/CONTRIBUTING.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/CONTRIBUTING.md
rename to cookbooks/iptables/CONTRIBUTING.md
diff --git a/cookbooks/third-party/iptables-8.0.0/Gemfile b/cookbooks/iptables/Gemfile
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/Gemfile
rename to cookbooks/iptables/Gemfile
diff --git a/cookbooks/third-party/iptables-8.0.0/LICENSE b/cookbooks/iptables/LICENSE
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/LICENSE
rename to cookbooks/iptables/LICENSE
diff --git a/cookbooks/third-party/iptables-8.0.0/README.md b/cookbooks/iptables/README.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/README.md
rename to cookbooks/iptables/README.md
diff --git a/cookbooks/third-party/iptables-8.0.0/TESTING.md b/cookbooks/iptables/TESTING.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/TESTING.md
rename to cookbooks/iptables/TESTING.md
diff --git a/cookbooks/third-party/iptables-8.0.0/UPGRADING.md b/cookbooks/iptables/UPGRADING.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/UPGRADING.md
rename to cookbooks/iptables/UPGRADING.md
diff --git a/cookbooks/third-party/iptables-8.0.0/attributes/default.rb b/cookbooks/iptables/attributes/default.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/attributes/default.rb
rename to cookbooks/iptables/attributes/default.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/chefignore b/cookbooks/iptables/chefignore
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/chefignore
rename to cookbooks/iptables/chefignore
diff --git a/cookbooks/third-party/iptables-8.0.0/documentation/iptables_chain.md b/cookbooks/iptables/documentation/iptables_chain.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/documentation/iptables_chain.md
rename to cookbooks/iptables/documentation/iptables_chain.md
diff --git a/cookbooks/third-party/iptables-8.0.0/documentation/iptables_packages.md b/cookbooks/iptables/documentation/iptables_packages.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/documentation/iptables_packages.md
rename to cookbooks/iptables/documentation/iptables_packages.md
diff --git a/cookbooks/third-party/iptables-8.0.0/documentation/iptables_rule.md b/cookbooks/iptables/documentation/iptables_rule.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/documentation/iptables_rule.md
rename to cookbooks/iptables/documentation/iptables_rule.md
diff --git a/cookbooks/third-party/iptables-8.0.0/documentation/iptables_service.md b/cookbooks/iptables/documentation/iptables_service.md
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/documentation/iptables_service.md
rename to cookbooks/iptables/documentation/iptables_service.md
diff --git a/cookbooks/third-party/iptables-8.0.0/kitchen.dokken.yml b/cookbooks/iptables/kitchen.dokken.yml
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/kitchen.dokken.yml
rename to cookbooks/iptables/kitchen.dokken.yml
diff --git a/cookbooks/third-party/iptables-8.0.0/kitchen.yml b/cookbooks/iptables/kitchen.yml
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/kitchen.yml
rename to cookbooks/iptables/kitchen.yml
diff --git a/cookbooks/third-party/iptables-8.0.0/libraries/helpers.rb b/cookbooks/iptables/libraries/helpers.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/libraries/helpers.rb
rename to cookbooks/iptables/libraries/helpers.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/metadata.rb b/cookbooks/iptables/metadata.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/metadata.rb
rename to cookbooks/iptables/metadata.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/recipes/_package.rb b/cookbooks/iptables/recipes/_package.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/recipes/_package.rb
rename to cookbooks/iptables/recipes/_package.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/recipes/default.rb b/cookbooks/iptables/recipes/default.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/recipes/default.rb
rename to cookbooks/iptables/recipes/default.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/recipes/disabled.rb b/cookbooks/iptables/recipes/disabled.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/recipes/disabled.rb
rename to cookbooks/iptables/recipes/disabled.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/resources/chain.rb b/cookbooks/iptables/resources/chain.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/resources/chain.rb
rename to cookbooks/iptables/resources/chain.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/resources/chain6.rb b/cookbooks/iptables/resources/chain6.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/resources/chain6.rb
rename to cookbooks/iptables/resources/chain6.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/resources/packages.rb b/cookbooks/iptables/resources/packages.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/resources/packages.rb
rename to cookbooks/iptables/resources/packages.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/resources/rule.rb b/cookbooks/iptables/resources/rule.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/resources/rule.rb
rename to cookbooks/iptables/resources/rule.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/resources/rule6.rb b/cookbooks/iptables/resources/rule6.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/resources/rule6.rb
rename to cookbooks/iptables/resources/rule6.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/resources/service.rb b/cookbooks/iptables/resources/service.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/resources/service.rb
rename to cookbooks/iptables/resources/service.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/spec/libraries/helpers_spec.rb b/cookbooks/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/iptables/spec/libraries/helpers_spec.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/spec/resources/chain_spec.rb b/cookbooks/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/iptables/spec/resources/chain_spec.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/spec/resources/rule_spec.rb b/cookbooks/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/iptables/spec/resources/rule_spec.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/spec/spec_helper.rb b/cookbooks/iptables/spec/spec_helper.rb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/spec/spec_helper.rb
rename to cookbooks/iptables/spec/spec_helper.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/templates/default/iptables-config.erb b/cookbooks/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/iptables/templates/default/iptables-config.erb
diff --git a/cookbooks/third-party/iptables-8.0.0/templates/default/iptables.erb b/cookbooks/iptables/templates/default/iptables.erb
similarity index 100%
rename from cookbooks/third-party/iptables-8.0.0/templates/default/iptables.erb
rename to cookbooks/iptables/templates/default/iptables.erb
diff --git a/cookbooks/third-party/iptables-8.0.0/templates/default/iptables_load.erb b/cookbooks/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/iptables/templates/default/iptables_load.erb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/cookbooks/test/README.md b/cookbooks/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/iptables/test/cookbooks/test/README.md
diff --git a/cookbooks/third-party/iptables-8.0.0/test/cookbooks/test/metadata.rb b/cookbooks/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/iptables/test/integration/rules/rules.rb
diff --git a/cookbooks/third-party/iptables-8.0.0/test/integration/rules/rules_spec.rb b/cookbooks/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/iptables/test/integration/rules/rules_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/.editorconfig b/cookbooks/line/.editorconfig
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.editorconfig
rename to cookbooks/line/.editorconfig
diff --git a/cookbooks/third-party/line-4.5.21/.envrc b/cookbooks/line/.envrc
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.envrc
rename to cookbooks/line/.envrc
diff --git a/cookbooks/third-party/line-4.5.21/.gitattributes b/cookbooks/line/.gitattributes
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.gitattributes
rename to cookbooks/line/.gitattributes
diff --git a/cookbooks/third-party/line-4.5.21/.github/CODEOWNERS b/cookbooks/line/.github/CODEOWNERS
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.github/CODEOWNERS
rename to cookbooks/line/.github/CODEOWNERS
diff --git a/cookbooks/third-party/line-4.5.21/.github/lock.yml b/cookbooks/line/.github/lock.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.github/lock.yml
rename to cookbooks/line/.github/lock.yml
diff --git a/cookbooks/third-party/line-4.5.21/.github/workflows/ci.yml b/cookbooks/line/.github/workflows/ci.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.github/workflows/ci.yml
rename to cookbooks/line/.github/workflows/ci.yml
diff --git a/cookbooks/third-party/line-4.5.21/.github/workflows/stale.yml b/cookbooks/line/.github/workflows/stale.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.github/workflows/stale.yml
rename to cookbooks/line/.github/workflows/stale.yml
diff --git a/cookbooks/third-party/line-4.5.21/.gitignore b/cookbooks/line/.gitignore
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.gitignore
rename to cookbooks/line/.gitignore
diff --git a/cookbooks/third-party/line-4.5.21/.markdownlint-cli2.yaml b/cookbooks/line/.markdownlint-cli2.yaml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.markdownlint-cli2.yaml
rename to cookbooks/line/.markdownlint-cli2.yaml
diff --git a/cookbooks/third-party/line-4.5.21/.mdlrc b/cookbooks/line/.mdlrc
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.mdlrc
rename to cookbooks/line/.mdlrc
diff --git a/cookbooks/third-party/line-4.5.21/.overcommit.yml b/cookbooks/line/.overcommit.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.overcommit.yml
rename to cookbooks/line/.overcommit.yml
diff --git a/cookbooks/third-party/line-4.5.21/.yamllint b/cookbooks/line/.yamllint
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/.yamllint
rename to cookbooks/line/.yamllint
diff --git a/cookbooks/third-party/line-4.5.21/Berksfile b/cookbooks/line/Berksfile
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/Berksfile
rename to cookbooks/line/Berksfile
diff --git a/cookbooks/third-party/line-4.5.21/CHANGELOG.md b/cookbooks/line/CHANGELOG.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/CHANGELOG.md
rename to cookbooks/line/CHANGELOG.md
diff --git a/cookbooks/third-party/line-4.5.21/CODE_OF_CONDUCT.md b/cookbooks/line/CODE_OF_CONDUCT.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/CODE_OF_CONDUCT.md
rename to cookbooks/line/CODE_OF_CONDUCT.md
diff --git a/cookbooks/third-party/line-4.5.21/CONTRIBUTING.md b/cookbooks/line/CONTRIBUTING.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/CONTRIBUTING.md
rename to cookbooks/line/CONTRIBUTING.md
diff --git a/cookbooks/third-party/line-4.5.21/Dangerfile b/cookbooks/line/Dangerfile
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/Dangerfile
rename to cookbooks/line/Dangerfile
diff --git a/cookbooks/third-party/line-4.5.21/FilterDevelopment.md b/cookbooks/line/FilterDevelopment.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/FilterDevelopment.md
rename to cookbooks/line/FilterDevelopment.md
diff --git a/cookbooks/third-party/line-4.5.21/LICENSE b/cookbooks/line/LICENSE
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/LICENSE
rename to cookbooks/line/LICENSE
diff --git a/cookbooks/third-party/line-4.5.21/README.md b/cookbooks/line/README.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/README.md
rename to cookbooks/line/README.md
diff --git a/cookbooks/third-party/line-4.5.21/TESTING.md b/cookbooks/line/TESTING.md
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/TESTING.md
rename to cookbooks/line/TESTING.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/.gitkeep b/cookbooks/line/documentation/.gitkeep
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/documentation/.gitkeep
rename to cookbooks/line/documentation/.gitkeep
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/add_to_list.md b/cookbooks/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/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/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/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/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/line/documentation/resources/delete_from_list.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/delete_lines.md b/cookbooks/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/line/documentation/resources/delete_lines.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filter_lines.md b/cookbooks/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/line/documentation/resources/filter_lines.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filters/after.md b/cookbooks/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/line/documentation/resources/filters/after.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filters/before.md b/cookbooks/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/line/documentation/resources/filters/before.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filters/between.md b/cookbooks/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/line/documentation/resources/filters/between.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filters/comment.md b/cookbooks/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/line/documentation/resources/filters/comment.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filters/delete_between.md b/cookbooks/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/line/documentation/resources/filters/delete_between.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filters/missing.md b/cookbooks/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/line/documentation/resources/filters/missing.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filters/replace.md b/cookbooks/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/line/documentation/resources/filters/replace.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filters/replace_between.md b/cookbooks/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/line/documentation/resources/filters/replace_between.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filters/stanza.md b/cookbooks/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/line/documentation/resources/filters/stanza.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/filters/substitute.md b/cookbooks/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/line/documentation/resources/filters/substitute.md
diff --git a/cookbooks/third-party/line-4.5.21/documentation/resources/replace_or_add.md b/cookbooks/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/line/documentation/resources/replace_or_add.md
diff --git a/cookbooks/third-party/line-4.5.21/kitchen.dokken.yml b/cookbooks/line/kitchen.dokken.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/kitchen.dokken.yml
rename to cookbooks/line/kitchen.dokken.yml
diff --git a/cookbooks/third-party/line-4.5.21/kitchen.exec.yml b/cookbooks/line/kitchen.exec.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/kitchen.exec.yml
rename to cookbooks/line/kitchen.exec.yml
diff --git a/cookbooks/third-party/line-4.5.21/kitchen.global.yml b/cookbooks/line/kitchen.global.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/kitchen.global.yml
rename to cookbooks/line/kitchen.global.yml
diff --git a/cookbooks/third-party/line-4.5.21/kitchen.yml b/cookbooks/line/kitchen.yml
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/kitchen.yml
rename to cookbooks/line/kitchen.yml
diff --git a/cookbooks/third-party/line-4.5.21/libraries/after_filter.rb b/cookbooks/line/libraries/after_filter.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/after_filter.rb
rename to cookbooks/line/libraries/after_filter.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/before_filter.rb b/cookbooks/line/libraries/before_filter.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/before_filter.rb
rename to cookbooks/line/libraries/before_filter.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/between.rb b/cookbooks/line/libraries/between.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/between.rb
rename to cookbooks/line/libraries/between.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/comment_filter.rb b/cookbooks/line/libraries/comment_filter.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/comment_filter.rb
rename to cookbooks/line/libraries/comment_filter.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/delete_between.rb b/cookbooks/line/libraries/delete_between.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/delete_between.rb
rename to cookbooks/line/libraries/delete_between.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/filter_helper.rb b/cookbooks/line/libraries/filter_helper.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/filter_helper.rb
rename to cookbooks/line/libraries/filter_helper.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/helper.rb b/cookbooks/line/libraries/helper.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/helper.rb
rename to cookbooks/line/libraries/helper.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/list_helper.rb b/cookbooks/line/libraries/list_helper.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/list_helper.rb
rename to cookbooks/line/libraries/list_helper.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/missing_filter.rb b/cookbooks/line/libraries/missing_filter.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/missing_filter.rb
rename to cookbooks/line/libraries/missing_filter.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/replace_between.rb b/cookbooks/line/libraries/replace_between.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/replace_between.rb
rename to cookbooks/line/libraries/replace_between.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/replace_filter.rb b/cookbooks/line/libraries/replace_filter.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/replace_filter.rb
rename to cookbooks/line/libraries/replace_filter.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/stanza_filter.rb b/cookbooks/line/libraries/stanza_filter.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/stanza_filter.rb
rename to cookbooks/line/libraries/stanza_filter.rb
diff --git a/cookbooks/third-party/line-4.5.21/libraries/substitute_filter.rb b/cookbooks/line/libraries/substitute_filter.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/libraries/substitute_filter.rb
rename to cookbooks/line/libraries/substitute_filter.rb
diff --git a/cookbooks/third-party/line-4.5.21/metadata.rb b/cookbooks/line/metadata.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/metadata.rb
rename to cookbooks/line/metadata.rb
diff --git a/cookbooks/third-party/line-4.5.21/recipes/default.rb b/cookbooks/line/recipes/default.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/recipes/default.rb
rename to cookbooks/line/recipes/default.rb
diff --git a/cookbooks/third-party/line-4.5.21/renovate.json b/cookbooks/line/renovate.json
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/renovate.json
rename to cookbooks/line/renovate.json
diff --git a/cookbooks/third-party/line-4.5.21/resources/add_to_list.rb b/cookbooks/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/line/resources/add_to_list.rb
diff --git a/cookbooks/third-party/line-4.5.21/resources/append_if_no_line.rb b/cookbooks/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/line/resources/append_if_no_line.rb
diff --git a/cookbooks/third-party/line-4.5.21/resources/delete_from_list.rb b/cookbooks/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/line/resources/delete_from_list.rb
diff --git a/cookbooks/third-party/line-4.5.21/resources/delete_lines.rb b/cookbooks/line/resources/delete_lines.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/resources/delete_lines.rb
rename to cookbooks/line/resources/delete_lines.rb
diff --git a/cookbooks/third-party/line-4.5.21/resources/filter_lines.rb b/cookbooks/line/resources/filter_lines.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/resources/filter_lines.rb
rename to cookbooks/line/resources/filter_lines.rb
diff --git a/cookbooks/third-party/line-4.5.21/resources/replace_or_add.rb b/cookbooks/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/line/resources/replace_or_add.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/chefspec_helper.rb b/cookbooks/line/spec/chefspec_helper.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/chefspec_helper.rb
rename to cookbooks/line/spec/chefspec_helper.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/cookbook/documentation_spec.rb b/cookbooks/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/line/spec/cookbook/documentation_spec.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/fixtures/cookbooks/spectest/README.md b/cookbooks/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/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/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/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/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/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/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/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/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/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/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/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/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/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/line/spec/rspec_helper.rb
similarity index 100%
rename from cookbooks/third-party/line-4.5.21/spec/rspec_helper.rb
rename to cookbooks/line/spec/rspec_helper.rb
diff --git a/cookbooks/third-party/line-4.5.21/spec/unit/library/filter/after_spec.rb b/cookbooks/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/line/test/integration/replace_or_add/inspec.yml
diff --git a/cookbooks/third-party/nfs-5.1.5/.editorconfig b/cookbooks/nfs/.editorconfig
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.editorconfig
rename to cookbooks/nfs/.editorconfig
diff --git a/cookbooks/third-party/nfs-5.1.5/.envrc b/cookbooks/nfs/.envrc
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.envrc
rename to cookbooks/nfs/.envrc
diff --git a/cookbooks/third-party/nfs-5.1.5/.gitattributes b/cookbooks/nfs/.gitattributes
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.gitattributes
rename to cookbooks/nfs/.gitattributes
diff --git a/cookbooks/third-party/nfs-5.1.5/.github/CODEOWNERS b/cookbooks/nfs/.github/CODEOWNERS
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.github/CODEOWNERS
rename to cookbooks/nfs/.github/CODEOWNERS
diff --git a/cookbooks/third-party/nfs-5.1.5/.github/workflows/ci.yml b/cookbooks/nfs/.github/workflows/ci.yml
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.github/workflows/ci.yml
rename to cookbooks/nfs/.github/workflows/ci.yml
diff --git a/cookbooks/third-party/nfs-5.1.5/.github/workflows/stale.yml b/cookbooks/nfs/.github/workflows/stale.yml
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.github/workflows/stale.yml
rename to cookbooks/nfs/.github/workflows/stale.yml
diff --git a/cookbooks/third-party/nfs-5.1.5/.gitignore b/cookbooks/nfs/.gitignore
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.gitignore
rename to cookbooks/nfs/.gitignore
diff --git a/cookbooks/third-party/nfs-5.1.5/.markdownlint-cli2.yaml b/cookbooks/nfs/.markdownlint-cli2.yaml
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.markdownlint-cli2.yaml
rename to cookbooks/nfs/.markdownlint-cli2.yaml
diff --git a/cookbooks/third-party/nfs-5.1.5/.mdlrc b/cookbooks/nfs/.mdlrc
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.mdlrc
rename to cookbooks/nfs/.mdlrc
diff --git a/cookbooks/third-party/nfs-5.1.5/.overcommit.yml b/cookbooks/nfs/.overcommit.yml
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.overcommit.yml
rename to cookbooks/nfs/.overcommit.yml
diff --git a/cookbooks/third-party/nfs-5.1.5/.yamllint b/cookbooks/nfs/.yamllint
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/.yamllint
rename to cookbooks/nfs/.yamllint
diff --git a/cookbooks/third-party/nfs-5.1.5/Berksfile b/cookbooks/nfs/Berksfile
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/Berksfile
rename to cookbooks/nfs/Berksfile
diff --git a/cookbooks/third-party/nfs-5.1.5/CHANGELOG.md b/cookbooks/nfs/CHANGELOG.md
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/CHANGELOG.md
rename to cookbooks/nfs/CHANGELOG.md
diff --git a/cookbooks/third-party/nfs-5.1.5/CODE_OF_CONDUCT.md b/cookbooks/nfs/CODE_OF_CONDUCT.md
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/CODE_OF_CONDUCT.md
rename to cookbooks/nfs/CODE_OF_CONDUCT.md
diff --git a/cookbooks/third-party/nfs-5.1.5/CONTRIBUTING.md b/cookbooks/nfs/CONTRIBUTING.md
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/CONTRIBUTING.md
rename to cookbooks/nfs/CONTRIBUTING.md
diff --git a/cookbooks/third-party/nfs-5.1.5/Dangerfile b/cookbooks/nfs/Dangerfile
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/Dangerfile
rename to cookbooks/nfs/Dangerfile
diff --git a/cookbooks/third-party/nfs-5.1.5/LICENSE b/cookbooks/nfs/LICENSE
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/LICENSE
rename to cookbooks/nfs/LICENSE
diff --git a/cookbooks/third-party/nfs-5.1.5/README.md b/cookbooks/nfs/README.md
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/README.md
rename to cookbooks/nfs/README.md
diff --git a/cookbooks/third-party/nfs-5.1.5/Rakefile b/cookbooks/nfs/Rakefile
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/Rakefile
rename to cookbooks/nfs/Rakefile
diff --git a/cookbooks/third-party/nfs-5.1.5/TESTING.md b/cookbooks/nfs/TESTING.md
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/TESTING.md
rename to cookbooks/nfs/TESTING.md
diff --git a/cookbooks/third-party/nfs-5.1.5/attributes/default.rb b/cookbooks/nfs/attributes/default.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/attributes/default.rb
rename to cookbooks/nfs/attributes/default.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/chefignore b/cookbooks/nfs/chefignore
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/chefignore
rename to cookbooks/nfs/chefignore
diff --git a/cookbooks/third-party/nfs-5.1.5/documentation/.gitkeep b/cookbooks/nfs/documentation/.gitkeep
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/documentation/.gitkeep
rename to cookbooks/nfs/documentation/.gitkeep
diff --git a/cookbooks/third-party/nfs-5.1.5/kitchen.dokken.yml b/cookbooks/nfs/kitchen.dokken.yml
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/kitchen.dokken.yml
rename to cookbooks/nfs/kitchen.dokken.yml
diff --git a/cookbooks/third-party/nfs-5.1.5/kitchen.yml b/cookbooks/nfs/kitchen.yml
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/kitchen.yml
rename to cookbooks/nfs/kitchen.yml
diff --git a/cookbooks/third-party/nfs-5.1.5/libraries/helpers.rb b/cookbooks/nfs/libraries/helpers.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/libraries/helpers.rb
rename to cookbooks/nfs/libraries/helpers.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/metadata.rb b/cookbooks/nfs/metadata.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/metadata.rb
rename to cookbooks/nfs/metadata.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/recipes/_common.rb b/cookbooks/nfs/recipes/_common.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/recipes/_common.rb
rename to cookbooks/nfs/recipes/_common.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/recipes/_idmap.rb b/cookbooks/nfs/recipes/_idmap.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/recipes/_idmap.rb
rename to cookbooks/nfs/recipes/_idmap.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/recipes/_sysctl.rb b/cookbooks/nfs/recipes/_sysctl.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/recipes/_sysctl.rb
rename to cookbooks/nfs/recipes/_sysctl.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/recipes/client4.rb b/cookbooks/nfs/recipes/client4.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/recipes/client4.rb
rename to cookbooks/nfs/recipes/client4.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/recipes/default.rb b/cookbooks/nfs/recipes/default.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/recipes/default.rb
rename to cookbooks/nfs/recipes/default.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/recipes/server.rb b/cookbooks/nfs/recipes/server.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/recipes/server.rb
rename to cookbooks/nfs/recipes/server.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/recipes/server4.rb b/cookbooks/nfs/recipes/server4.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/recipes/server4.rb
rename to cookbooks/nfs/recipes/server4.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/recipes/undo.rb b/cookbooks/nfs/recipes/undo.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/recipes/undo.rb
rename to cookbooks/nfs/recipes/undo.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/resources/export.rb b/cookbooks/nfs/resources/export.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/resources/export.rb
rename to cookbooks/nfs/resources/export.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/spec/spec_helper.rb b/cookbooks/nfs/spec/spec_helper.rb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/spec/spec_helper.rb
rename to cookbooks/nfs/spec/spec_helper.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/spec/unit/recipes/client4_spec.rb b/cookbooks/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/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/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/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/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/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/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/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/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/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/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/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/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/nfs/spec/unit/resources/export_spec.rb
diff --git a/cookbooks/third-party/nfs-5.1.5/templates/default/exports.erb b/cookbooks/nfs/templates/default/exports.erb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/templates/default/exports.erb
rename to cookbooks/nfs/templates/default/exports.erb
diff --git a/cookbooks/third-party/nfs-5.1.5/templates/default/idmapd.conf.erb b/cookbooks/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/nfs/templates/default/idmapd.conf.erb
diff --git a/cookbooks/third-party/nfs-5.1.5/templates/default/mountd.erb b/cookbooks/nfs/templates/default/mountd.erb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/templates/default/mountd.erb
rename to cookbooks/nfs/templates/default/mountd.erb
diff --git a/cookbooks/third-party/nfs-5.1.5/templates/default/nfs-common.erb b/cookbooks/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/nfs/templates/default/nfs-common.erb
diff --git a/cookbooks/third-party/nfs-5.1.5/templates/default/nfs.conf.erb b/cookbooks/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/nfs/templates/default/nfs.conf.erb
diff --git a/cookbooks/third-party/nfs-5.1.5/templates/default/nfs.erb b/cookbooks/nfs/templates/default/nfs.erb
similarity index 100%
rename from cookbooks/third-party/nfs-5.1.5/templates/default/nfs.erb
rename to cookbooks/nfs/templates/default/nfs.erb
diff --git a/cookbooks/third-party/nfs-5.1.5/test/cookbooks/nfs_test/metadata.rb b/cookbooks/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/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/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/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/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/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/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/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/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/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/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/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/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/nfs/test/integration/server/inspec.yml
diff --git a/cookbooks/third-party/openssh-2.11.14/.editorconfig b/cookbooks/openssh/.editorconfig
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.editorconfig
rename to cookbooks/openssh/.editorconfig
diff --git a/cookbooks/third-party/openssh-2.11.14/.envrc b/cookbooks/openssh/.envrc
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.envrc
rename to cookbooks/openssh/.envrc
diff --git a/cookbooks/third-party/openssh-2.11.14/.gitattributes b/cookbooks/openssh/.gitattributes
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.gitattributes
rename to cookbooks/openssh/.gitattributes
diff --git a/cookbooks/third-party/openssh-2.11.14/.github/CODEOWNERS b/cookbooks/openssh/.github/CODEOWNERS
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.github/CODEOWNERS
rename to cookbooks/openssh/.github/CODEOWNERS
diff --git a/cookbooks/third-party/openssh-2.11.14/.github/workflows/ci.yml b/cookbooks/openssh/.github/workflows/ci.yml
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.github/workflows/ci.yml
rename to cookbooks/openssh/.github/workflows/ci.yml
diff --git a/cookbooks/third-party/openssh-2.11.14/.github/workflows/stale.yml b/cookbooks/openssh/.github/workflows/stale.yml
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.github/workflows/stale.yml
rename to cookbooks/openssh/.github/workflows/stale.yml
diff --git a/cookbooks/third-party/openssh-2.11.14/.gitignore b/cookbooks/openssh/.gitignore
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.gitignore
rename to cookbooks/openssh/.gitignore
diff --git a/cookbooks/third-party/openssh-2.11.14/.markdownlint-cli2.yaml b/cookbooks/openssh/.markdownlint-cli2.yaml
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.markdownlint-cli2.yaml
rename to cookbooks/openssh/.markdownlint-cli2.yaml
diff --git a/cookbooks/third-party/openssh-2.11.14/.mdlrc b/cookbooks/openssh/.mdlrc
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.mdlrc
rename to cookbooks/openssh/.mdlrc
diff --git a/cookbooks/third-party/openssh-2.11.14/.overcommit.yml b/cookbooks/openssh/.overcommit.yml
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.overcommit.yml
rename to cookbooks/openssh/.overcommit.yml
diff --git a/cookbooks/third-party/openssh-2.11.14/.yamllint b/cookbooks/openssh/.yamllint
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/.yamllint
rename to cookbooks/openssh/.yamllint
diff --git a/cookbooks/third-party/openssh-2.11.14/Berksfile b/cookbooks/openssh/Berksfile
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/Berksfile
rename to cookbooks/openssh/Berksfile
diff --git a/cookbooks/third-party/openssh-2.11.14/CHANGELOG.md b/cookbooks/openssh/CHANGELOG.md
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/CHANGELOG.md
rename to cookbooks/openssh/CHANGELOG.md
diff --git a/cookbooks/third-party/openssh-2.11.14/CODE_OF_CONDUCT.md b/cookbooks/openssh/CODE_OF_CONDUCT.md
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/CODE_OF_CONDUCT.md
rename to cookbooks/openssh/CODE_OF_CONDUCT.md
diff --git a/cookbooks/third-party/openssh-2.11.14/CONTRIBUTING.md b/cookbooks/openssh/CONTRIBUTING.md
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/CONTRIBUTING.md
rename to cookbooks/openssh/CONTRIBUTING.md
diff --git a/cookbooks/third-party/openssh-2.11.14/Dangerfile b/cookbooks/openssh/Dangerfile
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/Dangerfile
rename to cookbooks/openssh/Dangerfile
diff --git a/cookbooks/third-party/openssh-2.11.14/README.md b/cookbooks/openssh/README.md
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/README.md
rename to cookbooks/openssh/README.md
diff --git a/cookbooks/third-party/openssh-2.11.14/TESTING.md b/cookbooks/openssh/TESTING.md
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/TESTING.md
rename to cookbooks/openssh/TESTING.md
diff --git a/cookbooks/third-party/openssh-2.11.14/attributes/default.rb b/cookbooks/openssh/attributes/default.rb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/attributes/default.rb
rename to cookbooks/openssh/attributes/default.rb
diff --git a/cookbooks/third-party/openssh-2.11.14/chefignore b/cookbooks/openssh/chefignore
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/chefignore
rename to cookbooks/openssh/chefignore
diff --git a/cookbooks/third-party/openssh-2.11.14/documentation/.gitkeep b/cookbooks/openssh/documentation/.gitkeep
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/documentation/.gitkeep
rename to cookbooks/openssh/documentation/.gitkeep
diff --git a/cookbooks/third-party/openssh-2.11.14/kitchen.dokken.yml b/cookbooks/openssh/kitchen.dokken.yml
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/kitchen.dokken.yml
rename to cookbooks/openssh/kitchen.dokken.yml
diff --git a/cookbooks/third-party/openssh-2.11.14/kitchen.exec.yml b/cookbooks/openssh/kitchen.exec.yml
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/kitchen.exec.yml
rename to cookbooks/openssh/kitchen.exec.yml
diff --git a/cookbooks/third-party/openssh-2.11.14/kitchen.global.yml b/cookbooks/openssh/kitchen.global.yml
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/kitchen.global.yml
rename to cookbooks/openssh/kitchen.global.yml
diff --git a/cookbooks/third-party/openssh-2.11.14/kitchen.yml b/cookbooks/openssh/kitchen.yml
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/kitchen.yml
rename to cookbooks/openssh/kitchen.yml
diff --git a/cookbooks/third-party/openssh-2.11.14/libraries/helpers.rb b/cookbooks/openssh/libraries/helpers.rb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/libraries/helpers.rb
rename to cookbooks/openssh/libraries/helpers.rb
diff --git a/cookbooks/third-party/openssh-2.11.14/metadata.rb b/cookbooks/openssh/metadata.rb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/metadata.rb
rename to cookbooks/openssh/metadata.rb
diff --git a/cookbooks/third-party/openssh-2.11.14/mlc_config.json b/cookbooks/openssh/mlc_config.json
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/mlc_config.json
rename to cookbooks/openssh/mlc_config.json
diff --git a/cookbooks/third-party/openssh-2.11.14/recipes/default.rb b/cookbooks/openssh/recipes/default.rb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/recipes/default.rb
rename to cookbooks/openssh/recipes/default.rb
diff --git a/cookbooks/third-party/openssh-2.11.14/recipes/iptables.rb b/cookbooks/openssh/recipes/iptables.rb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/recipes/iptables.rb
rename to cookbooks/openssh/recipes/iptables.rb
diff --git a/cookbooks/third-party/openssh-2.11.14/renovate.json b/cookbooks/openssh/renovate.json
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/renovate.json
rename to cookbooks/openssh/renovate.json
diff --git a/cookbooks/third-party/openssh-2.11.14/spec/spec_helper.rb b/cookbooks/openssh/spec/spec_helper.rb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/spec/spec_helper.rb
rename to cookbooks/openssh/spec/spec_helper.rb
diff --git a/cookbooks/third-party/openssh-2.11.14/spec/unit/recipes/default_spec.rb b/cookbooks/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/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/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/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/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/openssh/spec/unit/recipes/iptables_spec.rb
diff --git a/cookbooks/third-party/openssh-2.11.14/templates/ca_keys.erb b/cookbooks/openssh/templates/ca_keys.erb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/templates/ca_keys.erb
rename to cookbooks/openssh/templates/ca_keys.erb
diff --git a/cookbooks/third-party/openssh-2.11.14/templates/port_ssh.erb b/cookbooks/openssh/templates/port_ssh.erb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/templates/port_ssh.erb
rename to cookbooks/openssh/templates/port_ssh.erb
diff --git a/cookbooks/third-party/openssh-2.11.14/templates/revoked_keys.erb b/cookbooks/openssh/templates/revoked_keys.erb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/templates/revoked_keys.erb
rename to cookbooks/openssh/templates/revoked_keys.erb
diff --git a/cookbooks/third-party/openssh-2.11.14/templates/ssh_config.erb b/cookbooks/openssh/templates/ssh_config.erb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/templates/ssh_config.erb
rename to cookbooks/openssh/templates/ssh_config.erb
diff --git a/cookbooks/third-party/openssh-2.11.14/templates/sshd_config.erb b/cookbooks/openssh/templates/sshd_config.erb
similarity index 100%
rename from cookbooks/third-party/openssh-2.11.14/templates/sshd_config.erb
rename to cookbooks/openssh/templates/sshd_config.erb
diff --git a/cookbooks/third-party/openssh-2.11.14/test/integration/default/default_spec.rb b/cookbooks/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/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/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/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/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/openssh/test/integration/windows-default/default_spec.rb
diff --git a/cookbooks/third-party/yum-7.4.20/.editorconfig b/cookbooks/yum-epel/.editorconfig
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.editorconfig
rename to cookbooks/yum-epel/.editorconfig
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.envrc b/cookbooks/yum-epel/.envrc
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/.envrc
rename to cookbooks/yum-epel/.envrc
diff --git a/cookbooks/third-party/yum-7.4.20/.gitattributes b/cookbooks/yum-epel/.gitattributes
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.gitattributes
rename to cookbooks/yum-epel/.gitattributes
diff --git a/cookbooks/third-party/yum-7.4.20/.github/CODEOWNERS b/cookbooks/yum-epel/.github/CODEOWNERS
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.github/CODEOWNERS
rename to cookbooks/yum-epel/.github/CODEOWNERS
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.github/workflows/ci.yml b/cookbooks/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/yum-epel/.github/workflows/ci.yml
diff --git a/cookbooks/third-party/yum-7.4.20/.github/workflows/stale.yml b/cookbooks/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/yum-epel/.github/workflows/stale.yml
diff --git a/cookbooks/third-party/yum-7.4.20/.gitignore b/cookbooks/yum-epel/.gitignore
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.gitignore
rename to cookbooks/yum-epel/.gitignore
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.markdownlint-cli2.yaml b/cookbooks/yum-epel/.markdownlint-cli2.yaml
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/.markdownlint-cli2.yaml
rename to cookbooks/yum-epel/.markdownlint-cli2.yaml
diff --git a/cookbooks/third-party/yum-7.4.20/.mdlrc b/cookbooks/yum-epel/.mdlrc
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.mdlrc
rename to cookbooks/yum-epel/.mdlrc
diff --git a/cookbooks/third-party/yum-7.4.20/.overcommit.yml b/cookbooks/yum-epel/.overcommit.yml
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.overcommit.yml
rename to cookbooks/yum-epel/.overcommit.yml
diff --git a/cookbooks/third-party/yum-7.4.20/.yamllint b/cookbooks/yum-epel/.yamllint
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.yamllint
rename to cookbooks/yum-epel/.yamllint
diff --git a/cookbooks/third-party/yum-epel-5.0.8/Berksfile b/cookbooks/yum-epel/Berksfile
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/Berksfile
rename to cookbooks/yum-epel/Berksfile
diff --git a/cookbooks/third-party/yum-epel-5.0.8/CHANGELOG.md b/cookbooks/yum-epel/CHANGELOG.md
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/CHANGELOG.md
rename to cookbooks/yum-epel/CHANGELOG.md
diff --git a/cookbooks/third-party/yum-epel-5.0.8/README.md b/cookbooks/yum-epel/README.md
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/README.md
rename to cookbooks/yum-epel/README.md
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/default.rb b/cookbooks/yum-epel/attributes/default.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/attributes/default.rb
rename to cookbooks/yum-epel/attributes/default.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/epel-debuginfo.rb b/cookbooks/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/yum-epel/attributes/epel-debuginfo.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/epel-next-debuginfo.rb b/cookbooks/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/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/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/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/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/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/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/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/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/yum-epel/attributes/epel-next-testing.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/epel-next.rb b/cookbooks/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/yum-epel/attributes/epel-next.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/epel-source.rb b/cookbooks/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/yum-epel/attributes/epel-source.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/epel-testing-debuginfo.rb b/cookbooks/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/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/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/yum-epel/attributes/epel-testing-source.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/epel-testing.rb b/cookbooks/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/yum-epel/attributes/epel-testing.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/attributes/epel.rb b/cookbooks/yum-epel/attributes/epel.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/attributes/epel.rb
rename to cookbooks/yum-epel/attributes/epel.rb
diff --git a/cookbooks/third-party/yum-7.4.20/documentation/.gitkeep b/cookbooks/yum-epel/documentation/.gitkeep
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/documentation/.gitkeep
rename to cookbooks/yum-epel/documentation/.gitkeep
diff --git a/cookbooks/third-party/yum-epel-5.0.8/kitchen.yml b/cookbooks/yum-epel/kitchen.yml
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/kitchen.yml
rename to cookbooks/yum-epel/kitchen.yml
diff --git a/cookbooks/third-party/yum-epel-5.0.8/libraries/helpers.rb b/cookbooks/yum-epel/libraries/helpers.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/libraries/helpers.rb
rename to cookbooks/yum-epel/libraries/helpers.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/metadata.rb b/cookbooks/yum-epel/metadata.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/metadata.rb
rename to cookbooks/yum-epel/metadata.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/recipes/default.rb b/cookbooks/yum-epel/recipes/default.rb
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/recipes/default.rb
rename to cookbooks/yum-epel/recipes/default.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/spec/default_spec.rb b/cookbooks/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/yum-epel/spec/default_spec.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/spec/spec_helper.rb b/cookbooks/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/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/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/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/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/yum-epel/test/integration/default/default_spec.rb
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.editorconfig b/cookbooks/yum/.editorconfig
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/.editorconfig
rename to cookbooks/yum/.editorconfig
diff --git a/cookbooks/third-party/yum-7.4.20/.envrc b/cookbooks/yum/.envrc
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.envrc
rename to cookbooks/yum/.envrc
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.gitattributes b/cookbooks/yum/.gitattributes
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/.gitattributes
rename to cookbooks/yum/.gitattributes
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.github/CODEOWNERS b/cookbooks/yum/.github/CODEOWNERS
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/.github/CODEOWNERS
rename to cookbooks/yum/.github/CODEOWNERS
diff --git a/cookbooks/third-party/yum-7.4.20/.github/workflows/ci.yml b/cookbooks/yum/.github/workflows/ci.yml
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.github/workflows/ci.yml
rename to cookbooks/yum/.github/workflows/ci.yml
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.github/workflows/stale.yml b/cookbooks/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/yum/.github/workflows/stale.yml
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.gitignore b/cookbooks/yum/.gitignore
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/.gitignore
rename to cookbooks/yum/.gitignore
diff --git a/cookbooks/third-party/yum-7.4.20/.markdownlint-cli2.yaml b/cookbooks/yum/.markdownlint-cli2.yaml
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/.markdownlint-cli2.yaml
rename to cookbooks/yum/.markdownlint-cli2.yaml
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.mdlrc b/cookbooks/yum/.mdlrc
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/.mdlrc
rename to cookbooks/yum/.mdlrc
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.overcommit.yml b/cookbooks/yum/.overcommit.yml
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/.overcommit.yml
rename to cookbooks/yum/.overcommit.yml
diff --git a/cookbooks/third-party/yum-epel-5.0.8/.yamllint b/cookbooks/yum/.yamllint
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/.yamllint
rename to cookbooks/yum/.yamllint
diff --git a/cookbooks/third-party/yum-7.4.20/Berksfile b/cookbooks/yum/Berksfile
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/Berksfile
rename to cookbooks/yum/Berksfile
diff --git a/cookbooks/third-party/yum-7.4.20/CHANGELOG.md b/cookbooks/yum/CHANGELOG.md
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/CHANGELOG.md
rename to cookbooks/yum/CHANGELOG.md
diff --git a/cookbooks/third-party/yum-7.4.20/CODE_OF_CONDUCT.md b/cookbooks/yum/CODE_OF_CONDUCT.md
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/CODE_OF_CONDUCT.md
rename to cookbooks/yum/CODE_OF_CONDUCT.md
diff --git a/cookbooks/third-party/yum-7.4.20/CONTRIBUTING.md b/cookbooks/yum/CONTRIBUTING.md
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/CONTRIBUTING.md
rename to cookbooks/yum/CONTRIBUTING.md
diff --git a/cookbooks/third-party/yum-7.4.20/Dangerfile b/cookbooks/yum/Dangerfile
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/Dangerfile
rename to cookbooks/yum/Dangerfile
diff --git a/cookbooks/third-party/yum-7.4.20/LICENSE b/cookbooks/yum/LICENSE
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/LICENSE
rename to cookbooks/yum/LICENSE
diff --git a/cookbooks/third-party/yum-7.4.20/README.md b/cookbooks/yum/README.md
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/README.md
rename to cookbooks/yum/README.md
diff --git a/cookbooks/third-party/yum-7.4.20/TESTING.md b/cookbooks/yum/TESTING.md
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/TESTING.md
rename to cookbooks/yum/TESTING.md
diff --git a/cookbooks/third-party/yum-7.4.20/attributes/main.rb b/cookbooks/yum/attributes/main.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/attributes/main.rb
rename to cookbooks/yum/attributes/main.rb
diff --git a/cookbooks/third-party/yum-7.4.20/chefignore b/cookbooks/yum/chefignore
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/chefignore
rename to cookbooks/yum/chefignore
diff --git a/cookbooks/third-party/yum-epel-5.0.8/documentation/.gitkeep b/cookbooks/yum/documentation/.gitkeep
similarity index 100%
rename from cookbooks/third-party/yum-epel-5.0.8/documentation/.gitkeep
rename to cookbooks/yum/documentation/.gitkeep
diff --git a/cookbooks/third-party/yum-7.4.20/documentation/dnf_module.md b/cookbooks/yum/documentation/dnf_module.md
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/documentation/dnf_module.md
rename to cookbooks/yum/documentation/dnf_module.md
diff --git a/cookbooks/third-party/yum-7.4.20/documentation/yum_globalconfig.md b/cookbooks/yum/documentation/yum_globalconfig.md
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/documentation/yum_globalconfig.md
rename to cookbooks/yum/documentation/yum_globalconfig.md
diff --git a/cookbooks/third-party/yum-7.4.20/kitchen.dokken.yml b/cookbooks/yum/kitchen.dokken.yml
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/kitchen.dokken.yml
rename to cookbooks/yum/kitchen.dokken.yml
diff --git a/cookbooks/third-party/yum-7.4.20/kitchen.exec.yml b/cookbooks/yum/kitchen.exec.yml
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/kitchen.exec.yml
rename to cookbooks/yum/kitchen.exec.yml
diff --git a/cookbooks/third-party/yum-7.4.20/kitchen.global.yml b/cookbooks/yum/kitchen.global.yml
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/kitchen.global.yml
rename to cookbooks/yum/kitchen.global.yml
diff --git a/cookbooks/third-party/yum-7.4.20/kitchen.yml b/cookbooks/yum/kitchen.yml
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/kitchen.yml
rename to cookbooks/yum/kitchen.yml
diff --git a/cookbooks/third-party/yum-7.4.20/metadata.rb b/cookbooks/yum/metadata.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/metadata.rb
rename to cookbooks/yum/metadata.rb
diff --git a/cookbooks/third-party/yum-7.4.20/recipes/default.rb b/cookbooks/yum/recipes/default.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/recipes/default.rb
rename to cookbooks/yum/recipes/default.rb
diff --git a/cookbooks/third-party/yum-7.4.20/renovate.json b/cookbooks/yum/renovate.json
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/renovate.json
rename to cookbooks/yum/renovate.json
diff --git a/cookbooks/third-party/yum-7.4.20/resources/dnf_module.rb b/cookbooks/yum/resources/dnf_module.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/resources/dnf_module.rb
rename to cookbooks/yum/resources/dnf_module.rb
diff --git a/cookbooks/third-party/yum-7.4.20/resources/globalconfig.rb b/cookbooks/yum/resources/globalconfig.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/resources/globalconfig.rb
rename to cookbooks/yum/resources/globalconfig.rb
diff --git a/cookbooks/third-party/yum-7.4.20/spec/spec_helper.rb b/cookbooks/yum/spec/spec_helper.rb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/spec/spec_helper.rb
rename to cookbooks/yum/spec/spec_helper.rb
diff --git a/cookbooks/third-party/yum-7.4.20/spec/unit/recipes/default_spec.rb b/cookbooks/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/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/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/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/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/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/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/yum/spec/unit/resources/test_globalconfig_two_spec.rb
diff --git a/cookbooks/third-party/yum-7.4.20/templates/main.erb b/cookbooks/yum/templates/main.erb
similarity index 100%
rename from cookbooks/third-party/yum-7.4.20/templates/main.erb
rename to cookbooks/yum/templates/main.erb
diff --git a/cookbooks/third-party/yum-7.4.20/test/cookbooks/test/metadata.rb b/cookbooks/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/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/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/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/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/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/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/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/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/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/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/yum/test/integration/dnf_module/inspec/module_spec.rb
diff --git a/tox.ini b/tox.ini
index c5b7cb6c57..b8c894be35 100644
--- a/tox.ini
+++ b/tox.ini
@@ -185,7 +185,12 @@ commands =
     semgrep \
         --config p/r2c-security-audit \
         --config p/secrets \
-        --exclude 'cookbooks/third-party/**' \
+        --exclude 'cookbooks/iptables/**' \
+        --exclude 'cookbooks/line/**' \
+        --exclude 'cookbooks/nfs/**' \
+        --exclude 'cookbooks/openssh/**' \
+        --exclude 'cookbooks/yum/**' \
+        --exclude 'cookbooks/yum-epel/**' \
         --exclude 'files/default/jq-*' \
         --exclude 'files/default/*.tar.gz' \
         --error