diff --git a/tests/chocolatey-tests/choco-apikey.Tests.ps1 b/tests/chocolatey-tests/commands/choco-apikey.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/choco-apikey.Tests.ps1
rename to tests/chocolatey-tests/commands/choco-apikey.Tests.ps1
diff --git a/tests/chocolatey-tests/choco-config.Tests.ps1 b/tests/chocolatey-tests/commands/choco-config.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/choco-config.Tests.ps1
rename to tests/chocolatey-tests/commands/choco-config.Tests.ps1
diff --git a/tests/chocolatey-tests/choco-deprecated.Tests.ps1 b/tests/chocolatey-tests/commands/choco-deprecated.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/choco-deprecated.Tests.ps1
rename to tests/chocolatey-tests/commands/choco-deprecated.Tests.ps1
diff --git a/tests/chocolatey-tests/choco-export.Tests.ps1 b/tests/chocolatey-tests/commands/choco-export.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/choco-export.Tests.ps1
rename to tests/chocolatey-tests/commands/choco-export.Tests.ps1
diff --git a/tests/chocolatey-tests/choco-feature.Tests.ps1 b/tests/chocolatey-tests/commands/choco-feature.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/choco-feature.Tests.ps1
rename to tests/chocolatey-tests/commands/choco-feature.Tests.ps1
diff --git a/tests/chocolatey-tests/choco-help.Tests.ps1 b/tests/chocolatey-tests/commands/choco-help.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/choco-help.Tests.ps1
rename to tests/chocolatey-tests/commands/choco-help.Tests.ps1
diff --git a/tests/chocolatey-tests/choco-info.Tests.ps1 b/tests/chocolatey-tests/commands/choco-info.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/choco-info.Tests.ps1
rename to tests/chocolatey-tests/commands/choco-info.Tests.ps1
diff --git a/tests/chocolatey-tests/choco-install.Tests.ps1 b/tests/chocolatey-tests/commands/choco-install.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/choco-install.Tests.ps1
rename to tests/chocolatey-tests/commands/choco-install.Tests.ps1
diff --git a/tests/chocolatey-tests/choco-list.Tests.ps1 b/tests/chocolatey-tests/commands/choco-list.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/choco-list.Tests.ps1
rename to tests/chocolatey-tests/commands/choco-list.Tests.ps1
diff --git a/tests/chocolatey-tests/choco-new.Tests.ps1 b/tests/chocolatey-tests/commands/choco-new.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/choco-new.Tests.ps1
rename to tests/chocolatey-tests/commands/choco-new.Tests.ps1
diff --git a/tests/chocolatey-tests/choco-outdated.Tests.ps1 b/tests/chocolatey-tests/commands/choco-outdated.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/choco-outdated.Tests.ps1
rename to tests/chocolatey-tests/commands/choco-outdated.Tests.ps1
diff --git a/tests/chocolatey-tests/choco-pack.Tests.ps1 b/tests/chocolatey-tests/commands/choco-pack.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/choco-pack.Tests.ps1
rename to tests/chocolatey-tests/commands/choco-pack.Tests.ps1
diff --git a/tests/chocolatey-tests/choco-pin.Tests.ps1 b/tests/chocolatey-tests/commands/choco-pin.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/choco-pin.Tests.ps1
rename to tests/chocolatey-tests/commands/choco-pin.Tests.ps1
diff --git a/tests/chocolatey-tests/choco-push.Tests.ps1 b/tests/chocolatey-tests/commands/choco-push.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/choco-push.Tests.ps1
rename to tests/chocolatey-tests/commands/choco-push.Tests.ps1
diff --git a/tests/chocolatey-tests/choco-removed.Tests.ps1 b/tests/chocolatey-tests/commands/choco-removed.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/choco-removed.Tests.ps1
rename to tests/chocolatey-tests/commands/choco-removed.Tests.ps1
diff --git a/tests/chocolatey-tests/choco-source.Tests.ps1 b/tests/chocolatey-tests/commands/choco-source.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/choco-source.Tests.ps1
rename to tests/chocolatey-tests/commands/choco-source.Tests.ps1
diff --git a/tests/chocolatey-tests/choco-template.Tests.ps1 b/tests/chocolatey-tests/commands/choco-template.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/choco-template.Tests.ps1
rename to tests/chocolatey-tests/commands/choco-template.Tests.ps1
diff --git a/tests/chocolatey-tests/choco-uninstall.Tests.ps1 b/tests/chocolatey-tests/commands/choco-uninstall.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/choco-uninstall.Tests.ps1
rename to tests/chocolatey-tests/commands/choco-uninstall.Tests.ps1
diff --git a/tests/chocolatey-tests/choco-upgrade.Tests.ps1 b/tests/chocolatey-tests/commands/choco-upgrade.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/choco-upgrade.Tests.ps1
rename to tests/chocolatey-tests/commands/choco-upgrade.Tests.ps1
diff --git a/tests/chocolatey-tests/choco-version.Tests.ps1 b/tests/chocolatey-tests/commands/choco-version.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/choco-version.Tests.ps1
rename to tests/chocolatey-tests/commands/choco-version.Tests.ps1
diff --git a/tests/chocolatey-tests/testnuspecs/basic-dependencies/basic-dependencies.nuspec b/tests/chocolatey-tests/commands/testnuspecs/basic-dependencies/basic-dependencies.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/basic-dependencies/basic-dependencies.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/basic-dependencies/basic-dependencies.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/basic/basic.nuspec b/tests/chocolatey-tests/commands/testnuspecs/basic/basic.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/basic/basic.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/basic/basic.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/basic/tools/purpose.txt b/tests/chocolatey-tests/commands/testnuspecs/basic/tools/purpose.txt
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/basic/tools/purpose.txt
rename to tests/chocolatey-tests/commands/testnuspecs/basic/tools/purpose.txt
diff --git a/tests/chocolatey-tests/testnuspecs/cdata/cdata.nuspec b/tests/chocolatey-tests/commands/testnuspecs/cdata/cdata.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/cdata/cdata.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/cdata/cdata.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/description-long.nuspec b/tests/chocolatey-tests/commands/testnuspecs/description-long.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/description-long.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/description-long.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/empty-requireLicenseAcceptance.nuspec b/tests/chocolatey-tests/commands/testnuspecs/empty-requireLicenseAcceptance.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/empty-requireLicenseAcceptance.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/empty-requireLicenseAcceptance.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/empty.nuspec b/tests/chocolatey-tests/commands/testnuspecs/empty.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/empty.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/empty.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/forward-slash/forward-slash.nuspec b/tests/chocolatey-tests/commands/testnuspecs/forward-slash/forward-slash.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/forward-slash/forward-slash.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/forward-slash/forward-slash.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/forward-slash/tools/purpose.txt b/tests/chocolatey-tests/commands/testnuspecs/forward-slash/tools/purpose.txt
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/forward-slash/tools/purpose.txt
rename to tests/chocolatey-tests/commands/testnuspecs/forward-slash/tools/purpose.txt
diff --git a/tests/chocolatey-tests/testnuspecs/full/full.nuspec b/tests/chocolatey-tests/commands/testnuspecs/full/full.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/full/full.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/full/full.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/full/tools/purpose.txt b/tests/chocolatey-tests/commands/testnuspecs/full/tools/purpose.txt
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/full/tools/purpose.txt
rename to tests/chocolatey-tests/commands/testnuspecs/full/tools/purpose.txt
diff --git a/tests/chocolatey-tests/testnuspecs/invalid-bugtrackerurl.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-bugtrackerurl.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/invalid-bugtrackerurl.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/invalid-bugtrackerurl.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/invalid-character-and.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-character-and.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/invalid-character-and.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/invalid-character-and.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/invalid-character-lesser.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-character-lesser.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/invalid-character-lesser.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/invalid-character-lesser.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/invalid-docsurl.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-docsurl.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/invalid-docsurl.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/invalid-docsurl.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/invalid-iconurl.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-iconurl.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/invalid-iconurl.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/invalid-iconurl.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/invalid-id.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-id.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/invalid-id.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/invalid-id.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/invalid-licenseUrl.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-licenseUrl.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/invalid-licenseUrl.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/invalid-licenseUrl.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/invalid-mailinglisturl.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-mailinglisturl.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/invalid-mailinglisturl.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/invalid-mailinglisturl.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/invalid-no-content.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-no-content.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/invalid-no-content.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/invalid-no-content.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/invalid-projectsourceurl.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-projectsourceurl.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/invalid-projectsourceurl.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/invalid-projectsourceurl.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/invalid-projecturl.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-projecturl.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/invalid-projecturl.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/invalid-projecturl.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/invalid-requireLicenseAcceptance.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-requireLicenseAcceptance.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/invalid-requireLicenseAcceptance.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/invalid-requireLicenseAcceptance.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/invalid-version.nuspec b/tests/chocolatey-tests/commands/testnuspecs/invalid-version.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/invalid-version.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/invalid-version.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/missing.nuspec b/tests/chocolatey-tests/commands/testnuspecs/missing.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/missing.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/missing.nuspec
diff --git a/tests/chocolatey-tests/testnuspecs/required.nuspec b/tests/chocolatey-tests/commands/testnuspecs/required.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testnuspecs/required.nuspec
rename to tests/chocolatey-tests/commands/testnuspecs/required.nuspec
diff --git a/tests/chocolatey-tests/testpackages/.gitignore b/tests/chocolatey-tests/commands/testpackages/.gitignore
similarity index 100%
rename from tests/chocolatey-tests/testpackages/.gitignore
rename to tests/chocolatey-tests/commands/testpackages/.gitignore
diff --git a/tests/chocolatey-tests/testpackages/chocolatey-dummy-package/1.0.0/chocolatey-dummy-package.nuspec b/tests/chocolatey-tests/commands/testpackages/chocolatey-dummy-package/1.0.0/chocolatey-dummy-package.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testpackages/chocolatey-dummy-package/1.0.0/chocolatey-dummy-package.nuspec
rename to tests/chocolatey-tests/commands/testpackages/chocolatey-dummy-package/1.0.0/chocolatey-dummy-package.nuspec
diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/installpackage.nuspec b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/installpackage.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/installpackage.nuspec
rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/installpackage.nuspec
diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/Casemismatch.exe.ignore b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/Casemismatch.exe.ignore
similarity index 100%
rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/Casemismatch.exe.ignore
rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/Casemismatch.exe.ignore
diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/casemismatch.exe b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/casemismatch.exe
similarity index 100%
rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/casemismatch.exe
rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/casemismatch.exe
diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/chocolateyBeforeModify.ps1 b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyBeforeModify.ps1
similarity index 100%
rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/chocolateyBeforeModify.ps1
rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyBeforeModify.ps1
diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/chocolateyinstall.ps1 b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyinstall.ps1
similarity index 100%
rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/chocolateyinstall.ps1
rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyinstall.ps1
diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/chocolateyuninstall.ps1 b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyuninstall.ps1
similarity index 100%
rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/chocolateyuninstall.ps1
rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyuninstall.ps1
diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/console.exe b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/console.exe
similarity index 100%
rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/console.exe
rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/console.exe
diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/graphical.exe b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/graphical.exe
similarity index 100%
rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/graphical.exe
rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/graphical.exe
diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/graphical.exe.gui b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/graphical.exe.gui
similarity index 100%
rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/graphical.exe.gui
rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/graphical.exe.gui
diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/not.installed.exe b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/not.installed.exe
similarity index 100%
rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/not.installed.exe
rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/not.installed.exe
diff --git a/tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/not.installed.exe.ignore b/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/not.installed.exe.ignore
similarity index 100%
rename from tests/chocolatey-tests/testpackages/installpackage/1.0.0/tools/not.installed.exe.ignore
rename to tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/not.installed.exe.ignore
diff --git a/tests/chocolatey-tests/testpackages/too-long-description/1.0.0/too-long-description.nuspec b/tests/chocolatey-tests/commands/testpackages/too-long-description/1.0.0/too-long-description.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testpackages/too-long-description/1.0.0/too-long-description.nuspec
rename to tests/chocolatey-tests/commands/testpackages/too-long-description/1.0.0/too-long-description.nuspec
diff --git a/tests/chocolatey-tests/testpackages/too-long-title/1.0.0/too-long-title.nuspec b/tests/chocolatey-tests/commands/testpackages/too-long-title/1.0.0/too-long-title.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testpackages/too-long-title/1.0.0/too-long-title.nuspec
rename to tests/chocolatey-tests/commands/testpackages/too-long-title/1.0.0/too-long-title.nuspec
diff --git a/tests/chocolatey-tests/testpackages/zip-log-disable-test/tools/chocolateyinstall.ps1 b/tests/chocolatey-tests/commands/testpackages/zip-log-disable-test/tools/chocolateyinstall.ps1
similarity index 100%
rename from tests/chocolatey-tests/testpackages/zip-log-disable-test/tools/chocolateyinstall.ps1
rename to tests/chocolatey-tests/commands/testpackages/zip-log-disable-test/tools/chocolateyinstall.ps1
diff --git a/tests/chocolatey-tests/testpackages/zip-log-disable-test/tools/zip-log-disable-test.zip b/tests/chocolatey-tests/commands/testpackages/zip-log-disable-test/tools/zip-log-disable-test.zip
similarity index 100%
rename from tests/chocolatey-tests/testpackages/zip-log-disable-test/tools/zip-log-disable-test.zip
rename to tests/chocolatey-tests/commands/testpackages/zip-log-disable-test/tools/zip-log-disable-test.zip
diff --git a/tests/chocolatey-tests/testpackages/zip-log-disable-test/zip-log-disable-test.nuspec b/tests/chocolatey-tests/commands/testpackages/zip-log-disable-test/zip-log-disable-test.nuspec
similarity index 100%
rename from tests/chocolatey-tests/testpackages/zip-log-disable-test/zip-log-disable-test.nuspec
rename to tests/chocolatey-tests/commands/testpackages/zip-log-disable-test/zip-log-disable-test.nuspec
diff --git a/tests/chocolatey-tests/Hooks.Tests.ps1 b/tests/chocolatey-tests/features/Hooks.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/Hooks.Tests.ps1
rename to tests/chocolatey-tests/features/Hooks.Tests.ps1
diff --git a/tests/chocolatey-tests/PythonSource.Tests.ps1 b/tests/chocolatey-tests/features/PythonSource.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/PythonSource.Tests.ps1
rename to tests/chocolatey-tests/features/PythonSource.Tests.ps1