diff --git a/Library/Homebrew/cask/all.rb b/Library/Homebrew/cask/all.rb
new file mode 100644
index 0000000000000000000000000000000000000000..1fe92d5ab2e04b5d1c3ebd27ac4d0874e9024427
--- /dev/null
+++ b/Library/Homebrew/cask/all.rb
@@ -0,0 +1,21 @@
+require "hardware"
+
+require "cask/artifact"
+require "cask/audit"
+require "cask/auditor"
+require "cask/cache"
+require "cask/cask"
+require "cask/cask_loader"
+require "cask/caskroom"
+require "cask/checkable"
+require "cask/cli"
+require "cask/cask_dependencies"
+require "cask/exceptions"
+require "cask/installer"
+require "cask/macos"
+require "cask/pkg"
+require "cask/staged"
+require "cask/topological_hash"
+require "cask/utils"
+require "cask/verify"
+require "cask/version"
diff --git a/Library/Homebrew/cask/artifact.rb b/Library/Homebrew/cask/artifact.rb
new file mode 100644
index 0000000000000000000000000000000000000000..f50249116af9223dda59b9c276fe94a8c080f4be
--- /dev/null
+++ b/Library/Homebrew/cask/artifact.rb
@@ -0,0 +1,28 @@
+require "cask/artifact/app"
+require "cask/artifact/artifact" # generic 'artifact' stanza
+require "cask/artifact/binary"
+require "cask/artifact/colorpicker"
+require "cask/artifact/dictionary"
+require "cask/artifact/font"
+require "cask/artifact/input_method"
+require "cask/artifact/installer"
+require "cask/artifact/internet_plugin"
+require "cask/artifact/audio_unit_plugin"
+require "cask/artifact/vst_plugin"
+require "cask/artifact/vst3_plugin"
+require "cask/artifact/pkg"
+require "cask/artifact/postflight_block"
+require "cask/artifact/preflight_block"
+require "cask/artifact/prefpane"
+require "cask/artifact/qlplugin"
+require "cask/artifact/screen_saver"
+require "cask/artifact/service"
+require "cask/artifact/stage_only"
+require "cask/artifact/suite"
+require "cask/artifact/uninstall"
+require "cask/artifact/zap"
+
+module Hbc
+ module Artifact
+ end
+end
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/abstract_artifact.rb b/Library/Homebrew/cask/artifact/abstract_artifact.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/artifact/abstract_artifact.rb
rename to Library/Homebrew/cask/artifact/abstract_artifact.rb
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/abstract_flight_block.rb b/Library/Homebrew/cask/artifact/abstract_flight_block.rb
similarity index 96%
rename from Library/Homebrew/cask/lib/hbc/artifact/abstract_flight_block.rb
rename to Library/Homebrew/cask/artifact/abstract_flight_block.rb
index aa5b959401f90868b0af1c1f94d6bb6ac12d924d..ae4d1451ca8f7547049a894cdf57dcdb41905a06 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/abstract_flight_block.rb
+++ b/Library/Homebrew/cask/artifact/abstract_flight_block.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/abstract_artifact"
+require "cask/artifact/abstract_artifact"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/abstract_uninstall.rb b/Library/Homebrew/cask/artifact/abstract_uninstall.rb
similarity index 99%
rename from Library/Homebrew/cask/lib/hbc/artifact/abstract_uninstall.rb
rename to Library/Homebrew/cask/artifact/abstract_uninstall.rb
index 6e03d62a75f039d604c715b2438dfb9a4dd1d351..d15f078262c0b853aab6297b63f29fd25e87f753 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/abstract_uninstall.rb
+++ b/Library/Homebrew/cask/artifact/abstract_uninstall.rb
@@ -1,6 +1,6 @@
require "timeout"
-require "hbc/artifact/abstract_artifact"
+require "cask/artifact/abstract_artifact"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/app.rb b/Library/Homebrew/cask/artifact/app.rb
similarity index 70%
rename from Library/Homebrew/cask/lib/hbc/artifact/app.rb
rename to Library/Homebrew/cask/artifact/app.rb
index cc6ef61a731d33be9943855b8dd9a7116406a6c7..eb189fea4e5fc0cf257f4b8329f0eae421ea5c93 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/app.rb
+++ b/Library/Homebrew/cask/artifact/app.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/artifact.rb b/Library/Homebrew/cask/artifact/artifact.rb
similarity index 96%
rename from Library/Homebrew/cask/lib/hbc/artifact/artifact.rb
rename to Library/Homebrew/cask/artifact/artifact.rb
index f61e9970192673bcd80582621e55c368b6af13c8..51f8386819fdc3805e6297f046dd8ca04b485846 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/artifact.rb
+++ b/Library/Homebrew/cask/artifact/artifact.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
require "extend/hash_validator"
using HashValidator
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/audio_unit_plugin.rb b/Library/Homebrew/cask/artifact/audio_unit_plugin.rb
similarity index 73%
rename from Library/Homebrew/cask/lib/hbc/artifact/audio_unit_plugin.rb
rename to Library/Homebrew/cask/artifact/audio_unit_plugin.rb
index 3bad78073b69a4a71c74029ada37a6f79a716f0d..79fac1b3a5d4938cdf72b8514483b91feb2bf64b 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/audio_unit_plugin.rb
+++ b/Library/Homebrew/cask/artifact/audio_unit_plugin.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/binary.rb b/Library/Homebrew/cask/artifact/binary.rb
similarity index 91%
rename from Library/Homebrew/cask/lib/hbc/artifact/binary.rb
rename to Library/Homebrew/cask/artifact/binary.rb
index 68f4b074dabb2dc329dd63a13aa9fb2e86cb0976..ad059f77709c1c020e76c1143253262ee0d89f46 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/binary.rb
+++ b/Library/Homebrew/cask/artifact/binary.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/symlinked"
+require "cask/artifact/symlinked"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/colorpicker.rb b/Library/Homebrew/cask/artifact/colorpicker.rb
similarity index 72%
rename from Library/Homebrew/cask/lib/hbc/artifact/colorpicker.rb
rename to Library/Homebrew/cask/artifact/colorpicker.rb
index a866e64a5fccfca9863203d5b2f45a951bc84983..1e1adbcea2b4c2c5c27913ba301d9edc28af29a7 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/colorpicker.rb
+++ b/Library/Homebrew/cask/artifact/colorpicker.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/dictionary.rb b/Library/Homebrew/cask/artifact/dictionary.rb
similarity index 71%
rename from Library/Homebrew/cask/lib/hbc/artifact/dictionary.rb
rename to Library/Homebrew/cask/artifact/dictionary.rb
index e017992f021dd4165f183848eca103df1e00d133..4ac499738e04ddfbdd27896c7e8e377e89de3831 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/dictionary.rb
+++ b/Library/Homebrew/cask/artifact/dictionary.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/font.rb b/Library/Homebrew/cask/artifact/font.rb
similarity index 70%
rename from Library/Homebrew/cask/lib/hbc/artifact/font.rb
rename to Library/Homebrew/cask/artifact/font.rb
index 5c64869b6db962da4fac6d10815d3c8640c30f46..81e6f436be32d4c99e3d83a140efbcfadefa9076 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/font.rb
+++ b/Library/Homebrew/cask/artifact/font.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/input_method.rb b/Library/Homebrew/cask/artifact/input_method.rb
similarity index 72%
rename from Library/Homebrew/cask/lib/hbc/artifact/input_method.rb
rename to Library/Homebrew/cask/artifact/input_method.rb
index 0eb75a6c02aea3383be9455cb33849c743811605..444b8238d3f175e4e3ba54d1e9fe22cd628aee52 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/input_method.rb
+++ b/Library/Homebrew/cask/artifact/input_method.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/installer.rb b/Library/Homebrew/cask/artifact/installer.rb
similarity index 98%
rename from Library/Homebrew/cask/lib/hbc/artifact/installer.rb
rename to Library/Homebrew/cask/artifact/installer.rb
index 55102b1432852d6c3163c56024c088a4e8901598..8c1e72295b54939529348c16a63c74465b0613dc 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/installer.rb
+++ b/Library/Homebrew/cask/artifact/installer.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/abstract_artifact"
+require "cask/artifact/abstract_artifact"
require "extend/hash_validator"
using HashValidator
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/internet_plugin.rb b/Library/Homebrew/cask/artifact/internet_plugin.rb
similarity index 72%
rename from Library/Homebrew/cask/lib/hbc/artifact/internet_plugin.rb
rename to Library/Homebrew/cask/artifact/internet_plugin.rb
index ab8586d69978a89d819e227e0160fbfde1412647..2f232874cd4724243f804483f9949240fd244467 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/internet_plugin.rb
+++ b/Library/Homebrew/cask/artifact/internet_plugin.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/moved.rb b/Library/Homebrew/cask/artifact/moved.rb
similarity index 98%
rename from Library/Homebrew/cask/lib/hbc/artifact/moved.rb
rename to Library/Homebrew/cask/artifact/moved.rb
index 88323f7177ce4b88fcb36a3dc401df8fcc97ddbf..a3730bfc5590207a3e8667fbcd690003cbf009f2 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/moved.rb
+++ b/Library/Homebrew/cask/artifact/moved.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/relocated"
+require "cask/artifact/relocated"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/pkg.rb b/Library/Homebrew/cask/artifact/pkg.rb
similarity index 98%
rename from Library/Homebrew/cask/lib/hbc/artifact/pkg.rb
rename to Library/Homebrew/cask/artifact/pkg.rb
index 81b6e4d11612ad810386150f977fb89f3274293f..21f9280c46404d2f2075ba651927077743247a5e 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/pkg.rb
+++ b/Library/Homebrew/cask/artifact/pkg.rb
@@ -1,6 +1,6 @@
require "vendor/plist/plist"
-require "hbc/artifact/abstract_artifact"
+require "cask/artifact/abstract_artifact"
require "extend/hash_validator"
using HashValidator
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/postflight_block.rb b/Library/Homebrew/cask/artifact/postflight_block.rb
similarity index 67%
rename from Library/Homebrew/cask/lib/hbc/artifact/postflight_block.rb
rename to Library/Homebrew/cask/artifact/postflight_block.rb
index bfe218f958a9c52421bf42bdfb7c3e6edafd317d..923334356118962a33254f9186314ddd8a323f88 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/postflight_block.rb
+++ b/Library/Homebrew/cask/artifact/postflight_block.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/abstract_flight_block"
+require "cask/artifact/abstract_flight_block"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/preflight_block.rb b/Library/Homebrew/cask/artifact/preflight_block.rb
similarity index 67%
rename from Library/Homebrew/cask/lib/hbc/artifact/preflight_block.rb
rename to Library/Homebrew/cask/artifact/preflight_block.rb
index 35142df47d93d855f77c4fe02f43567719557bc8..80356bdd4453d0474a31c239181a473fc57b68ff 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/preflight_block.rb
+++ b/Library/Homebrew/cask/artifact/preflight_block.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/abstract_flight_block"
+require "cask/artifact/abstract_flight_block"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/prefpane.rb b/Library/Homebrew/cask/artifact/prefpane.rb
similarity index 82%
rename from Library/Homebrew/cask/lib/hbc/artifact/prefpane.rb
rename to Library/Homebrew/cask/artifact/prefpane.rb
index 87f120934d1337c5d0e8aa8779b6ad195680d5b6..ca06a0407c87e3f4ff41084a53b23eb7919e0d15 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/prefpane.rb
+++ b/Library/Homebrew/cask/artifact/prefpane.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/qlplugin.rb b/Library/Homebrew/cask/artifact/qlplugin.rb
similarity index 94%
rename from Library/Homebrew/cask/lib/hbc/artifact/qlplugin.rb
rename to Library/Homebrew/cask/artifact/qlplugin.rb
index 298714d894bf5b2b6f87463e2d95b24b87388371..0a5766e4b85d6c734c3ef0b95a63432d3a9131b8 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/qlplugin.rb
+++ b/Library/Homebrew/cask/artifact/qlplugin.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/relocated.rb b/Library/Homebrew/cask/artifact/relocated.rb
similarity index 98%
rename from Library/Homebrew/cask/lib/hbc/artifact/relocated.rb
rename to Library/Homebrew/cask/artifact/relocated.rb
index b9d897983bd95cd4639f06a9f40529c9bb7d88e9..ae3be9eebbe2ee734aa1755d3fc4921ac62ba714 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/relocated.rb
+++ b/Library/Homebrew/cask/artifact/relocated.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/abstract_artifact"
+require "cask/artifact/abstract_artifact"
require "extend/hash_validator"
using HashValidator
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/screen_saver.rb b/Library/Homebrew/cask/artifact/screen_saver.rb
similarity index 72%
rename from Library/Homebrew/cask/lib/hbc/artifact/screen_saver.rb
rename to Library/Homebrew/cask/artifact/screen_saver.rb
index 4cdc6037c5e9151681c66992e2b7fd05b435d0b5..5526f6dcd1d807c048f71dadb6c907fe03d61af2 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/screen_saver.rb
+++ b/Library/Homebrew/cask/artifact/screen_saver.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/service.rb b/Library/Homebrew/cask/artifact/service.rb
similarity index 71%
rename from Library/Homebrew/cask/lib/hbc/artifact/service.rb
rename to Library/Homebrew/cask/artifact/service.rb
index 1af93c53343b4cd8ca894687b588b2f18a3432e3..b92c99efdd2263ac9e9031a745fa916407da49a3 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/service.rb
+++ b/Library/Homebrew/cask/artifact/service.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/stage_only.rb b/Library/Homebrew/cask/artifact/stage_only.rb
similarity index 90%
rename from Library/Homebrew/cask/lib/hbc/artifact/stage_only.rb
rename to Library/Homebrew/cask/artifact/stage_only.rb
index 8c32a52d08b5162a30a1815d87f7f2b07d207f0f..1da1ceff6e5238497fdff0f9ae5fb5ac544fd0cc 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/stage_only.rb
+++ b/Library/Homebrew/cask/artifact/stage_only.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/abstract_artifact"
+require "cask/artifact/abstract_artifact"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/suite.rb b/Library/Homebrew/cask/artifact/suite.rb
similarity index 85%
rename from Library/Homebrew/cask/lib/hbc/artifact/suite.rb
rename to Library/Homebrew/cask/artifact/suite.rb
index 59ae58cf1318e41cd26c376e03866124c3b8ecac..b8a6011d77a79d0f52cdbf4d498d0c5aa644bd7e 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/suite.rb
+++ b/Library/Homebrew/cask/artifact/suite.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/symlinked.rb b/Library/Homebrew/cask/artifact/symlinked.rb
similarity index 98%
rename from Library/Homebrew/cask/lib/hbc/artifact/symlinked.rb
rename to Library/Homebrew/cask/artifact/symlinked.rb
index 5146a8ddb7896d528676de82c6133534624650ea..690fb7648792f887bd5b81335b53b465461027e3 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/symlinked.rb
+++ b/Library/Homebrew/cask/artifact/symlinked.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/relocated"
+require "cask/artifact/relocated"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/uninstall.rb b/Library/Homebrew/cask/artifact/uninstall.rb
similarity index 81%
rename from Library/Homebrew/cask/lib/hbc/artifact/uninstall.rb
rename to Library/Homebrew/cask/artifact/uninstall.rb
index 2bbf82862a068aea7fff2807cdcf524f27c0d394..41e8fd9d5b60cd6a430eec31c636a03f3049a3ee 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/uninstall.rb
+++ b/Library/Homebrew/cask/artifact/uninstall.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/abstract_uninstall"
+require "cask/artifact/abstract_uninstall"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/vst3_plugin.rb b/Library/Homebrew/cask/artifact/vst3_plugin.rb
similarity index 71%
rename from Library/Homebrew/cask/lib/hbc/artifact/vst3_plugin.rb
rename to Library/Homebrew/cask/artifact/vst3_plugin.rb
index 056fffc2a994f076775a23e6a5ae616b7517f544..96ad48fe51af1667ce8a099d320ac2c2c511d5a7 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/vst3_plugin.rb
+++ b/Library/Homebrew/cask/artifact/vst3_plugin.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/vst_plugin.rb b/Library/Homebrew/cask/artifact/vst_plugin.rb
similarity index 71%
rename from Library/Homebrew/cask/lib/hbc/artifact/vst_plugin.rb
rename to Library/Homebrew/cask/artifact/vst_plugin.rb
index f388046359f1dea9b3e2597f5db5ec0b1f30b31d..e8e891e34acec36ec20e30125b09ed0edd1bfa0d 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/vst_plugin.rb
+++ b/Library/Homebrew/cask/artifact/vst_plugin.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/moved"
+require "cask/artifact/moved"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/artifact/zap.rb b/Library/Homebrew/cask/artifact/zap.rb
similarity index 80%
rename from Library/Homebrew/cask/lib/hbc/artifact/zap.rb
rename to Library/Homebrew/cask/artifact/zap.rb
index 31ff54d2014e2d27d6f13204b48a571551a4c8d6..057f5dd6cf7d26a07e31203efbc0f816b2db571b 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/zap.rb
+++ b/Library/Homebrew/cask/artifact/zap.rb
@@ -1,4 +1,4 @@
-require "hbc/artifact/abstract_uninstall"
+require "cask/artifact/abstract_uninstall"
module Hbc
module Artifact
diff --git a/Library/Homebrew/cask/lib/hbc/audit.rb b/Library/Homebrew/cask/audit.rb
similarity index 99%
rename from Library/Homebrew/cask/lib/hbc/audit.rb
rename to Library/Homebrew/cask/audit.rb
index 2f596f0d108feec137ee0e6cf38d6e9db4cabafc..ec7def3952b18dfcb8ff8f628fd08950cc971a45 100644
--- a/Library/Homebrew/cask/lib/hbc/audit.rb
+++ b/Library/Homebrew/cask/audit.rb
@@ -1,5 +1,5 @@
-require "hbc/checkable"
-require "hbc/download"
+require "cask/checkable"
+require "cask/download"
require "digest"
require "utils/git"
diff --git a/Library/Homebrew/cask/lib/hbc/auditor.rb b/Library/Homebrew/cask/auditor.rb
similarity index 98%
rename from Library/Homebrew/cask/lib/hbc/auditor.rb
rename to Library/Homebrew/cask/auditor.rb
index 7eb8715008aa82b695be612a67dd45355cc948be..014accd3d481ad3595c82ab064fff51da948de46 100644
--- a/Library/Homebrew/cask/lib/hbc/auditor.rb
+++ b/Library/Homebrew/cask/auditor.rb
@@ -1,4 +1,4 @@
-require "hbc/download"
+require "cask/download"
module Hbc
class Auditor
diff --git a/Library/Homebrew/cask/lib/hbc/cache.rb b/Library/Homebrew/cask/cache.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cache.rb
rename to Library/Homebrew/cask/cache.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cask.rb b/Library/Homebrew/cask/cask.rb
similarity index 97%
rename from Library/Homebrew/cask/lib/hbc/cask.rb
rename to Library/Homebrew/cask/cask.rb
index b289fa8bde888fbf755142624ad43256602118de..c951dbde0e333a48b19482306943bd5e018b76e3 100644
--- a/Library/Homebrew/cask/lib/hbc/cask.rb
+++ b/Library/Homebrew/cask/cask.rb
@@ -1,7 +1,7 @@
-require "hbc/cask_loader"
-require "hbc/config"
-require "hbc/dsl"
-require "hbc/metadata"
+require "cask/cask_loader"
+require "cask/config"
+require "cask/dsl"
+require "cask/metadata"
require "searchable"
module Hbc
diff --git a/Library/Homebrew/cask/lib/hbc/cask_dependencies.rb b/Library/Homebrew/cask/cask_dependencies.rb
similarity index 96%
rename from Library/Homebrew/cask/lib/hbc/cask_dependencies.rb
rename to Library/Homebrew/cask/cask_dependencies.rb
index 0edda074e3498037997caa2dd87499b5eb62b532..7e838d1457ea33bfac57c43dde795c738087b99d 100644
--- a/Library/Homebrew/cask/lib/hbc/cask_dependencies.rb
+++ b/Library/Homebrew/cask/cask_dependencies.rb
@@ -1,6 +1,6 @@
require "delegate"
-require "hbc/topological_hash"
+require "cask/topological_hash"
module Hbc
class CaskDependencies < DelegateClass(Array)
diff --git a/Library/Homebrew/cask/lib/hbc/cask_loader.rb b/Library/Homebrew/cask/cask_loader.rb
similarity index 99%
rename from Library/Homebrew/cask/lib/hbc/cask_loader.rb
rename to Library/Homebrew/cask/cask_loader.rb
index abbde664eb83dd54ea26a659a740e5bcca1ed3e2..c64c60e3fc916c3d58e068617cf334387c6d70b9 100644
--- a/Library/Homebrew/cask/lib/hbc/cask_loader.rb
+++ b/Library/Homebrew/cask/cask_loader.rb
@@ -1,4 +1,4 @@
-require "hbc/cask"
+require "cask/cask"
require "uri"
module Hbc
diff --git a/Library/Homebrew/cask/lib/hbc/caskroom.rb b/Library/Homebrew/cask/caskroom.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/caskroom.rb
rename to Library/Homebrew/cask/caskroom.rb
diff --git a/Library/Homebrew/cask/lib/hbc/checkable.rb b/Library/Homebrew/cask/checkable.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/checkable.rb
rename to Library/Homebrew/cask/checkable.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli.rb b/Library/Homebrew/cask/cli.rb
similarity index 91%
rename from Library/Homebrew/cask/lib/hbc/cli.rb
rename to Library/Homebrew/cask/cli.rb
index 34e9d6904ab45453c6acaa4c97b77d670238736f..ee2176761d728e9df2ca5cab6b495772eef04fbd 100644
--- a/Library/Homebrew/cask/lib/hbc/cli.rb
+++ b/Library/Homebrew/cask/cli.rb
@@ -3,32 +3,32 @@ require "shellwords"
require "extend/optparse"
-require "hbc/config"
-
-require "hbc/cli/options"
-
-require "hbc/cli/abstract_command"
-require "hbc/cli/audit"
-require "hbc/cli/cat"
-require "hbc/cli/create"
-require "hbc/cli/doctor"
-require "hbc/cli/edit"
-require "hbc/cli/fetch"
-require "hbc/cli/home"
-require "hbc/cli/info"
-require "hbc/cli/install"
-require "hbc/cli/list"
-require "hbc/cli/outdated"
-require "hbc/cli/reinstall"
-require "hbc/cli/style"
-require "hbc/cli/uninstall"
-require "hbc/cli/upgrade"
-require "hbc/cli/--version"
-require "hbc/cli/zap"
-
-require "hbc/cli/abstract_internal_command"
-require "hbc/cli/internal_help"
-require "hbc/cli/internal_stanza"
+require "cask/config"
+
+require "cask/cli/options"
+
+require "cask/cli/abstract_command"
+require "cask/cli/audit"
+require "cask/cli/cat"
+require "cask/cli/create"
+require "cask/cli/doctor"
+require "cask/cli/edit"
+require "cask/cli/fetch"
+require "cask/cli/home"
+require "cask/cli/info"
+require "cask/cli/install"
+require "cask/cli/list"
+require "cask/cli/outdated"
+require "cask/cli/reinstall"
+require "cask/cli/style"
+require "cask/cli/uninstall"
+require "cask/cli/upgrade"
+require "cask/cli/--version"
+require "cask/cli/zap"
+
+require "cask/cli/abstract_internal_command"
+require "cask/cli/internal_help"
+require "cask/cli/internal_stanza"
module Hbc
class CLI
diff --git a/Library/Homebrew/cask/lib/hbc/cli/--version.rb b/Library/Homebrew/cask/cli/--version.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/--version.rb
rename to Library/Homebrew/cask/cli/--version.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/abstract_command.rb b/Library/Homebrew/cask/cli/abstract_command.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/abstract_command.rb
rename to Library/Homebrew/cask/cli/abstract_command.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/abstract_internal_command.rb b/Library/Homebrew/cask/cli/abstract_internal_command.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/abstract_internal_command.rb
rename to Library/Homebrew/cask/cli/abstract_internal_command.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/audit.rb b/Library/Homebrew/cask/cli/audit.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/audit.rb
rename to Library/Homebrew/cask/cli/audit.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/cat.rb b/Library/Homebrew/cask/cli/cat.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/cat.rb
rename to Library/Homebrew/cask/cli/cat.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/create.rb b/Library/Homebrew/cask/cli/create.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/create.rb
rename to Library/Homebrew/cask/cli/create.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/doctor.rb b/Library/Homebrew/cask/cli/doctor.rb
similarity index 99%
rename from Library/Homebrew/cask/lib/hbc/cli/doctor.rb
rename to Library/Homebrew/cask/cli/doctor.rb
index 8d2ec08acd2febaa0bad6b7e3fd79bf67d0e6359..c19b53b331eab10b34a83c17e6eedf25e8a7285c 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/doctor.rb
+++ b/Library/Homebrew/cask/cli/doctor.rb
@@ -1,5 +1,5 @@
require "system_config"
-require "hbc/checkable"
+require "cask/checkable"
module Hbc
class CLI
diff --git a/Library/Homebrew/cask/lib/hbc/cli/edit.rb b/Library/Homebrew/cask/cli/edit.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/edit.rb
rename to Library/Homebrew/cask/cli/edit.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/fetch.rb b/Library/Homebrew/cask/cli/fetch.rb
similarity index 96%
rename from Library/Homebrew/cask/lib/hbc/cli/fetch.rb
rename to Library/Homebrew/cask/cli/fetch.rb
index 927a3d71397553a193b134be65008ec2c67a16d4..5346d33dabbf027e468983ff265d87db7c8ef1b3 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/fetch.rb
+++ b/Library/Homebrew/cask/cli/fetch.rb
@@ -1,4 +1,4 @@
-require "hbc/download"
+require "cask/download"
module Hbc
class CLI
diff --git a/Library/Homebrew/cask/lib/hbc/cli/home.rb b/Library/Homebrew/cask/cli/home.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/home.rb
rename to Library/Homebrew/cask/cli/home.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/info.rb b/Library/Homebrew/cask/cli/info.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/info.rb
rename to Library/Homebrew/cask/cli/info.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/install.rb b/Library/Homebrew/cask/cli/install.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/install.rb
rename to Library/Homebrew/cask/cli/install.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/internal_help.rb b/Library/Homebrew/cask/cli/internal_help.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/internal_help.rb
rename to Library/Homebrew/cask/cli/internal_help.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/internal_stanza.rb b/Library/Homebrew/cask/cli/internal_stanza.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/internal_stanza.rb
rename to Library/Homebrew/cask/cli/internal_stanza.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/list.rb b/Library/Homebrew/cask/cli/list.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/list.rb
rename to Library/Homebrew/cask/cli/list.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/options.rb b/Library/Homebrew/cask/cli/options.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/options.rb
rename to Library/Homebrew/cask/cli/options.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/outdated.rb b/Library/Homebrew/cask/cli/outdated.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/outdated.rb
rename to Library/Homebrew/cask/cli/outdated.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb b/Library/Homebrew/cask/cli/reinstall.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/reinstall.rb
rename to Library/Homebrew/cask/cli/reinstall.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/style.rb b/Library/Homebrew/cask/cli/style.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/style.rb
rename to Library/Homebrew/cask/cli/style.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/uninstall.rb b/Library/Homebrew/cask/cli/uninstall.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/uninstall.rb
rename to Library/Homebrew/cask/cli/uninstall.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/upgrade.rb b/Library/Homebrew/cask/cli/upgrade.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/upgrade.rb
rename to Library/Homebrew/cask/cli/upgrade.rb
diff --git a/Library/Homebrew/cask/lib/hbc/cli/zap.rb b/Library/Homebrew/cask/cli/zap.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/cli/zap.rb
rename to Library/Homebrew/cask/cli/zap.rb
diff --git a/Library/Homebrew/cask/lib/hbc/config.rb b/Library/Homebrew/cask/config.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/config.rb
rename to Library/Homebrew/cask/config.rb
diff --git a/Library/Homebrew/cask/lib/hbc/download.rb b/Library/Homebrew/cask/download.rb
similarity index 94%
rename from Library/Homebrew/cask/lib/hbc/download.rb
rename to Library/Homebrew/cask/download.rb
index 65a44e0c7f7ccf5b71476f1dd355232a93c697fd..1446d40daec529241de589136851786f65bb9733 100644
--- a/Library/Homebrew/cask/lib/hbc/download.rb
+++ b/Library/Homebrew/cask/download.rb
@@ -1,7 +1,7 @@
require "fileutils"
-require "hbc/cache"
-require "hbc/quarantine"
-require "hbc/verify"
+require "cask/cache"
+require "cask/quarantine"
+require "cask/verify"
module Hbc
class Download
diff --git a/Library/Homebrew/cask/lib/hbc/dsl.rb b/Library/Homebrew/cask/dsl.rb
similarity index 94%
rename from Library/Homebrew/cask/lib/hbc/dsl.rb
rename to Library/Homebrew/cask/dsl.rb
index 864e6247db9890ada0bf8705cc4083a72be0bb45..eac2880d0bc238233f99fe38bbd97ccdd006392d 100644
--- a/Library/Homebrew/cask/lib/hbc/dsl.rb
+++ b/Library/Homebrew/cask/dsl.rb
@@ -1,24 +1,24 @@
require "locale"
require "lazy_object"
-require "hbc/artifact"
-
-require "hbc/caskroom"
-require "hbc/exceptions"
-
-require "hbc/dsl/appcast"
-require "hbc/dsl/base"
-require "hbc/dsl/caveats"
-require "hbc/dsl/conflicts_with"
-require "hbc/dsl/container"
-require "hbc/dsl/depends_on"
-require "hbc/dsl/postflight"
-require "hbc/dsl/preflight"
-require "hbc/dsl/uninstall_postflight"
-require "hbc/dsl/uninstall_preflight"
-require "hbc/dsl/version"
-
-require "hbc/url"
+require "cask/artifact"
+
+require "cask/caskroom"
+require "cask/exceptions"
+
+require "cask/dsl/appcast"
+require "cask/dsl/base"
+require "cask/dsl/caveats"
+require "cask/dsl/conflicts_with"
+require "cask/dsl/container"
+require "cask/dsl/depends_on"
+require "cask/dsl/postflight"
+require "cask/dsl/preflight"
+require "cask/dsl/uninstall_postflight"
+require "cask/dsl/uninstall_preflight"
+require "cask/dsl/version"
+
+require "cask/url"
module Hbc
class DSL
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/appcast.rb b/Library/Homebrew/cask/dsl/appcast.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/dsl/appcast.rb
rename to Library/Homebrew/cask/dsl/appcast.rb
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/base.rb b/Library/Homebrew/cask/dsl/base.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/dsl/base.rb
rename to Library/Homebrew/cask/dsl/base.rb
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/caveats.rb b/Library/Homebrew/cask/dsl/caveats.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/dsl/caveats.rb
rename to Library/Homebrew/cask/dsl/caveats.rb
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/conflicts_with.rb b/Library/Homebrew/cask/dsl/conflicts_with.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/dsl/conflicts_with.rb
rename to Library/Homebrew/cask/dsl/conflicts_with.rb
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/container.rb b/Library/Homebrew/cask/dsl/container.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/dsl/container.rb
rename to Library/Homebrew/cask/dsl/container.rb
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/depends_on.rb b/Library/Homebrew/cask/dsl/depends_on.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/dsl/depends_on.rb
rename to Library/Homebrew/cask/dsl/depends_on.rb
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/postflight.rb b/Library/Homebrew/cask/dsl/postflight.rb
similarity index 91%
rename from Library/Homebrew/cask/lib/hbc/dsl/postflight.rb
rename to Library/Homebrew/cask/dsl/postflight.rb
index 1026f6de60fa718a4c65a11bff775e84dd121fa2..63ce8f6318c1e826b3a43fec2ba0b137353e5dcb 100644
--- a/Library/Homebrew/cask/lib/hbc/dsl/postflight.rb
+++ b/Library/Homebrew/cask/dsl/postflight.rb
@@ -1,4 +1,4 @@
-require "hbc/staged"
+require "cask/staged"
module Hbc
class DSL
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/preflight.rb b/Library/Homebrew/cask/dsl/preflight.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/dsl/preflight.rb
rename to Library/Homebrew/cask/dsl/preflight.rb
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/uninstall_postflight.rb b/Library/Homebrew/cask/dsl/uninstall_postflight.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/dsl/uninstall_postflight.rb
rename to Library/Homebrew/cask/dsl/uninstall_postflight.rb
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/uninstall_preflight.rb b/Library/Homebrew/cask/dsl/uninstall_preflight.rb
similarity index 81%
rename from Library/Homebrew/cask/lib/hbc/dsl/uninstall_preflight.rb
rename to Library/Homebrew/cask/dsl/uninstall_preflight.rb
index 36cdec12f562f9e8f9a5a96ed1db71914fc6ec11..5e00a2790f56150e030b939ba82ff81a2c3a41ab 100644
--- a/Library/Homebrew/cask/lib/hbc/dsl/uninstall_preflight.rb
+++ b/Library/Homebrew/cask/dsl/uninstall_preflight.rb
@@ -1,4 +1,4 @@
-require "hbc/staged"
+require "cask/staged"
module Hbc
class DSL
diff --git a/Library/Homebrew/cask/lib/hbc/dsl/version.rb b/Library/Homebrew/cask/dsl/version.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/dsl/version.rb
rename to Library/Homebrew/cask/dsl/version.rb
diff --git a/Library/Homebrew/cask/lib/hbc/exceptions.rb b/Library/Homebrew/cask/exceptions.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/exceptions.rb
rename to Library/Homebrew/cask/exceptions.rb
diff --git a/Library/Homebrew/cask/lib/hbc/installer.rb b/Library/Homebrew/cask/installer.rb
similarity index 99%
rename from Library/Homebrew/cask/lib/hbc/installer.rb
rename to Library/Homebrew/cask/installer.rb
index 68d1251a79518be638117aba4fe5839e099ff1f5..52b9c340ba7d7f31ed868a26da32aade29216c4a 100644
--- a/Library/Homebrew/cask/lib/hbc/installer.rb
+++ b/Library/Homebrew/cask/installer.rb
@@ -3,11 +3,11 @@ require "rubygems"
require "formula_installer"
require "unpack_strategy"
-require "hbc/cask_dependencies"
-require "hbc/download"
-require "hbc/staged"
-require "hbc/verify"
-require "hbc/quarantine"
+require "cask/cask_dependencies"
+require "cask/download"
+require "cask/staged"
+require "cask/verify"
+require "cask/quarantine"
require "cgi"
diff --git a/Library/Homebrew/cask/lib/hbc.rb b/Library/Homebrew/cask/lib/hbc.rb
deleted file mode 100644
index 8eca3980945b25145682eb8ae4a8b01afe192b9b..0000000000000000000000000000000000000000
--- a/Library/Homebrew/cask/lib/hbc.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require "hardware"
-
-require "hbc/artifact"
-require "hbc/audit"
-require "hbc/auditor"
-require "hbc/cache"
-require "hbc/cask"
-require "hbc/cask_loader"
-require "hbc/caskroom"
-require "hbc/checkable"
-require "hbc/cli"
-require "hbc/cask_dependencies"
-require "hbc/exceptions"
-require "hbc/installer"
-require "hbc/macos"
-require "hbc/pkg"
-require "hbc/staged"
-require "hbc/topological_hash"
-require "hbc/utils"
-require "hbc/verify"
-require "hbc/version"
diff --git a/Library/Homebrew/cask/lib/hbc/artifact.rb b/Library/Homebrew/cask/lib/hbc/artifact.rb
deleted file mode 100644
index df1bc9b6a83eb79e5824ffed88d83721a6b6d3d9..0000000000000000000000000000000000000000
--- a/Library/Homebrew/cask/lib/hbc/artifact.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require "hbc/artifact/app"
-require "hbc/artifact/artifact" # generic 'artifact' stanza
-require "hbc/artifact/binary"
-require "hbc/artifact/colorpicker"
-require "hbc/artifact/dictionary"
-require "hbc/artifact/font"
-require "hbc/artifact/input_method"
-require "hbc/artifact/installer"
-require "hbc/artifact/internet_plugin"
-require "hbc/artifact/audio_unit_plugin"
-require "hbc/artifact/vst_plugin"
-require "hbc/artifact/vst3_plugin"
-require "hbc/artifact/pkg"
-require "hbc/artifact/postflight_block"
-require "hbc/artifact/preflight_block"
-require "hbc/artifact/prefpane"
-require "hbc/artifact/qlplugin"
-require "hbc/artifact/screen_saver"
-require "hbc/artifact/service"
-require "hbc/artifact/stage_only"
-require "hbc/artifact/suite"
-require "hbc/artifact/uninstall"
-require "hbc/artifact/zap"
-
-module Hbc
- module Artifact
- end
-end
diff --git a/Library/Homebrew/cask/lib/hbc/macos.rb b/Library/Homebrew/cask/macos.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/macos.rb
rename to Library/Homebrew/cask/macos.rb
diff --git a/Library/Homebrew/cask/lib/hbc/metadata.rb b/Library/Homebrew/cask/metadata.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/metadata.rb
rename to Library/Homebrew/cask/metadata.rb
diff --git a/Library/Homebrew/cask/lib/hbc/pkg.rb b/Library/Homebrew/cask/pkg.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/pkg.rb
rename to Library/Homebrew/cask/pkg.rb
diff --git a/Library/Homebrew/cask/lib/hbc/quarantine.rb b/Library/Homebrew/cask/quarantine.rb
similarity index 95%
rename from Library/Homebrew/cask/lib/hbc/quarantine.rb
rename to Library/Homebrew/cask/quarantine.rb
index 952803a68d78e2098031edf4ac247ee5d9ce80e2..c55a93e6a8c4a38fce658ef8c52e0a954ad54fed 100644
--- a/Library/Homebrew/cask/lib/hbc/quarantine.rb
+++ b/Library/Homebrew/cask/quarantine.rb
@@ -5,7 +5,7 @@ module Hbc
QUARANTINE_ATTRIBUTE = "com.apple.quarantine".freeze
- QUARANTINE_SCRIPT = (HOMEBREW_LIBRARY_PATH/"cask/lib/hbc/utils/quarantine.swift").freeze
+ QUARANTINE_SCRIPT = (HOMEBREW_LIBRARY_PATH/"cask/utils/quarantine.swift").freeze
# @private
def swift
diff --git a/Library/Homebrew/cask/lib/hbc/staged.rb b/Library/Homebrew/cask/staged.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/staged.rb
rename to Library/Homebrew/cask/staged.rb
diff --git a/Library/Homebrew/cask/lib/hbc/topological_hash.rb b/Library/Homebrew/cask/topological_hash.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/topological_hash.rb
rename to Library/Homebrew/cask/topological_hash.rb
diff --git a/Library/Homebrew/cask/lib/hbc/url.rb b/Library/Homebrew/cask/url.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/url.rb
rename to Library/Homebrew/cask/url.rb
diff --git a/Library/Homebrew/cask/lib/hbc/utils.rb b/Library/Homebrew/cask/utils.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/utils.rb
rename to Library/Homebrew/cask/utils.rb
diff --git a/Library/Homebrew/cask/lib/hbc/utils/quarantine.swift b/Library/Homebrew/cask/utils/quarantine.swift
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/utils/quarantine.swift
rename to Library/Homebrew/cask/utils/quarantine.swift
diff --git a/Library/Homebrew/cask/lib/hbc/verify.rb b/Library/Homebrew/cask/verify.rb
similarity index 96%
rename from Library/Homebrew/cask/lib/hbc/verify.rb
rename to Library/Homebrew/cask/verify.rb
index c5c6566731cd29090e65cc41019a31d07f7422f0..94c11701bd7b08307b6e069dba4b6ae5be88867d 100644
--- a/Library/Homebrew/cask/lib/hbc/verify.rb
+++ b/Library/Homebrew/cask/verify.rb
@@ -1,4 +1,4 @@
-require "hbc/verify/checksum"
+require "cask/verify/checksum"
module Hbc
module Verify
diff --git a/Library/Homebrew/cask/lib/hbc/verify/checksum.rb b/Library/Homebrew/cask/verify/checksum.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/verify/checksum.rb
rename to Library/Homebrew/cask/verify/checksum.rb
diff --git a/Library/Homebrew/cask/lib/hbc/version.rb b/Library/Homebrew/cask/version.rb
similarity index 100%
rename from Library/Homebrew/cask/lib/hbc/version.rb
rename to Library/Homebrew/cask/version.rb
diff --git a/Library/Homebrew/cleanup.rb b/Library/Homebrew/cleanup.rb
index e88aff4076f29a807e525fa9782a02e94e1251a4..3e4e624dc29a0a28bc478f2858f7cd892b1cf4cc 100644
--- a/Library/Homebrew/cleanup.rb
+++ b/Library/Homebrew/cleanup.rb
@@ -1,6 +1,6 @@
require "utils/bottles"
require "formula"
-require "hbc/cask_loader"
+require "cask/cask_loader"
require "set"
module CleanupRefinement
diff --git a/Library/Homebrew/cmd/cask.rb b/Library/Homebrew/cmd/cask.rb
index b07e681debb2ff8eeeee62f97f622e9dcddac282..9291241595c59e8f682ca2abd8724ab7fa590715 100644
--- a/Library/Homebrew/cmd/cask.rb
+++ b/Library/Homebrew/cmd/cask.rb
@@ -1,4 +1,4 @@
-require "hbc"
+require "cask/all"
module Homebrew
module_function
diff --git a/Library/Homebrew/compat.rb b/Library/Homebrew/compat.rb
index fbb74cb546385278e344cf1e10636d93b6e79fe8..cf048d1bebe86ca8daf6f4a78d6071a898656fa6 100644
--- a/Library/Homebrew/compat.rb
+++ b/Library/Homebrew/compat.rb
@@ -3,5 +3,5 @@ require "compat/dependable"
require "compat/dependency_collector"
require "compat/fileutils"
require "compat/formula_support"
-require "compat/hbc"
+require "compat/cask"
require "compat/tap"
diff --git a/Library/Homebrew/compat/hbc.rb b/Library/Homebrew/compat/cask.rb
similarity index 57%
rename from Library/Homebrew/compat/hbc.rb
rename to Library/Homebrew/compat/cask.rb
index f254a273603faa5d245a7f6b78a8c5fa7caf6510..3a2c689733102250463ab342da07974a1a09726b 100644
--- a/Library/Homebrew/compat/hbc.rb
+++ b/Library/Homebrew/compat/cask.rb
@@ -1,9 +1,9 @@
-require "compat/hbc/cask_loader"
-require "compat/hbc/cli/cleanup"
-require "compat/hbc/cli/search"
-require "compat/hbc/cache"
-require "compat/hbc/caskroom"
-require "compat/hbc/dsl"
+require "compat/cask/cask_loader"
+require "compat/cask/cli/cleanup"
+require "compat/cask/cli/search"
+require "compat/cask/cache"
+require "compat/cask/caskroom"
+require "compat/cask/dsl"
module Hbc
class << self
diff --git a/Library/Homebrew/compat/hbc/cache.rb b/Library/Homebrew/compat/cask/cache.rb
similarity index 100%
rename from Library/Homebrew/compat/hbc/cache.rb
rename to Library/Homebrew/compat/cask/cache.rb
diff --git a/Library/Homebrew/compat/hbc/cask_loader.rb b/Library/Homebrew/compat/cask/cask_loader.rb
similarity index 100%
rename from Library/Homebrew/compat/hbc/cask_loader.rb
rename to Library/Homebrew/compat/cask/cask_loader.rb
diff --git a/Library/Homebrew/compat/hbc/caskroom.rb b/Library/Homebrew/compat/cask/caskroom.rb
similarity index 100%
rename from Library/Homebrew/compat/hbc/caskroom.rb
rename to Library/Homebrew/compat/cask/caskroom.rb
diff --git a/Library/Homebrew/compat/hbc/cli/cleanup.rb b/Library/Homebrew/compat/cask/cli/cleanup.rb
similarity index 96%
rename from Library/Homebrew/compat/hbc/cli/cleanup.rb
rename to Library/Homebrew/compat/cask/cli/cleanup.rb
index 49242de7836dcff6142441f0fc6c23148510fef5..dccada465d43633d0c169d19cbf15ff5a77c4f2e 100644
--- a/Library/Homebrew/compat/hbc/cli/cleanup.rb
+++ b/Library/Homebrew/compat/cask/cli/cleanup.rb
@@ -1,4 +1,4 @@
-require "hbc/cli/abstract_command"
+require "cask/cli/abstract_command"
require "cleanup"
using CleanupRefinement
diff --git a/Library/Homebrew/compat/hbc/cli/search.rb b/Library/Homebrew/compat/cask/cli/search.rb
similarity index 91%
rename from Library/Homebrew/compat/hbc/cli/search.rb
rename to Library/Homebrew/compat/cask/cli/search.rb
index 8aa761c3c3ff141d95e4ffd093dbe555afe98826..cd46f59f533f06b1b633363dd89301fe1048d2fa 100644
--- a/Library/Homebrew/compat/hbc/cli/search.rb
+++ b/Library/Homebrew/compat/cask/cli/search.rb
@@ -1,4 +1,4 @@
-require "hbc/cli/abstract_command"
+require "cask/cli/abstract_command"
require "cmd/search"
module Hbc
diff --git a/Library/Homebrew/compat/hbc/dsl.rb b/Library/Homebrew/compat/cask/dsl.rb
similarity index 100%
rename from Library/Homebrew/compat/hbc/dsl.rb
rename to Library/Homebrew/compat/cask/dsl.rb
diff --git a/Library/Homebrew/dev-cmd/irb.rb b/Library/Homebrew/dev-cmd/irb.rb
index 97a0045826d2c0df528b8f003c9317c68c9b4ce6..7f5cd77f157797e028d72f6ad522097d686873d9 100644
--- a/Library/Homebrew/dev-cmd/irb.rb
+++ b/Library/Homebrew/dev-cmd/irb.rb
@@ -46,8 +46,7 @@ module Homebrew
require "formula"
require "keg"
-
- require "hbc"
+ require "cask/all"
ohai "Interactive Homebrew Shell"
puts "Example commands available with: brew irb --examples"
diff --git a/Library/Homebrew/extend/os/mac/search.rb b/Library/Homebrew/extend/os/mac/search.rb
index 5d1d7cc78a16288a0cf6e9ad1297699f63b715b0..9aada104b6d7d0b9ecb011e43823b5d62c2ab9fd 100644
--- a/Library/Homebrew/extend/os/mac/search.rb
+++ b/Library/Homebrew/extend/os/mac/search.rb
@@ -1,5 +1,5 @@
-require "hbc/cask"
-require "hbc/cask_loader"
+require "cask/cask"
+require "cask/cask_loader"
module Homebrew
module Search
diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb
index ce38bddd594a12422dcd15c3812f520074b6075e..7517a64ff2f19610b796f8ffd943fc1a56a75350 100644
--- a/Library/Homebrew/global.rb
+++ b/Library/Homebrew/global.rb
@@ -3,10 +3,6 @@ require "English"
HOMEBREW_LIBRARY_PATH = Pathname.new(__FILE__).realpath.parent
-unless $LOAD_PATH.include?("#{HOMEBREW_LIBRARY_PATH}/cask/lib")
- $LOAD_PATH.push("#{HOMEBREW_LIBRARY_PATH}/cask/lib")
-end
-
unless $LOAD_PATH.include?(HOMEBREW_LIBRARY_PATH.to_s)
$LOAD_PATH.push(HOMEBREW_LIBRARY_PATH.to_s)
end
diff --git a/Library/Homebrew/test/cask/dsl/caveats_spec.rb b/Library/Homebrew/test/cask/dsl/caveats_spec.rb
index 1b82d98211e0d4f78a40295939694f2adfb6293d..f91046e308a6366f9562576f79b11774e0294914 100644
--- a/Library/Homebrew/test/cask/dsl/caveats_spec.rb
+++ b/Library/Homebrew/test/cask/dsl/caveats_spec.rb
@@ -1,4 +1,4 @@
-require "test/support/helper/spec/shared_examples/hbc_dsl_base"
+require "test/support/helper/spec/shared_examples/cask_dsl_base"
describe Hbc::DSL::Caveats, :cask do
let(:cask) { Hbc::CaskLoader.load(cask_path("basic-cask")) }
diff --git a/Library/Homebrew/test/cask/dsl/postflight_spec.rb b/Library/Homebrew/test/cask/dsl/postflight_spec.rb
index a7877d1abf443152c2309236215695471bacfacb..0fd4c1317fdb3fb9583d7c59d43122107baecf23 100644
--- a/Library/Homebrew/test/cask/dsl/postflight_spec.rb
+++ b/Library/Homebrew/test/cask/dsl/postflight_spec.rb
@@ -1,5 +1,5 @@
-require "test/support/helper/spec/shared_examples/hbc_dsl_base"
-require "test/support/helper/spec/shared_examples/hbc_staged"
+require "test/support/helper/spec/shared_examples/cask_dsl_base"
+require "test/support/helper/spec/shared_examples/cask_staged"
describe Hbc::DSL::Postflight, :cask do
let(:cask) { Hbc::CaskLoader.load(cask_path("basic-cask")) }
diff --git a/Library/Homebrew/test/cask/dsl/preflight_spec.rb b/Library/Homebrew/test/cask/dsl/preflight_spec.rb
index 1d152e06ad75aa6cf38949d87b0a608ff69817af..70193154e25037a5b02b6eb6130ce9d910364845 100644
--- a/Library/Homebrew/test/cask/dsl/preflight_spec.rb
+++ b/Library/Homebrew/test/cask/dsl/preflight_spec.rb
@@ -1,5 +1,5 @@
-require "test/support/helper/spec/shared_examples/hbc_dsl_base"
-require "test/support/helper/spec/shared_examples/hbc_staged"
+require "test/support/helper/spec/shared_examples/cask_dsl_base"
+require "test/support/helper/spec/shared_examples/cask_staged"
describe Hbc::DSL::Preflight, :cask do
let(:cask) { Hbc::CaskLoader.load(cask_path("basic-cask")) }
diff --git a/Library/Homebrew/test/cask/dsl/uninstall_postflight_spec.rb b/Library/Homebrew/test/cask/dsl/uninstall_postflight_spec.rb
index 189e526e29dfc405074de7ef381e10c80c9a0d13..540e2504a4311e1e9e9a8dc1ac6babc236279203 100644
--- a/Library/Homebrew/test/cask/dsl/uninstall_postflight_spec.rb
+++ b/Library/Homebrew/test/cask/dsl/uninstall_postflight_spec.rb
@@ -1,4 +1,4 @@
-require "test/support/helper/spec/shared_examples/hbc_dsl_base"
+require "test/support/helper/spec/shared_examples/cask_dsl_base"
describe Hbc::DSL::UninstallPostflight, :cask do
let(:cask) { Hbc::CaskLoader.load(cask_path("basic-cask")) }
diff --git a/Library/Homebrew/test/cask/dsl/uninstall_preflight_spec.rb b/Library/Homebrew/test/cask/dsl/uninstall_preflight_spec.rb
index 8f4164b07d9252f3705036bb837b4128eab1372a..ff1fdc63e2a00ea735969d96e1bfee80a802aec6 100644
--- a/Library/Homebrew/test/cask/dsl/uninstall_preflight_spec.rb
+++ b/Library/Homebrew/test/cask/dsl/uninstall_preflight_spec.rb
@@ -1,5 +1,5 @@
-require "test/support/helper/spec/shared_examples/hbc_dsl_base"
-require "test/support/helper/spec/shared_examples/hbc_staged"
+require "test/support/helper/spec/shared_examples/cask_dsl_base"
+require "test/support/helper/spec/shared_examples/cask_staged"
describe Hbc::DSL::UninstallPreflight, :cask do
let(:cask) { Hbc::CaskLoader.load(cask_path("basic-cask")) }
diff --git a/Library/Homebrew/test/cleanup_spec.rb b/Library/Homebrew/test/cleanup_spec.rb
index 18c0c9e51a8d6d3b28e4944acdf24142da74dd16..6df872f20d030f814d1c0d950576feda1d0fe81d 100644
--- a/Library/Homebrew/test/cleanup_spec.rb
+++ b/Library/Homebrew/test/cleanup_spec.rb
@@ -1,6 +1,6 @@
require "test/support/fixtures/testball"
require "cleanup"
-require "hbc/cache"
+require "cask/cache"
require "fileutils"
using CleanupRefinement
diff --git a/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb b/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb
index 3155bf0de335c2d26c51388280bea77454eeee17..71816b5bc35bc847fb7796f9dea1b1176f3120e8 100644
--- a/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb
+++ b/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb
@@ -1,4 +1,4 @@
-require "hbc"
+require "cask/all"
require "test/support/helper/cask/fake_system_command"
require "test/support/helper/cask/install_helper"
diff --git a/Library/Homebrew/test/support/helper/spec/shared_examples/hbc_dsl_base.rb b/Library/Homebrew/test/support/helper/spec/shared_examples/cask_dsl_base.rb
similarity index 95%
rename from Library/Homebrew/test/support/helper/spec/shared_examples/hbc_dsl_base.rb
rename to Library/Homebrew/test/support/helper/spec/shared_examples/cask_dsl_base.rb
index 400ff40f624aa93e5800a1616ca3a171749c7834..b1431d2bcb2f148236805c1b54be9338c06cb391 100644
--- a/Library/Homebrew/test/support/helper/spec/shared_examples/hbc_dsl_base.rb
+++ b/Library/Homebrew/test/support/helper/spec/shared_examples/cask_dsl_base.rb
@@ -1,4 +1,4 @@
-require "hbc/dsl/base"
+require "cask/dsl/base"
shared_examples Hbc::DSL::Base do
it "supports the token method" do
diff --git a/Library/Homebrew/test/support/helper/spec/shared_examples/hbc_staged.rb b/Library/Homebrew/test/support/helper/spec/shared_examples/cask_staged.rb
similarity index 99%
rename from Library/Homebrew/test/support/helper/spec/shared_examples/hbc_staged.rb
rename to Library/Homebrew/test/support/helper/spec/shared_examples/cask_staged.rb
index 1f2eb5b5d00cbaf4f2d183ec805e1bd8635682f5..8d56439895e980a6862fde28098556d5ba6c4080 100644
--- a/Library/Homebrew/test/support/helper/spec/shared_examples/hbc_staged.rb
+++ b/Library/Homebrew/test/support/helper/spec/shared_examples/cask_staged.rb
@@ -1,4 +1,4 @@
-require "hbc/staged"
+require "cask/staged"
shared_examples Hbc::Staged do
let(:existing_path) { Pathname.new("/path/to/file/that/exists") }
diff --git a/Library/Homebrew/update_migrator.rb b/Library/Homebrew/update_migrator.rb
index a2e55579969a81b90360bacb08668603657a8cfa..a75e735a099aace6f90a0598e38b0d008729345d 100644
--- a/Library/Homebrew/update_migrator.rb
+++ b/Library/Homebrew/update_migrator.rb
@@ -1,5 +1,5 @@
-require "hbc/cask_loader"
-require "hbc/download"
+require "cask/cask_loader"
+require "cask/download"
module UpdateMigrator
class << self