diff --git a/Library/ENV/3.2.6 b/Library/ENV/3.2.6
deleted file mode 120000
index 89f71c74ce4da..0000000000000
--- a/Library/ENV/3.2.6
+++ /dev/null
@@ -1 +0,0 @@
-4.3
\ No newline at end of file
diff --git a/Library/ENV/4.2 b/Library/ENV/4.2
deleted file mode 120000
index 89f71c74ce4da..0000000000000
--- a/Library/ENV/4.2
+++ /dev/null
@@ -1 +0,0 @@
-4.3
\ No newline at end of file
diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh
index 0d6a0fc063aaa..49a15864f76c2 100644
--- a/Library/Homebrew/cmd/update.sh
+++ b/Library/Homebrew/cmd/update.sh
@@ -14,7 +14,7 @@ source "$HOMEBREW_LIBRARY/Homebrew/utils/lock.sh"
 git() {
   if [[ -z "$GIT_EXECUTABLE" ]]
   then
-    GIT_EXECUTABLE="$("$HOMEBREW_LIBRARY/ENV/scm/git" --homebrew=print-path)"
+    GIT_EXECUTABLE="$("$HOMEBREW_LIBRARY/Homebrew/scm/git" --homebrew=print-path)"
   fi
   "$GIT_EXECUTABLE" "$@"
 }
diff --git a/Library/Homebrew/config.rb b/Library/Homebrew/config.rb
index 5ba0793949b11..70a2386a928e5 100644
--- a/Library/Homebrew/config.rb
+++ b/Library/Homebrew/config.rb
@@ -14,8 +14,8 @@
 # Where we store most of Homebrew, taps, and various metadata
 HOMEBREW_LIBRARY = Pathname.new(ENV["HOMEBREW_LIBRARY"])
 
-# Where wrapper scripts for Git, Subversion, and various build tools are stored
-HOMEBREW_ENV_PATH = HOMEBREW_LIBRARY/"ENV"
+# Where shim scripts for various build and SCM tools are stored
+HOMEBREW_SHIMS_PATH = HOMEBREW_LIBRARY/"Homebrew/shims"
 
 # Where we store lock files
 HOMEBREW_LOCK_DIR = HOMEBREW_LIBRARY/"Locks"
diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb
index 3485e2ce79e76..0b60e24725e96 100644
--- a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb
+++ b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb
@@ -31,7 +31,7 @@ def setup_build_environment(formula = nil)
   end
 
   def homebrew_extra_pkg_config_paths
-    ["#{HOMEBREW_ENV_PATH}/pkgconfig/#{MacOS.version}"]
+    ["#{HOMEBREW_LIBRARY_PATH}/Homebrew/os/mac/pkgconfig/#{MacOS.version}"]
   end
 
   # Sets architecture-specific flags for every environment variable
diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
index 77625f455a4cd..acd2efa62598e 100644
--- a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
@@ -3,8 +3,7 @@ module Superenv
   def self.bin
     return unless DevelopmentTools.installed?
 
-    bin = HOMEBREW_ENV_PATH.subdirs.reject { |d| d.basename.to_s > MacOS::Xcode.version }.max
-    bin.realpath unless bin.nil?
+    (HOMEBREW_SHIMS_PATH/"super").realpath
   end
 
   def effective_sysroot
@@ -26,7 +25,8 @@ def homebrew_extra_paths
 
   # @private
   def homebrew_extra_pkg_config_paths
-    paths = ["#{HOMEBREW_ENV_PATH}/pkgconfig/#{MacOS.version}"]
+    paths = \
+      ["#{HOMEBREW_LIBRARY_PATH}/Homebrew/os/mac/pkgconfig/#{MacOS.version}"]
     paths << "#{MacOS::X11.lib}/pkgconfig" << "#{MacOS::X11.share}/pkgconfig" if x11?
     paths
   end
