diff --git a/pkgs/development/compilers/gcc-upc-4.0/default.nix b/pkgs/development/compilers/gcc-upc-4.0/default.nix
index 68ae49b152a1..b3b458aae1fa 100644
--- a/pkgs/development/compilers/gcc-upc-4.0/default.nix
+++ b/pkgs/development/compilers/gcc-upc-4.0/default.nix
@@ -6,14 +6,16 @@
 , texinfo ? null
 }:
 
-with import ../../../lib;
+with stdenv.lib;
 
 # GCC-UPC apparently doesn't support GCov and friends.
 assert profiledCompiler == false;
 
 stdenv.mkDerivation {
   name = "gcc-upc-4.0.3.5";
-  builder = ../gcc-4.0/builder.sh;
+  
+  builder = ../gcc/4.0/builder.sh;
+  
   src = fetchurl {
     url = "ftp://ftp.intrepid.com/pub/upc/rls/upc-4.0.3.5/upc-4.0.3.5.src.tar.gz";
     sha256 = "0afnz1bz0kknhl18205bbwncyza08983ivfaagj5yl7x3nwy7prv";
@@ -30,13 +32,13 @@ stdenv.mkDerivation {
   langF77 = false;
   langUPC = true;    # unused
 
-  buildInputs = [gmp mpfr texinfo
-
-                 # Bison is needed to build the parsers.
-                 bison
-
-		 # For some reason, `autoheader' and `m4' are needed.
-		 autoconf gnum4];
+  buildInputs =
+    [ gmp mpfr texinfo
+      # Bison is needed to build the parsers.
+      bison
+      # For some reason, `autoheader' and `m4' are needed.
+      autoconf gnum4
+    ];
 
   # Note: We use `--enable-maintainer-mode' so that `bison' is actually
   # run when needed.
diff --git a/pkgs/development/compilers/gcc-2.95/builder.sh b/pkgs/development/compilers/gcc/2.95/builder.sh
similarity index 100%
rename from pkgs/development/compilers/gcc-2.95/builder.sh
rename to pkgs/development/compilers/gcc/2.95/builder.sh
diff --git a/pkgs/development/compilers/gcc-2.95/default.nix b/pkgs/development/compilers/gcc/2.95/default.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-2.95/default.nix
rename to pkgs/development/compilers/gcc/2.95/default.nix
diff --git a/pkgs/development/compilers/gcc-2.95/no-sys-dirs.patch b/pkgs/development/compilers/gcc/2.95/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-2.95/no-sys-dirs.patch
rename to pkgs/development/compilers/gcc/2.95/no-sys-dirs.patch
diff --git a/pkgs/development/compilers/gcc-3.3/builder.sh b/pkgs/development/compilers/gcc/3.3/builder.sh
similarity index 100%
rename from pkgs/development/compilers/gcc-3.3/builder.sh
rename to pkgs/development/compilers/gcc/3.3/builder.sh
diff --git a/pkgs/development/compilers/gcc-3.3/default.nix b/pkgs/development/compilers/gcc/3.3/default.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-3.3/default.nix
rename to pkgs/development/compilers/gcc/3.3/default.nix
diff --git a/pkgs/development/compilers/gcc-3.4/builder.sh b/pkgs/development/compilers/gcc/3.4/builder.sh
similarity index 100%
rename from pkgs/development/compilers/gcc-3.4/builder.sh
rename to pkgs/development/compilers/gcc/3.4/builder.sh
diff --git a/pkgs/development/compilers/gcc-3.4/default.nix b/pkgs/development/compilers/gcc/3.4/default.nix
similarity index 97%
rename from pkgs/development/compilers/gcc-3.4/default.nix
rename to pkgs/development/compilers/gcc/3.4/default.nix
index de7f079b2d90..6cadf58d2ce6 100644
--- a/pkgs/development/compilers/gcc-3.4/default.nix
+++ b/pkgs/development/compilers/gcc/3.4/default.nix
@@ -5,7 +5,7 @@
 
 assert langC;
 
-with import ../../../lib;
+with stdenv.lib;
 
 stdenv.mkDerivation {
   name = "gcc-3.4.6";
diff --git a/pkgs/development/compilers/gcc-3.4/no-sys-dirs.patch b/pkgs/development/compilers/gcc/3.4/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-3.4/no-sys-dirs.patch
rename to pkgs/development/compilers/gcc/3.4/no-sys-dirs.patch
diff --git a/pkgs/development/compilers/gcc-4.0/builder.sh b/pkgs/development/compilers/gcc/4.0/builder.sh
similarity index 100%
rename from pkgs/development/compilers/gcc-4.0/builder.sh
rename to pkgs/development/compilers/gcc/4.0/builder.sh
diff --git a/pkgs/development/compilers/gcc-4.0/default.nix b/pkgs/development/compilers/gcc/4.0/default.nix
similarity index 97%
rename from pkgs/development/compilers/gcc-4.0/default.nix
rename to pkgs/development/compilers/gcc/4.0/default.nix
index 45c5bedd99b4..4e51681a533a 100644
--- a/pkgs/development/compilers/gcc-4.0/default.nix
+++ b/pkgs/development/compilers/gcc/4.0/default.nix
@@ -8,7 +8,7 @@
 
 assert langC;
 
-with import ../../../lib;
+with stdenv.lib;
 
 stdenv.mkDerivation {
   name = "${name}-4.0.4";
diff --git a/pkgs/development/compilers/gcc-4.0/gcc-4.0.2-cxx.patch b/pkgs/development/compilers/gcc/4.0/gcc-4.0.2-cxx.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.0/gcc-4.0.2-cxx.patch
rename to pkgs/development/compilers/gcc/4.0/gcc-4.0.2-cxx.patch
diff --git a/pkgs/development/compilers/gcc-4.0/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.0/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.0/no-sys-dirs.patch
rename to pkgs/development/compilers/gcc/4.0/no-sys-dirs.patch
diff --git a/pkgs/development/compilers/gcc-4.1/builder.sh b/pkgs/development/compilers/gcc/4.1/builder.sh
similarity index 100%
rename from pkgs/development/compilers/gcc-4.1/builder.sh
rename to pkgs/development/compilers/gcc/4.1/builder.sh
diff --git a/pkgs/development/compilers/gcc-4.1/default.nix b/pkgs/development/compilers/gcc/4.1/default.nix
similarity index 98%
rename from pkgs/development/compilers/gcc-4.1/default.nix
rename to pkgs/development/compilers/gcc/4.1/default.nix
index 66bf48cb6e12..b460ad813f81 100644
--- a/pkgs/development/compilers/gcc-4.1/default.nix
+++ b/pkgs/development/compilers/gcc/4.1/default.nix
@@ -10,7 +10,7 @@
 
 assert langC || langFortran;
 
-with import ../../../lib;
+with stdenv.lib;
 
 stdenv.mkDerivation {
   name = "${name}-4.1.2";
diff --git a/pkgs/development/compilers/gcc-4.1/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.1/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.1/no-sys-dirs.patch
rename to pkgs/development/compilers/gcc/4.1/no-sys-dirs.patch
diff --git a/pkgs/development/compilers/gcc-apple/builder.sh b/pkgs/development/compilers/gcc/4.2-apple32/builder.sh
similarity index 100%
rename from pkgs/development/compilers/gcc-apple/builder.sh
rename to pkgs/development/compilers/gcc/4.2-apple32/builder.sh
diff --git a/pkgs/development/compilers/gcc-apple/debug_list.patch b/pkgs/development/compilers/gcc/4.2-apple32/debug_list.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-apple/debug_list.patch
rename to pkgs/development/compilers/gcc/4.2-apple32/debug_list.patch
diff --git a/pkgs/development/compilers/gcc-apple/default.nix b/pkgs/development/compilers/gcc/4.2-apple32/default.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-apple/default.nix
rename to pkgs/development/compilers/gcc/4.2-apple32/default.nix
diff --git a/pkgs/development/compilers/gcc-apple/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.2-apple32/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-apple/no-sys-dirs.patch
rename to pkgs/development/compilers/gcc/4.2-apple32/no-sys-dirs.patch
diff --git a/pkgs/development/compilers/gcc-apple/pass-cxxcpp.patch b/pkgs/development/compilers/gcc/4.2-apple32/pass-cxxcpp.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-apple/pass-cxxcpp.patch
rename to pkgs/development/compilers/gcc/4.2-apple32/pass-cxxcpp.patch
diff --git a/pkgs/development/compilers/gcc-apple64/builder.sh b/pkgs/development/compilers/gcc/4.2-apple64/builder.sh
similarity index 100%
rename from pkgs/development/compilers/gcc-apple64/builder.sh
rename to pkgs/development/compilers/gcc/4.2-apple64/builder.sh
diff --git a/pkgs/development/compilers/gcc-apple64/debug_list.patch b/pkgs/development/compilers/gcc/4.2-apple64/debug_list.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-apple64/debug_list.patch
rename to pkgs/development/compilers/gcc/4.2-apple64/debug_list.patch
diff --git a/pkgs/development/compilers/gcc-apple64/default.nix b/pkgs/development/compilers/gcc/4.2-apple64/default.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-apple64/default.nix
rename to pkgs/development/compilers/gcc/4.2-apple64/default.nix
diff --git a/pkgs/development/compilers/gcc-apple64/fix-libstdc++-link.patch b/pkgs/development/compilers/gcc/4.2-apple64/fix-libstdc++-link.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-apple64/fix-libstdc++-link.patch
rename to pkgs/development/compilers/gcc/4.2-apple64/fix-libstdc++-link.patch
diff --git a/pkgs/development/compilers/gcc-apple64/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.2-apple64/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-apple64/no-sys-dirs.patch
rename to pkgs/development/compilers/gcc/4.2-apple64/no-sys-dirs.patch
diff --git a/pkgs/development/compilers/gcc-apple64/pass-cxxcpp.patch b/pkgs/development/compilers/gcc/4.2-apple64/pass-cxxcpp.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-apple64/pass-cxxcpp.patch
rename to pkgs/development/compilers/gcc/4.2-apple64/pass-cxxcpp.patch
diff --git a/pkgs/development/compilers/gcc-4.2/builder.sh b/pkgs/development/compilers/gcc/4.2/builder.sh
similarity index 100%
rename from pkgs/development/compilers/gcc-4.2/builder.sh
rename to pkgs/development/compilers/gcc/4.2/builder.sh
diff --git a/pkgs/development/compilers/gcc-4.2/default.nix b/pkgs/development/compilers/gcc/4.2/default.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-4.2/default.nix
rename to pkgs/development/compilers/gcc/4.2/default.nix
diff --git a/pkgs/development/compilers/gcc-4.2/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.2/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.2/no-sys-dirs.patch
rename to pkgs/development/compilers/gcc/4.2/no-sys-dirs.patch
diff --git a/pkgs/development/compilers/gcc-4.2/pass-cxxcpp.patch b/pkgs/development/compilers/gcc/4.2/pass-cxxcpp.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.2/pass-cxxcpp.patch
rename to pkgs/development/compilers/gcc/4.2/pass-cxxcpp.patch
diff --git a/pkgs/development/compilers/gcc-4.3/builder.sh b/pkgs/development/compilers/gcc/4.3/builder.sh
similarity index 100%
rename from pkgs/development/compilers/gcc-4.3/builder.sh
rename to pkgs/development/compilers/gcc/4.3/builder.sh
diff --git a/pkgs/development/compilers/gcc-4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-4.3/default.nix
rename to pkgs/development/compilers/gcc/4.3/default.nix
diff --git a/pkgs/development/compilers/gcc-4.3/ghdl-ortho-cflags.patch b/pkgs/development/compilers/gcc/4.3/ghdl-ortho-cflags.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.3/ghdl-ortho-cflags.patch
rename to pkgs/development/compilers/gcc/4.3/ghdl-ortho-cflags.patch
diff --git a/pkgs/development/compilers/gcc-4.3/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.3/java-jvgenmain-link.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.3/java-jvgenmain-link.patch
rename to pkgs/development/compilers/gcc/4.3/java-jvgenmain-link.patch
diff --git a/pkgs/development/compilers/gcc-4.3/libmudflap-cpp.patch b/pkgs/development/compilers/gcc/4.3/libmudflap-cpp.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.3/libmudflap-cpp.patch
rename to pkgs/development/compilers/gcc/4.3/libmudflap-cpp.patch
diff --git a/pkgs/development/compilers/gcc-4.3/no-sys-dirs-fortran.patch b/pkgs/development/compilers/gcc/4.3/no-sys-dirs-fortran.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.3/no-sys-dirs-fortran.patch
rename to pkgs/development/compilers/gcc/4.3/no-sys-dirs-fortran.patch
diff --git a/pkgs/development/compilers/gcc-4.3/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.3/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.3/no-sys-dirs.patch
rename to pkgs/development/compilers/gcc/4.3/no-sys-dirs.patch
diff --git a/pkgs/development/compilers/gcc-4.3/pass-cxxcpp.patch b/pkgs/development/compilers/gcc/4.3/pass-cxxcpp.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.3/pass-cxxcpp.patch
rename to pkgs/development/compilers/gcc/4.3/pass-cxxcpp.patch
diff --git a/pkgs/development/compilers/gcc-4.4/builder.sh b/pkgs/development/compilers/gcc/4.4/builder.sh
similarity index 100%
rename from pkgs/development/compilers/gcc-4.4/builder.sh
rename to pkgs/development/compilers/gcc/4.4/builder.sh
diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc/4.4/default.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-4.4/default.nix
rename to pkgs/development/compilers/gcc/4.4/default.nix
diff --git a/pkgs/development/compilers/gcc-4.4/ghdl-ortho-cflags.patch b/pkgs/development/compilers/gcc/4.4/ghdl-ortho-cflags.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.4/ghdl-ortho-cflags.patch
rename to pkgs/development/compilers/gcc/4.4/ghdl-ortho-cflags.patch
diff --git a/pkgs/development/compilers/gcc-4.4/gnat-cflags.patch b/pkgs/development/compilers/gcc/4.4/gnat-cflags.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.4/gnat-cflags.patch
rename to pkgs/development/compilers/gcc/4.4/gnat-cflags.patch
diff --git a/pkgs/development/compilers/gcc-4.4/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.4/java-jvgenmain-link.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.4/java-jvgenmain-link.patch
rename to pkgs/development/compilers/gcc/4.4/java-jvgenmain-link.patch
diff --git a/pkgs/development/compilers/gcc-4.4/libstdc++-target.patch b/pkgs/development/compilers/gcc/4.4/libstdc++-target.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.4/libstdc++-target.patch
rename to pkgs/development/compilers/gcc/4.4/libstdc++-target.patch
diff --git a/pkgs/development/compilers/gcc-4.4/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.4/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.4/no-sys-dirs.patch
rename to pkgs/development/compilers/gcc/4.4/no-sys-dirs.patch
diff --git a/pkgs/development/compilers/gcc-4.4/pass-cxxcpp.patch b/pkgs/development/compilers/gcc/4.4/pass-cxxcpp.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.4/pass-cxxcpp.patch
rename to pkgs/development/compilers/gcc/4.4/pass-cxxcpp.patch
diff --git a/pkgs/development/compilers/gcc-4.4/pr41818.patch b/pkgs/development/compilers/gcc/4.4/pr41818.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.4/pr41818.patch
rename to pkgs/development/compilers/gcc/4.4/pr41818.patch
diff --git a/pkgs/development/compilers/gcc-4.4/sources.nix b/pkgs/development/compilers/gcc/4.4/sources.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-4.4/sources.nix
rename to pkgs/development/compilers/gcc/4.4/sources.nix
diff --git a/pkgs/development/compilers/gcc-4.4/target-cpp.patch b/pkgs/development/compilers/gcc/4.4/target-cpp.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.4/target-cpp.patch
rename to pkgs/development/compilers/gcc/4.4/target-cpp.patch
diff --git a/pkgs/development/compilers/gcc-4.4/update-gcc.sh b/pkgs/development/compilers/gcc/4.4/update-gcc.sh
similarity index 100%
rename from pkgs/development/compilers/gcc-4.4/update-gcc.sh
rename to pkgs/development/compilers/gcc/4.4/update-gcc.sh
diff --git a/pkgs/development/compilers/gcc-4.5/builder.sh b/pkgs/development/compilers/gcc/4.5/builder.sh
similarity index 100%
rename from pkgs/development/compilers/gcc-4.5/builder.sh
rename to pkgs/development/compilers/gcc/4.5/builder.sh
diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-4.5/default.nix
rename to pkgs/development/compilers/gcc/4.5/default.nix
diff --git a/pkgs/development/compilers/gcc-4.5/ghdl-ortho-cflags.patch b/pkgs/development/compilers/gcc/4.5/ghdl-ortho-cflags.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.5/ghdl-ortho-cflags.patch
rename to pkgs/development/compilers/gcc/4.5/ghdl-ortho-cflags.patch
diff --git a/pkgs/development/compilers/gcc-4.5/gnat-cflags.patch b/pkgs/development/compilers/gcc/4.5/gnat-cflags.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.5/gnat-cflags.patch
rename to pkgs/development/compilers/gcc/4.5/gnat-cflags.patch
diff --git a/pkgs/development/compilers/gcc-4.5/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.5/java-jvgenmain-link.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.5/java-jvgenmain-link.patch
rename to pkgs/development/compilers/gcc/4.5/java-jvgenmain-link.patch
diff --git a/pkgs/development/compilers/gcc-4.5/libstdc++-target.patch b/pkgs/development/compilers/gcc/4.5/libstdc++-target.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.5/libstdc++-target.patch
rename to pkgs/development/compilers/gcc/4.5/libstdc++-target.patch
diff --git a/pkgs/development/compilers/gcc-4.5/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.5/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.5/no-sys-dirs.patch
rename to pkgs/development/compilers/gcc/4.5/no-sys-dirs.patch
diff --git a/pkgs/development/compilers/gcc-4.5/sources.nix b/pkgs/development/compilers/gcc/4.5/sources.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-4.5/sources.nix
rename to pkgs/development/compilers/gcc/4.5/sources.nix
diff --git a/pkgs/development/compilers/gcc-4.5/update-gcc.sh b/pkgs/development/compilers/gcc/4.5/update-gcc.sh
similarity index 100%
rename from pkgs/development/compilers/gcc-4.5/update-gcc.sh
rename to pkgs/development/compilers/gcc/4.5/update-gcc.sh
diff --git a/pkgs/development/compilers/gcc-4.6/builder.sh b/pkgs/development/compilers/gcc/4.6/builder.sh
similarity index 100%
rename from pkgs/development/compilers/gcc-4.6/builder.sh
rename to pkgs/development/compilers/gcc/4.6/builder.sh
diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-4.6/default.nix
rename to pkgs/development/compilers/gcc/4.6/default.nix
diff --git a/pkgs/development/compilers/gcc-4.6/ghdl-ortho-cflags.patch b/pkgs/development/compilers/gcc/4.6/ghdl-ortho-cflags.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.6/ghdl-ortho-cflags.patch
rename to pkgs/development/compilers/gcc/4.6/ghdl-ortho-cflags.patch
diff --git a/pkgs/development/compilers/gcc-4.6/gnat-cflags.patch b/pkgs/development/compilers/gcc/4.6/gnat-cflags.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.6/gnat-cflags.patch
rename to pkgs/development/compilers/gcc/4.6/gnat-cflags.patch
diff --git a/pkgs/development/compilers/gcc-4.6/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.6/java-jvgenmain-link.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.6/java-jvgenmain-link.patch
rename to pkgs/development/compilers/gcc/4.6/java-jvgenmain-link.patch
diff --git a/pkgs/development/compilers/gcc-4.6/libstdc++-target.patch b/pkgs/development/compilers/gcc/4.6/libstdc++-target.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.6/libstdc++-target.patch
rename to pkgs/development/compilers/gcc/4.6/libstdc++-target.patch
diff --git a/pkgs/development/compilers/gcc-4.6/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.6/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.6/no-sys-dirs.patch
rename to pkgs/development/compilers/gcc/4.6/no-sys-dirs.patch
diff --git a/pkgs/development/compilers/gcc-4.6/sources.nix b/pkgs/development/compilers/gcc/4.6/sources.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-4.6/sources.nix
rename to pkgs/development/compilers/gcc/4.6/sources.nix
diff --git a/pkgs/development/compilers/gcc-4.6/update-gcc.sh b/pkgs/development/compilers/gcc/4.6/update-gcc.sh
similarity index 100%
rename from pkgs/development/compilers/gcc-4.6/update-gcc.sh
rename to pkgs/development/compilers/gcc/4.6/update-gcc.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05977e8fbcb6..38501c18e7c4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1733,15 +1733,15 @@ let
 
   gcc = gcc46;
 
-  gcc295 = wrapGCC (import ../development/compilers/gcc-2.95 {
+  gcc295 = wrapGCC (import ../development/compilers/gcc/2.95 {
     inherit fetchurl stdenv noSysDirs;
   });
 
-  gcc33 = wrapGCC (import ../development/compilers/gcc-3.3 {
+  gcc33 = wrapGCC (import ../development/compilers/gcc/3.3 {
     inherit fetchurl stdenv noSysDirs;
   });
 
-  gcc34 = wrapGCC (import ../development/compilers/gcc-3.4 {
+  gcc34 = wrapGCC (import ../development/compilers/gcc/3.4 {
     inherit fetchurl stdenv noSysDirs;
   });
 
@@ -1750,30 +1750,30 @@ let
   # expects a single digit after the dot.  As a workaround, we feed
   # GCC with Texinfo 4.9.  Stupid bug, hackish workaround.
 
-  gcc40 = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.0) {
+  gcc40 = wrapGCC (makeOverridable (import ../development/compilers/gcc/4.0) {
     inherit fetchurl stdenv noSysDirs;
     texinfo = texinfo49;
     profiledCompiler = true;
   });
 
-  gcc41 = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.1) {
+  gcc41 = wrapGCC (makeOverridable (import ../development/compilers/gcc/4.1) {
     inherit fetchurl noSysDirs gmp mpfr;
     stdenv = overrideGCC stdenv gcc42;
     texinfo = texinfo49;
     profiledCompiler = false;
   });
 
-  gcc42 = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.2) {
+  gcc42 = wrapGCC (makeOverridable (import ../development/compilers/gcc/4.2) {
     inherit fetchurl stdenv noSysDirs;
     profiledCompiler = false;
   });
 
-  gcc43 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.3) {
+  gcc43 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.3) {
     inherit stdenv fetchurl texinfo gmp mpfr noSysDirs;
     profiledCompiler = true;
   }));
 
-  gcc43_realCross = makeOverridable (import ../development/compilers/gcc-4.3) {
+  gcc43_realCross = makeOverridable (import ../development/compilers/gcc/4.3) {
     inherit stdenv fetchurl texinfo gmp mpfr noSysDirs;
     binutilsCross = binutilsCross;
     libcCross = libcCross;
@@ -1784,7 +1784,7 @@ let
   };
 
   gcc44_realCross = lib.addMetaAttrs { platforms = []; }
-    (makeOverridable (import ../development/compilers/gcc-4.4) {
+    (makeOverridable (import ../development/compilers/gcc/4.4) {
       inherit stdenv fetchurl texinfo gmp mpfr /* ppl cloogppl */ noSysDirs
           gettext which;
       binutilsCross = binutilsCross;
@@ -1800,7 +1800,7 @@ let
   gcc46 = gcc46_real;
 
   gcc45_realCross = lib.addMetaAttrs { platforms = []; }
-    (makeOverridable (import ../development/compilers/gcc-4.5) {
+    (makeOverridable (import ../development/compilers/gcc/4.5) {
       inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib
         ppl cloogppl gettext which noSysDirs;
       binutilsCross = binutilsCross;
@@ -1812,7 +1812,7 @@ let
     });
 
   gcc46_realCross = lib.addMetaAttrs { platforms = []; }
-    (makeOverridable (import ../development/compilers/gcc-4.6) {
+    (makeOverridable (import ../development/compilers/gcc/4.6) {
       inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib
         cloog ppl gettext which noSysDirs;
       binutilsCross = binutilsCross;
@@ -1869,13 +1869,13 @@ let
     enableMultilib = true;
   }));
 
-  gcc44 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.4) {
+  gcc44 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.4) {
     inherit fetchurl stdenv texinfo gmp mpfr /* ppl cloogppl */
       gettext which noSysDirs;
     profiledCompiler = true;
   }));
 
-  gcc45_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.5) {
+  gcc45_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.5) {
     inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib perl
       ppl cloogppl
       gettext which noSysDirs;
@@ -1895,7 +1895,7 @@ let
   }));
 
   # A non-stripped version of GCC.
-  gcc45_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.5 {
+  gcc45_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.5 {
     stripped = false;
 
     inherit noSysDirs;
@@ -1908,7 +1908,7 @@ let
     profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true;
   }));
 
-  gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.6 {
+  gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 {
     inherit noSysDirs;
     cross = null;
     libcCross = null;
@@ -1920,7 +1920,7 @@ let
   }));
 
   # A non-stripped version of GCC.
-  gcc46_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.6 {
+  gcc46_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 {
     stripped = false;
 
     inherit noSysDirs;
@@ -1930,10 +1930,10 @@ let
   }));
 
   gccApple =
-    wrapGCC ( (if stdenv.system == "i686-darwin" then import ../development/compilers/gcc-apple else import ../development/compilers/gcc-apple64) {
+    wrapGCC ( (if stdenv.system == "i686-darwin" then import ../development/compilers/gcc/4.2-apple32 else import ../development/compilers/gcc/4.2-apple64) {
       inherit fetchurl stdenv noSysDirs;
       profiledCompiler = true;
-    }) ;
+    });
 
   gccupc40 = wrapGCCUPC (import ../development/compilers/gcc-upc-4.0 {
     inherit fetchurl stdenv bison autoconf gnum4 noSysDirs;
@@ -2094,7 +2094,7 @@ let
     langGo = true;
   });
 
-  ghdl = wrapGCC (import ../development/compilers/gcc-4.3 {
+  ghdl = wrapGCC (import ../development/compilers/gcc/4.3 {
     inherit stdenv fetchurl texinfo gmp mpfr noSysDirs gnat;
     name = "ghdl";
     langVhdl = true;
@@ -2105,7 +2105,7 @@ let
   });
 
   # Not officially supported version for ghdl
-  ghdl_gcc44 = lowPrio (wrapGCC (import ../development/compilers/gcc-4.4 {
+  ghdl_gcc44 = lowPrio (wrapGCC (import ../development/compilers/gcc/4.4 {
     inherit stdenv fetchurl texinfo gmp mpfr noSysDirs gnat gettext which
       ppl cloogppl;
     name = "ghdl";