diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb
similarity index 100%
rename from Library/Homebrew/cmd/audit.rb
rename to Library/Homebrew/dev-cmd/audit.rb
diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb
similarity index 100%
rename from Library/Homebrew/cmd/bottle.rb
rename to Library/Homebrew/dev-cmd/bottle.rb
diff --git a/Library/Homebrew/cmd/create.rb b/Library/Homebrew/dev-cmd/create.rb
similarity index 100%
rename from Library/Homebrew/cmd/create.rb
rename to Library/Homebrew/dev-cmd/create.rb
diff --git a/Library/Homebrew/cmd/edit.rb b/Library/Homebrew/dev-cmd/edit.rb
similarity index 100%
rename from Library/Homebrew/cmd/edit.rb
rename to Library/Homebrew/dev-cmd/edit.rb
diff --git a/Library/Homebrew/cmd/man.rb b/Library/Homebrew/dev-cmd/man.rb
similarity index 100%
rename from Library/Homebrew/cmd/man.rb
rename to Library/Homebrew/dev-cmd/man.rb
diff --git a/Library/Homebrew/cmd/pull.rb b/Library/Homebrew/dev-cmd/pull.rb
similarity index 100%
rename from Library/Homebrew/cmd/pull.rb
rename to Library/Homebrew/dev-cmd/pull.rb
diff --git a/Library/Homebrew/cmd/tap-readme.rb b/Library/Homebrew/dev-cmd/tap-readme.rb
similarity index 100%
rename from Library/Homebrew/cmd/tap-readme.rb
rename to Library/Homebrew/dev-cmd/tap-readme.rb
diff --git a/Library/Homebrew/cmd/test.rb b/Library/Homebrew/dev-cmd/test.rb
similarity index 100%
rename from Library/Homebrew/cmd/test.rb
rename to Library/Homebrew/dev-cmd/test.rb
diff --git a/Library/Homebrew/cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb
similarity index 100%
rename from Library/Homebrew/cmd/tests.rb
rename to Library/Homebrew/dev-cmd/tests.rb
diff --git a/Library/Homebrew/test/test_cmd_audit.rb b/Library/Homebrew/test/test_cmd_audit.rb
index 1a52fa6283..57d4e754fd 100644
--- a/Library/Homebrew/test/test_cmd_audit.rb
+++ b/Library/Homebrew/test/test_cmd_audit.rb
@@ -2,7 +2,7 @@ require "testing_env"
 require "fileutils"
 require "pathname"
 require "formulary"
-require "cmd/audit"
+require "dev-cmd/audit"
 
 class FormulaTextTests < Homebrew::TestCase
   def setup