diff --git a/Library/ENV/pkgconfig/10.10/libcurl.pc b/Library/Homebrew/os/mac/pkgconfig/10.10/libcurl.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.10/libcurl.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.10/libcurl.pc
diff --git a/Library/ENV/pkgconfig/10.10/libexslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.10/libexslt.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.10/libexslt.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.10/libexslt.pc
diff --git a/Library/ENV/pkgconfig/10.10/libxml-2.0.pc b/Library/Homebrew/os/mac/pkgconfig/10.10/libxml-2.0.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.10/libxml-2.0.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.10/libxml-2.0.pc
diff --git a/Library/ENV/pkgconfig/10.10/libxslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.10/libxslt.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.10/libxslt.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.10/libxslt.pc
diff --git a/Library/ENV/pkgconfig/10.10/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.10/sqlite3.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.10/sqlite3.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.10/sqlite3.pc
diff --git a/Library/ENV/pkgconfig/10.10/zlib.pc b/Library/Homebrew/os/mac/pkgconfig/10.10/zlib.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.10/zlib.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.10/zlib.pc
diff --git a/Library/ENV/pkgconfig/10.11/libcurl.pc b/Library/Homebrew/os/mac/pkgconfig/10.11/libcurl.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.11/libcurl.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.11/libcurl.pc
diff --git a/Library/ENV/pkgconfig/10.11/libexslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.11/libexslt.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.11/libexslt.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.11/libexslt.pc
diff --git a/Library/ENV/pkgconfig/10.11/libxml-2.0.pc b/Library/Homebrew/os/mac/pkgconfig/10.11/libxml-2.0.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.11/libxml-2.0.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.11/libxml-2.0.pc
diff --git a/Library/ENV/pkgconfig/10.11/libxslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.11/libxslt.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.11/libxslt.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.11/libxslt.pc
diff --git a/Library/ENV/pkgconfig/10.11/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.11/sqlite3.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.11/sqlite3.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.11/sqlite3.pc
diff --git a/Library/ENV/pkgconfig/10.11/zlib.pc b/Library/Homebrew/os/mac/pkgconfig/10.11/zlib.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.11/zlib.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.11/zlib.pc
diff --git a/Library/ENV/pkgconfig/10.12/libcurl.pc b/Library/Homebrew/os/mac/pkgconfig/10.12/libcurl.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.12/libcurl.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.12/libcurl.pc
diff --git a/Library/ENV/pkgconfig/10.12/libexslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.12/libexslt.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.12/libexslt.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.12/libexslt.pc
diff --git a/Library/ENV/pkgconfig/10.12/libxml-2.0.pc b/Library/Homebrew/os/mac/pkgconfig/10.12/libxml-2.0.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.12/libxml-2.0.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.12/libxml-2.0.pc
diff --git a/Library/ENV/pkgconfig/10.12/libxslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.12/libxslt.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.12/libxslt.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.12/libxslt.pc
diff --git a/Library/ENV/pkgconfig/10.12/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.12/sqlite3.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.12/sqlite3.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.12/sqlite3.pc
diff --git a/Library/ENV/pkgconfig/10.12/zlib.pc b/Library/Homebrew/os/mac/pkgconfig/10.12/zlib.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.12/zlib.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.12/zlib.pc
diff --git a/Library/ENV/pkgconfig/10.4 b/Library/Homebrew/os/mac/pkgconfig/10.4
similarity index 100%
rename from Library/ENV/pkgconfig/10.4
rename to Library/Homebrew/os/mac/pkgconfig/10.4
diff --git a/Library/ENV/pkgconfig/10.5/libcrypto.pc b/Library/Homebrew/os/mac/pkgconfig/10.5/libcrypto.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.5/libcrypto.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.5/libcrypto.pc
diff --git a/Library/ENV/pkgconfig/10.5/libcurl.pc b/Library/Homebrew/os/mac/pkgconfig/10.5/libcurl.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.5/libcurl.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.5/libcurl.pc
diff --git a/Library/ENV/pkgconfig/10.6/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.6/sqlite3.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.6/sqlite3.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.6/sqlite3.pc
diff --git a/Library/ENV/pkgconfig/10.6/zlib.pc b/Library/Homebrew/os/mac/pkgconfig/10.6/zlib.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.6/zlib.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.6/zlib.pc
diff --git a/Library/ENV/pkgconfig/10.7/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.7/sqlite3.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.7/sqlite3.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.7/sqlite3.pc
diff --git a/Library/ENV/pkgconfig/10.7/zlib.pc b/Library/Homebrew/os/mac/pkgconfig/10.7/zlib.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.7/zlib.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.7/zlib.pc
diff --git a/Library/ENV/pkgconfig/10.8/libcurl.pc b/Library/Homebrew/os/mac/pkgconfig/10.8/libcurl.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.8/libcurl.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.8/libcurl.pc
diff --git a/Library/ENV/pkgconfig/10.8/libexslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.8/libexslt.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.8/libexslt.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.8/libexslt.pc
diff --git a/Library/ENV/pkgconfig/10.8/libxml-2.0.pc b/Library/Homebrew/os/mac/pkgconfig/10.8/libxml-2.0.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.8/libxml-2.0.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.8/libxml-2.0.pc
diff --git a/Library/ENV/pkgconfig/10.8/libxslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.8/libxslt.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.8/libxslt.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.8/libxslt.pc
diff --git a/Library/ENV/pkgconfig/10.8/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.8/sqlite3.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.8/sqlite3.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.8/sqlite3.pc
diff --git a/Library/ENV/pkgconfig/10.8/zlib.pc b/Library/Homebrew/os/mac/pkgconfig/10.8/zlib.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.8/zlib.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.8/zlib.pc
diff --git a/Library/ENV/pkgconfig/10.9/libcurl.pc b/Library/Homebrew/os/mac/pkgconfig/10.9/libcurl.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.9/libcurl.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.9/libcurl.pc
diff --git a/Library/ENV/pkgconfig/10.9/libexslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.9/libexslt.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.9/libexslt.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.9/libexslt.pc
diff --git a/Library/ENV/pkgconfig/10.9/libxml-2.0.pc b/Library/Homebrew/os/mac/pkgconfig/10.9/libxml-2.0.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.9/libxml-2.0.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.9/libxml-2.0.pc
diff --git a/Library/ENV/pkgconfig/10.9/libxslt.pc b/Library/Homebrew/os/mac/pkgconfig/10.9/libxslt.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.9/libxslt.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.9/libxslt.pc
diff --git a/Library/ENV/pkgconfig/10.9/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.9/sqlite3.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.9/sqlite3.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.9/sqlite3.pc
diff --git a/Library/ENV/pkgconfig/10.9/zlib.pc b/Library/Homebrew/os/mac/pkgconfig/10.9/zlib.pc
similarity index 100%
rename from Library/ENV/pkgconfig/10.9/zlib.pc
rename to Library/Homebrew/os/mac/pkgconfig/10.9/zlib.pc
diff --git a/Library/ENV/pkgconfig/fuse/fuse.pc b/Library/Homebrew/os/mac/pkgconfig/fuse/fuse.pc
similarity index 100%
rename from Library/ENV/pkgconfig/fuse/fuse.pc
rename to Library/Homebrew/os/mac/pkgconfig/fuse/fuse.pc
diff --git a/Library/ENV/pkgconfig/fuse/osxfuse.pc b/Library/Homebrew/os/mac/pkgconfig/fuse/osxfuse.pc
similarity index 100%
rename from Library/ENV/pkgconfig/fuse/osxfuse.pc
rename to Library/Homebrew/os/mac/pkgconfig/fuse/osxfuse.pc
diff --git a/Library/ENV/scm/git b/Library/Homebrew/shims/scm/git
similarity index 94%
rename from Library/ENV/scm/git
rename to Library/Homebrew/shims/scm/git
index f277f6bb961e5..10950ef0739ce 100755
--- a/Library/ENV/scm/git
+++ b/Library/Homebrew/shims/scm/git
@@ -65,8 +65,8 @@ safe_exec() {
 }
 
 SCM_FILE="${0##*/}"
