diff --git a/wmake/rules/MINGW32_NT-6.1Gcc/c b/wmake/rules/MINGW32_NT-6.1Gcc/c
deleted file mode 100644
index 5be3206f8..000000000
--- a/wmake/rules/MINGW32_NT-6.1Gcc/c
+++ /dev/null
@@ -1,16 +0,0 @@
-.SUFFIXES: .c .h
-
-cWARN        = -Wall
-
-cc          = gcc
-
-include $(RULES)/c$(WM_COMPILE_OPTION)
-
-cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
-
-ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
-
-LINK_LIBS   = $(cDBUG)
-
-LINKLIBSO   = $(cc) -shared
-LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/MINGW32_NT-6.2Gcc/X b/wmake/rules/MINGW32_NT-6.2Gcc/X
deleted file mode 100644
index 5d1f9c5cc..000000000
--- a/wmake/rules/MINGW32_NT-6.2Gcc/X
+++ /dev/null
@@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/X11R6/include
-XLIBS      = -L/usr/X11R6/lib64 -lXext -lX11
diff --git a/wmake/rules/MINGW32_NT-6.2Gcc/c b/wmake/rules/MINGW32_NT-6.2Gcc/c
deleted file mode 100644
index 5be3206f8..000000000
--- a/wmake/rules/MINGW32_NT-6.2Gcc/c
+++ /dev/null
@@ -1,16 +0,0 @@
-.SUFFIXES: .c .h
-
-cWARN        = -Wall
-
-cc          = gcc
-
-include $(RULES)/c$(WM_COMPILE_OPTION)
-
-cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
-
-ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
-
-LINK_LIBS   = $(cDBUG)
-
-LINKLIBSO   = $(cc) -shared
-LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/MINGW32_NT-6.2Gcc/c++ b/wmake/rules/MINGW32_NT-6.2Gcc/c++
deleted file mode 100644
index 2692d673e..000000000
--- a/wmake/rules/MINGW32_NT-6.2Gcc/c++
+++ /dev/null
@@ -1,22 +0,0 @@
-.SUFFIXES: .C .cxx .cc .cpp
-
-c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor
-
-CC          = g++
-
-include $(RULES)/c++$(WM_COMPILE_OPTION)
-
-ptFLAGS     = -DNoRepository -ftemplate-depth-200
-
-GFLAGS     = -DWM_$(WM_PRECISION_OPTION)
-c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -I$(OPENMPI_DIR)/include -I$(WM_THIRD_PARTY_DIR)/packages/system/include -Dmingw -DBIG_ENDIAN=0 -DLITTLE_ENDIAN=1 -DBYTE_ORDER=BIG_ENDIAN
-
-Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
-cxxtoo      = $(Ctoo)
-cctoo       = $(Ctoo)
-cpptoo      = $(Ctoo)
-
-LINK_LIBS   = $(c++DBUG) -L$(OPENMPI_DIR)/lib -lmpi -lpthread -lz -L$(WM_THIRD_PARTY_DIR)/packages/system/lib -ldl -lpsapi
-
-LINKLIBSO   = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed
-LINKEXE     = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed $(FOAM_LIBBIN)/libOSspecific.o
diff --git a/wmake/rules/MINGW32_NT-6.2Gcc/c++Debug b/wmake/rules/MINGW32_NT-6.2Gcc/c++Debug
deleted file mode 100644
index 19bdb9c33..000000000
--- a/wmake/rules/MINGW32_NT-6.2Gcc/c++Debug
+++ /dev/null
@@ -1,2 +0,0 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
-c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/MINGW32_NT-6.2Gcc/c++Opt b/wmake/rules/MINGW32_NT-6.2Gcc/c++Opt
deleted file mode 100644
index 3446f7f58..000000000
--- a/wmake/rules/MINGW32_NT-6.2Gcc/c++Opt
+++ /dev/null
@@ -1,4 +0,0 @@
-c++DBUG     =
-c++OPT      = -O3
-#c++OPT      = -march=nocona -O3
-# -ftree-vectorize -ftree-vectorizer-verbose=3
diff --git a/wmake/rules/MINGW32_NT-6.2Gcc/c++Prof b/wmake/rules/MINGW32_NT-6.2Gcc/c++Prof
deleted file mode 100644
index 3bda4dad5..000000000
--- a/wmake/rules/MINGW32_NT-6.2Gcc/c++Prof
+++ /dev/null
@@ -1,2 +0,0 @@
-c++DBUG    = -pg
-c++OPT     = -O2
diff --git a/wmake/rules/MINGW32_NT-6.2Gcc/cDebug b/wmake/rules/MINGW32_NT-6.2Gcc/cDebug
deleted file mode 100644
index 72b638f45..000000000
--- a/wmake/rules/MINGW32_NT-6.2Gcc/cDebug
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       = -ggdb -DFULLDEBUG
-cOPT        = -O1 -fdefault-inline -finline-functions
diff --git a/wmake/rules/MINGW32_NT-6.2Gcc/cOpt b/wmake/rules/MINGW32_NT-6.2Gcc/cOpt
deleted file mode 100644
index 17318709f..000000000
--- a/wmake/rules/MINGW32_NT-6.2Gcc/cOpt
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       =
-cOPT        = -O3
diff --git a/wmake/rules/MINGW32_NT-6.2Gcc/cProf b/wmake/rules/MINGW32_NT-6.2Gcc/cProf
deleted file mode 100644
index ca3ac9bf5..000000000
--- a/wmake/rules/MINGW32_NT-6.2Gcc/cProf
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       = -pg
-cOPT        = -O2
diff --git a/wmake/rules/MINGW32_NT-6.2Gcc/general b/wmake/rules/MINGW32_NT-6.2Gcc/general
deleted file mode 100644
index 59e047a34..000000000
--- a/wmake/rules/MINGW32_NT-6.2Gcc/general
+++ /dev/null
@@ -1,11 +0,0 @@
-CPP        = cpp -traditional-cpp
-LD         = ld
-
-PROJECT_LIBS = -l$(WM_PROJECT) -liberty
-
-include $(GENERAL_RULES)/standard
-
-include $(RULES)/X
-include $(RULES)/c
-include $(RULES)/c++
-include $(RULES)/nvcc
diff --git a/wmake/rules/MINGW32_NT-6.2Gcc/mplib b/wmake/rules/MINGW32_NT-6.2Gcc/mplib
deleted file mode 100644
index 294bd8615..000000000
--- a/wmake/rules/MINGW32_NT-6.2Gcc/mplib
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       =
-PLIBS      =
diff --git a/wmake/rules/MINGW32_NT-6.2Gcc/mplibGAMMA b/wmake/rules/MINGW32_NT-6.2Gcc/mplibGAMMA
deleted file mode 100644
index 11606f298..000000000
--- a/wmake/rules/MINGW32_NT-6.2Gcc/mplibGAMMA
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/MINGW32_NT-6.2Gcc/mplibHPMPI b/wmake/rules/MINGW32_NT-6.2Gcc/mplibHPMPI
deleted file mode 100644
index 574492a23..000000000
--- a/wmake/rules/MINGW32_NT-6.2Gcc/mplibHPMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi
diff --git a/wmake/rules/MINGW32_NT-6.2Gcc/mplibMPICH b/wmake/rules/MINGW32_NT-6.2Gcc/mplibMPICH
deleted file mode 100644
index ad53c8d44..000000000
--- a/wmake/rules/MINGW32_NT-6.2Gcc/mplibMPICH
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich
diff --git a/wmake/rules/MINGW32_NT-6.2Gcc/mplibMPICH-GM b/wmake/rules/MINGW32_NT-6.2Gcc/mplibMPICH-GM
deleted file mode 100644
index 88493ebc7..000000000
--- a/wmake/rules/MINGW32_NT-6.2Gcc/mplibMPICH-GM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/MINGW32_NT-6.2Gcc/mplibOPENMPI b/wmake/rules/MINGW32_NT-6.2Gcc/mplibOPENMPI
deleted file mode 100644
index 50018e30b..000000000
--- a/wmake/rules/MINGW32_NT-6.2Gcc/mplibOPENMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(OPENMPI_DIR)/include
-PLIBS      = -L$(OPENMPI_DIR)/lib -lmpi
diff --git a/wmake/rules/MINGW32_NT-6.2Gcc/mplibQSMPI b/wmake/rules/MINGW32_NT-6.2Gcc/mplibQSMPI
deleted file mode 100644
index 807d20ab3..000000000
--- a/wmake/rules/MINGW32_NT-6.2Gcc/mplibQSMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/MINGW32_NT-6.2Gcc/mplibSYSTEMOPENMPI b/wmake/rules/MINGW32_NT-6.2Gcc/mplibSYSTEMOPENMPI
deleted file mode 100644
index 98fa814ce..000000000
--- a/wmake/rules/MINGW32_NT-6.2Gcc/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
diff --git a/wmake/rules/MINGW32_NT-6.2Gcc/nvcc b/wmake/rules/MINGW32_NT-6.2Gcc/nvcc
deleted file mode 100644
index 9a04fe4d6..000000000
--- a/wmake/rules/MINGW32_NT-6.2Gcc/nvcc
+++ /dev/null
@@ -1,17 +0,0 @@
-.SUFFIXES: .cu
-
-NVCC        = nvcc -arch $(CUDA_ARCH)
-
-NVCC_ptFLAGS = -DNoRepository
-
-NVCC_FLAGS  =   $(NVCC_ptFLAGS)  -Xcompiler -fPIC $(LIB_HEADER_DIRS) $(GFLAGS) $(c++OPT) $(c++DBUG)
-
-cutoo       = $(WM_SCHEDULER) $(NVCC) $(NVCC_FLAGS) -c $$SOURCE -o $@
-
-LINK_LIBS   = $(c++DBUG)
-
-LINKLIBSO   = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed
-LINKEXE     = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed
-
-.cu.dep:
-	$(MAKE_DEP)
diff --git a/wmake/rules/MINGW32_NT-6.2Gcc/ARCHITECTURE_TESTED b/wmake/rules/mingw64/ARCHITECTURE_TESTED
similarity index 100%
rename from wmake/rules/MINGW32_NT-6.2Gcc/ARCHITECTURE_TESTED
rename to wmake/rules/mingw64/ARCHITECTURE_TESTED
diff --git a/wmake/rules/MINGW32_NT-6.1Gcc/X b/wmake/rules/mingw64/X
similarity index 100%
rename from wmake/rules/MINGW32_NT-6.1Gcc/X
rename to wmake/rules/mingw64/X
diff --git a/wmake/rules/MINGW32_NT-6.1Gcc/c++ b/wmake/rules/mingw64/c++
similarity index 100%
rename from wmake/rules/MINGW32_NT-6.1Gcc/c++
rename to wmake/rules/mingw64/c++
diff --git a/wmake/rules/MINGW32_NT-6.1Gcc/c++Debug b/wmake/rules/mingw64/c++Debug
similarity index 100%
rename from wmake/rules/MINGW32_NT-6.1Gcc/c++Debug
rename to wmake/rules/mingw64/c++Debug
diff --git a/wmake/rules/MINGW32_NT-6.1Gcc/c++Opt b/wmake/rules/mingw64/c++Opt
similarity index 100%
rename from wmake/rules/MINGW32_NT-6.1Gcc/c++Opt
rename to wmake/rules/mingw64/c++Opt
diff --git a/wmake/rules/MINGW32_NT-6.1Gcc/c++Prof b/wmake/rules/mingw64/c++Prof
similarity index 100%
rename from wmake/rules/MINGW32_NT-6.1Gcc/c++Prof
rename to wmake/rules/mingw64/c++Prof
diff --git a/wmake/rules/MINGW32_NT-6.1Gcc/cDebug b/wmake/rules/mingw64/cDebug
similarity index 100%
rename from wmake/rules/MINGW32_NT-6.1Gcc/cDebug
rename to wmake/rules/mingw64/cDebug
diff --git a/wmake/rules/MINGW32_NT-6.1Gcc/cOpt b/wmake/rules/mingw64/cOpt
similarity index 100%
rename from wmake/rules/MINGW32_NT-6.1Gcc/cOpt
rename to wmake/rules/mingw64/cOpt
diff --git a/wmake/rules/MINGW32_NT-6.1Gcc/cProf b/wmake/rules/mingw64/cProf
similarity index 100%
rename from wmake/rules/MINGW32_NT-6.1Gcc/cProf
rename to wmake/rules/mingw64/cProf
diff --git a/wmake/rules/MINGW32_NT-6.1Gcc/general b/wmake/rules/mingw64/general
similarity index 100%
rename from wmake/rules/MINGW32_NT-6.1Gcc/general
rename to wmake/rules/mingw64/general
diff --git a/wmake/rules/MINGW32_NT-6.1Gcc/mplib b/wmake/rules/mingw64/mplib
similarity index 100%
rename from wmake/rules/MINGW32_NT-6.1Gcc/mplib
rename to wmake/rules/mingw64/mplib
diff --git a/wmake/rules/MINGW32_NT-6.1Gcc/mplibGAMMA b/wmake/rules/mingw64/mplibGAMMA
similarity index 100%
rename from wmake/rules/MINGW32_NT-6.1Gcc/mplibGAMMA
rename to wmake/rules/mingw64/mplibGAMMA
diff --git a/wmake/rules/MINGW32_NT-6.1Gcc/mplibHPMPI b/wmake/rules/mingw64/mplibHPMPI
similarity index 100%
rename from wmake/rules/MINGW32_NT-6.1Gcc/mplibHPMPI
rename to wmake/rules/mingw64/mplibHPMPI
diff --git a/wmake/rules/MINGW32_NT-6.1Gcc/mplibMPICH b/wmake/rules/mingw64/mplibMPICH
similarity index 100%
rename from wmake/rules/MINGW32_NT-6.1Gcc/mplibMPICH
rename to wmake/rules/mingw64/mplibMPICH
diff --git a/wmake/rules/MINGW32_NT-6.1Gcc/mplibMPICH-GM b/wmake/rules/mingw64/mplibMPICH-GM
similarity index 100%
rename from wmake/rules/MINGW32_NT-6.1Gcc/mplibMPICH-GM
rename to wmake/rules/mingw64/mplibMPICH-GM
diff --git a/wmake/rules/MINGW32_NT-6.1Gcc/mplibOPENMPI b/wmake/rules/mingw64/mplibOPENMPI
similarity index 100%
rename from wmake/rules/MINGW32_NT-6.1Gcc/mplibOPENMPI
rename to wmake/rules/mingw64/mplibOPENMPI
diff --git a/wmake/rules/MINGW32_NT-6.1Gcc/mplibQSMPI b/wmake/rules/mingw64/mplibQSMPI
similarity index 100%
rename from wmake/rules/MINGW32_NT-6.1Gcc/mplibQSMPI
rename to wmake/rules/mingw64/mplibQSMPI
diff --git a/wmake/rules/MINGW32_NT-6.1Gcc/mplibSYSTEMOPENMPI b/wmake/rules/mingw64/mplibSYSTEMOPENMPI
similarity index 100%
rename from wmake/rules/MINGW32_NT-6.1Gcc/mplibSYSTEMOPENMPI
rename to wmake/rules/mingw64/mplibSYSTEMOPENMPI
diff --git a/wmake/rules/MINGW32_NT-6.1Gcc/nvcc b/wmake/rules/mingw64/nvcc
similarity index 100%
rename from wmake/rules/MINGW32_NT-6.1Gcc/nvcc
rename to wmake/rules/mingw64/nvcc