-SCM_DIR="$(quiet_safe_cd "${0%/*}/" && pwd -P)"
 SCM_REAL="$(realpath "$0")"
+SCM_DIR="$(quiet_safe_cd "${SCM_REAL%/*}/" && pwd -P)"
 
 if [[ "$1" = --homebrew=* ]]
 then
@@ -84,7 +84,7 @@ case "$(lowercase "$SCM_FILE")" in
     ;;
 esac
 
-brew_version="$(quiet_safe_cd "$SCM_DIR/../../../bin" && pwd -P)/$SCM_FILE"
+brew_version="$(quiet_safe_cd "$SCM_DIR/../../../../bin" && pwd -P)/$SCM_FILE"
 safe_exec "$brew_version" "$@"
 
 IFS=$'\n'
diff --git a/Library/ENV/scm/svn b/Library/Homebrew/shims/scm/svn
similarity index 100%
rename from Library/ENV/scm/svn
rename to Library/Homebrew/shims/scm/svn
diff --git a/Library/ENV/4.3/ant b/Library/Homebrew/shims/super/ant
similarity index 100%
rename from Library/ENV/4.3/ant
rename to Library/Homebrew/shims/super/ant
diff --git a/Library/ENV/4.3/apr-1-config b/Library/Homebrew/shims/super/apr-1-config
similarity index 100%
rename from Library/ENV/4.3/apr-1-config
rename to Library/Homebrew/shims/super/apr-1-config
diff --git a/Library/ENV/4.3/bsdmake b/Library/Homebrew/shims/super/bsdmake
similarity index 100%
rename from Library/ENV/4.3/bsdmake
rename to Library/Homebrew/shims/super/bsdmake
diff --git a/Library/ENV/4.3/c++ b/Library/Homebrew/shims/super/c++
similarity index 100%
rename from Library/ENV/4.3/c++
rename to Library/Homebrew/shims/super/c++
diff --git a/Library/ENV/4.3/c89 b/Library/Homebrew/shims/super/c89
similarity index 100%
rename from Library/ENV/4.3/c89
rename to Library/Homebrew/shims/super/c89
diff --git a/Library/ENV/4.3/c99 b/Library/Homebrew/shims/super/c99
similarity index 100%
rename from Library/ENV/4.3/c99
rename to Library/Homebrew/shims/super/c99
diff --git a/Library/ENV/4.3/cc b/Library/Homebrew/shims/super/cc
similarity index 100%
rename from Library/ENV/4.3/cc
rename to Library/Homebrew/shims/super/cc
diff --git a/Library/ENV/4.3/clang b/Library/Homebrew/shims/super/clang
similarity index 100%
rename from Library/ENV/4.3/clang
rename to Library/Homebrew/shims/super/clang
diff --git a/Library/ENV/4.3/clang++ b/Library/Homebrew/shims/super/clang++
similarity index 100%
rename from Library/ENV/4.3/clang++
rename to Library/Homebrew/shims/super/clang++
diff --git a/Library/ENV/4.3/cpp b/Library/Homebrew/shims/super/cpp
similarity index 100%
rename from Library/ENV/4.3/cpp
rename to Library/Homebrew/shims/super/cpp
diff --git a/Library/ENV/4.3/g++ b/Library/Homebrew/shims/super/g++
similarity index 100%
rename from Library/ENV/4.3/g++
rename to Library/Homebrew/shims/super/g++
diff --git a/Library/ENV/4.3/g++-4.2 b/Library/Homebrew/shims/super/g++-4.2
similarity index 100%
rename from Library/ENV/4.3/g++-4.2
rename to Library/Homebrew/shims/super/g++-4.2
diff --git a/Library/ENV/4.3/g++-4.3 b/Library/Homebrew/shims/super/g++-4.3
similarity index 100%
rename from Library/ENV/4.3/g++-4.3
rename to Library/Homebrew/shims/super/g++-4.3
diff --git a/Library/ENV/4.3/g++-4.4 b/Library/Homebrew/shims/super/g++-4.4
similarity index 100%
rename from Library/ENV/4.3/g++-4.4
rename to Library/Homebrew/shims/super/g++-4.4
diff --git a/Library/ENV/4.3/g++-4.5 b/Library/Homebrew/shims/super/g++-4.5
similarity index 100%
rename from Library/ENV/4.3/g++-4.5
rename to Library/Homebrew/shims/super/g++-4.5
diff --git a/Library/ENV/4.3/g++-4.6 b/Library/Homebrew/shims/super/g++-4.6
similarity index 100%
rename from Library/ENV/4.3/g++-4.6
rename to Library/Homebrew/shims/super/g++-4.6
diff --git a/Library/ENV/4.3/g++-4.7 b/Library/Homebrew/shims/super/g++-4.7
similarity index 100%
rename from Library/ENV/4.3/g++-4.7
rename to Library/Homebrew/shims/super/g++-4.7
diff --git a/Library/ENV/4.3/g++-4.8 b/Library/Homebrew/shims/super/g++-4.8
similarity index 100%
rename from Library/ENV/4.3/g++-4.8
rename to Library/Homebrew/shims/super/g++-4.8
diff --git a/Library/ENV/4.3/g++-4.9 b/Library/Homebrew/shims/super/g++-4.9
similarity index 100%
rename from Library/ENV/4.3/g++-4.9
rename to Library/Homebrew/shims/super/g++-4.9
diff --git a/Library/ENV/4.3/g++-5 b/Library/Homebrew/shims/super/g++-5
similarity index 100%
rename from Library/ENV/4.3/g++-5
rename to Library/Homebrew/shims/super/g++-5
diff --git a/Library/ENV/4.3/g++-6 b/Library/Homebrew/shims/super/g++-6
similarity index 100%
rename from Library/ENV/4.3/g++-6
rename to Library/Homebrew/shims/super/g++-6
diff --git a/Library/ENV/4.3/gcc b/Library/Homebrew/shims/super/gcc
similarity index 100%
rename from Library/ENV/4.3/gcc
rename to Library/Homebrew/shims/super/gcc
diff --git a/Library/ENV/4.3/gcc-4.2 b/Library/Homebrew/shims/super/gcc-4.2
similarity index 100%
rename from Library/ENV/4.3/gcc-4.2
rename to Library/Homebrew/shims/super/gcc-4.2
diff --git a/Library/ENV/4.3/gcc-4.3 b/Library/Homebrew/shims/super/gcc-4.3
similarity index 100%
rename from Library/ENV/4.3/gcc-4.3
rename to Library/Homebrew/shims/super/gcc-4.3
diff --git a/Library/ENV/4.3/gcc-4.4 b/Library/Homebrew/shims/super/gcc-4.4
similarity index 100%
rename from Library/ENV/4.3/gcc-4.4
rename to Library/Homebrew/shims/super/gcc-4.4
diff --git a/Library/ENV/4.3/gcc-4.5 b/Library/Homebrew/shims/super/gcc-4.5
similarity index 100%
rename from Library/ENV/4.3/gcc-4.5
rename to Library/Homebrew/shims/super/gcc-4.5
diff --git a/Library/ENV/4.3/gcc-4.6 b/Library/Homebrew/shims/super/gcc-4.6
similarity index 100%
rename from Library/ENV/4.3/gcc-4.6
rename to Library/Homebrew/shims/super/gcc-4.6
diff --git a/Library/ENV/4.3/gcc-4.7 b/Library/Homebrew/shims/super/gcc-4.7
similarity index 100%
rename from Library/ENV/4.3/gcc-4.7
rename to Library/Homebrew/shims/super/gcc-4.7
diff --git a/Library/ENV/4.3/gcc-4.8 b/Library/Homebrew/shims/super/gcc-4.8
similarity index 100%
rename from Library/ENV/4.3/gcc-4.8
rename to Library/Homebrew/shims/super/gcc-4.8
diff --git a/Library/ENV/4.3/gcc-4.9 b/Library/Homebrew/shims/super/gcc-4.9
similarity index 100%
rename from Library/ENV/4.3/gcc-4.9
rename to Library/Homebrew/shims/super/gcc-4.9
diff --git a/Library/ENV/4.3/gcc-5 b/Library/Homebrew/shims/super/gcc-5
similarity index 100%
rename from Library/ENV/4.3/gcc-5
rename to Library/Homebrew/shims/super/gcc-5
diff --git a/Library/ENV/4.3/gcc-6 b/Library/Homebrew/shims/super/gcc-6
similarity index 100%
rename from Library/ENV/4.3/gcc-6
rename to Library/Homebrew/shims/super/gcc-6
diff --git a/Library/ENV/4.3/git b/Library/Homebrew/shims/super/git
similarity index 100%
rename from Library/ENV/4.3/git
rename to Library/Homebrew/shims/super/git
diff --git a/Library/ENV/4.3/gmake b/Library/Homebrew/shims/super/gmake
similarity index 100%
rename from Library/ENV/4.3/gmake
rename to Library/Homebrew/shims/super/gmake
diff --git a/Library/ENV/4.3/i686-apple-darwin11-llvm-g++-4.2 b/Library/Homebrew/shims/super/i686-apple-darwin11-llvm-g++-4.2
similarity index 100%
rename from Library/ENV/4.3/i686-apple-darwin11-llvm-g++-4.2
rename to Library/Homebrew/shims/super/i686-apple-darwin11-llvm-g++-4.2
diff --git a/Library/ENV/4.3/i686-apple-darwin11-llvm-gcc-4.2 b/Library/Homebrew/shims/super/i686-apple-darwin11-llvm-gcc-4.2
similarity index 100%
rename from Library/ENV/4.3/i686-apple-darwin11-llvm-gcc-4.2
rename to Library/Homebrew/shims/super/i686-apple-darwin11-llvm-gcc-4.2
diff --git a/Library/ENV/4.3/ld b/Library/Homebrew/shims/super/ld
similarity index 100%
rename from Library/ENV/4.3/ld
rename to Library/Homebrew/shims/super/ld
diff --git a/Library/ENV/4.3/llvm-g++ b/Library/Homebrew/shims/super/llvm-g++
similarity index 100%
rename from Library/ENV/4.3/llvm-g++
rename to Library/Homebrew/shims/super/llvm-g++
diff --git a/Library/ENV/4.3/llvm-g++-4.2 b/Library/Homebrew/shims/super/llvm-g++-4.2
similarity index 100%
rename from Library/ENV/4.3/llvm-g++-4.2
rename to Library/Homebrew/shims/super/llvm-g++-4.2
diff --git a/Library/ENV/4.3/llvm-gcc b/Library/Homebrew/shims/super/llvm-gcc
similarity index 100%
rename from Library/ENV/4.3/llvm-gcc
rename to Library/Homebrew/shims/super/llvm-gcc
diff --git a/Library/ENV/4.3/llvm-gcc-4.2 b/Library/Homebrew/shims/super/llvm-gcc-4.2
similarity index 100%
rename from Library/ENV/4.3/llvm-gcc-4.2
rename to Library/Homebrew/shims/super/llvm-gcc-4.2
diff --git a/Library/ENV/4.3/make b/Library/Homebrew/shims/super/make
similarity index 100%
rename from Library/ENV/4.3/make
rename to Library/Homebrew/shims/super/make
diff --git a/Library/ENV/4.3/mig b/Library/Homebrew/shims/super/mig
similarity index 100%
rename from Library/ENV/4.3/mig
rename to Library/Homebrew/shims/super/mig
diff --git a/Library/ENV/4.3/pod2man b/Library/Homebrew/shims/super/pod2man
similarity index 100%
rename from Library/ENV/4.3/pod2man
rename to Library/Homebrew/shims/super/pod2man
diff --git a/Library/ENV/4.3/sed b/Library/Homebrew/shims/super/sed
similarity index 100%
rename from Library/ENV/4.3/sed
rename to Library/Homebrew/shims/super/sed
diff --git a/Library/ENV/4.3/svn b/Library/Homebrew/shims/super/svn
similarity index 100%
rename from Library/ENV/4.3/svn
rename to Library/Homebrew/shims/super/svn
diff --git a/Library/ENV/4.3/xcrun b/Library/Homebrew/shims/super/xcrun
similarity index 100%
rename from Library/ENV/4.3/xcrun
rename to Library/Homebrew/shims/super/xcrun
diff --git a/Library/Homebrew/test/lib/config.rb b/Library/Homebrew/test/lib/config.rb
index 91ef9fe8af5d7..062bed33b697c 100644
--- a/Library/Homebrew/test/lib/config.rb
+++ b/Library/Homebrew/test/lib/config.rb
@@ -12,7 +12,7 @@
 
 # Paths pointing into the Homebrew code base that persist across test runs
 HOMEBREW_LIBRARY_PATH  = Pathname.new(File.expand_path("../../..", __FILE__))
-HOMEBREW_ENV_PATH      = HOMEBREW_LIBRARY_PATH.parent+"ENV"
+HOMEBREW_SHIMS_PATH    = HOMEBREW_LIBRARY_PATH.parent+"Homebrew/shims"
 HOMEBREW_LOAD_PATH     = [File.expand_path("..", __FILE__), HOMEBREW_LIBRARY_PATH].join(":")
 
 # Paths redirected to a temporary directory and wiped at the end of the test run
diff --git a/Library/Homebrew/utils/git.rb b/Library/Homebrew/utils/git.rb
index b4d86eb8a427d..837cc22e4115e 100644
--- a/Library/Homebrew/utils/git.rb
+++ b/Library/Homebrew/utils/git.rb
@@ -1,20 +1,20 @@
 module Utils
   def self.git_available?
     return @git if instance_variable_defined?(:@git)
-    @git = quiet_system HOMEBREW_ENV_PATH/"scm/git", "--version"
+    @git = quiet_system HOMEBREW_SHIMS_PATH/"scm/git", "--version"
   end
 
   def self.git_path
     return unless git_available?
     @git_path ||= Utils.popen_read(
-      HOMEBREW_ENV_PATH/"scm/git", "--homebrew=print-path"
+      HOMEBREW_SHIMS_PATH/"scm/git", "--homebrew=print-path"
     ).chuzzle
   end
 
   def self.git_version
     return unless git_available?
     @git_version ||= Utils.popen_read(
-      HOMEBREW_ENV_PATH/"scm/git", "--version"
+      HOMEBREW_SHIMS_PATH/"scm/git", "--version"
     ).chomp[/git version (\d+(?:\.\d+)*)/, 1]
   end
 
diff --git a/Library/brew.rb b/Library/brew.rb
index c06aa735e02ef..9110d5db03989 100644
--- a/Library/brew.rb
+++ b/Library/brew.rb
@@ -55,7 +55,7 @@ def require?(path)
   end
 
   # Add SCM wrappers.
-  ENV["PATH"] += "#{File::PATH_SEPARATOR}#{HOMEBREW_ENV_PATH}/scm"
+  ENV["PATH"] += "#{File::PATH_SEPARATOR}#{HOMEBREW_SHIMS_PATH}/scm"
 
   if cmd
     internal_cmd = require? HOMEBREW_LIBRARY_PATH.join("cmd", cmd)
diff --git a/Library/brew.sh b/Library/brew.sh
index 03eaa43903d51..5dd1ce6308451 100644
--- a/Library/brew.sh
+++ b/Library/brew.sh
@@ -29,7 +29,7 @@ brew() {
 }
 
 git() {
-  "$HOMEBREW_LIBRARY/ENV/scm/git" "$@"
+  "$HOMEBREW_LIBRARY/Homebrew/shims/scm/git" "$@"
 }
 
 # Force UTF-8 to avoid encoding issues for users with broken locale settings.