diff --git a/contrib/vmap_assembler/CMakeLists.txt b/contrib/vmap3_assembler/CMakeLists.txt
similarity index 100%
rename from contrib/vmap_assembler/CMakeLists.txt
rename to contrib/vmap3_assembler/CMakeLists.txt
diff --git a/contrib/vmap_assembler/VC90/vmap_assembler.vcproj b/contrib/vmap3_assembler/VC90/vmap_assembler.vcproj
similarity index 100%
rename from contrib/vmap_assembler/VC90/vmap_assembler.vcproj
rename to contrib/vmap3_assembler/VC90/vmap_assembler.vcproj
diff --git a/contrib/vmap_assembler/splitConfig.txt b/contrib/vmap3_assembler/splitConfig.txt
similarity index 100%
rename from contrib/vmap_assembler/splitConfig.txt
rename to contrib/vmap3_assembler/splitConfig.txt
diff --git a/contrib/vmap_assembler/vmap_assembler.cpp b/contrib/vmap3_assembler/vmap_assembler.cpp
similarity index 100%
rename from contrib/vmap_assembler/vmap_assembler.cpp
rename to contrib/vmap3_assembler/vmap_assembler.cpp
diff --git a/contrib/vmap_assembler/vmap_assemblerVC90.sln b/contrib/vmap3_assembler/vmap_assemblerVC90.sln
similarity index 100%
rename from contrib/vmap_assembler/vmap_assemblerVC90.sln
rename to contrib/vmap3_assembler/vmap_assemblerVC90.sln
diff --git a/contrib/vmap_extractor_v2/CMakeLists.txt b/contrib/vmap3_extractor/CMakeLists.txt
similarity index 100%
rename from contrib/vmap_extractor_v2/CMakeLists.txt
rename to contrib/vmap3_extractor/CMakeLists.txt
diff --git a/contrib/vmap_extractor_v2/vmapextract/CMakeLists.txt b/contrib/vmap3_extractor/vmapextract/CMakeLists.txt
similarity index 100%
rename from contrib/vmap_extractor_v2/vmapextract/CMakeLists.txt
rename to contrib/vmap3_extractor/vmapextract/CMakeLists.txt
diff --git a/contrib/vmap_extractor_v2/vmapextract/adtfile.cpp b/contrib/vmap3_extractor/vmapextract/adtfile.cpp
similarity index 100%
rename from contrib/vmap_extractor_v2/vmapextract/adtfile.cpp
rename to contrib/vmap3_extractor/vmapextract/adtfile.cpp
diff --git a/contrib/vmap_extractor_v2/vmapextract/adtfile.h b/contrib/vmap3_extractor/vmapextract/adtfile.h
similarity index 100%
rename from contrib/vmap_extractor_v2/vmapextract/adtfile.h
rename to contrib/vmap3_extractor/vmapextract/adtfile.h
diff --git a/contrib/vmap_extractor_v2/vmapextract/dbcfile.cpp b/contrib/vmap3_extractor/vmapextract/dbcfile.cpp
similarity index 100%
rename from contrib/vmap_extractor_v2/vmapextract/dbcfile.cpp
rename to contrib/vmap3_extractor/vmapextract/dbcfile.cpp
diff --git a/contrib/vmap_extractor_v2/vmapextract/dbcfile.h b/contrib/vmap3_extractor/vmapextract/dbcfile.h
similarity index 100%
rename from contrib/vmap_extractor_v2/vmapextract/dbcfile.h
rename to contrib/vmap3_extractor/vmapextract/dbcfile.h
diff --git a/contrib/vmap_extractor_v2/vmapextract/loadlib/loadlib.h b/contrib/vmap3_extractor/vmapextract/loadlib/loadlib.h
similarity index 100%
rename from contrib/vmap_extractor_v2/vmapextract/loadlib/loadlib.h
rename to contrib/vmap3_extractor/vmapextract/loadlib/loadlib.h
diff --git a/contrib/vmap_extractor_v2/vmapextract/model.cpp b/contrib/vmap3_extractor/vmapextract/model.cpp
similarity index 100%
rename from contrib/vmap_extractor_v2/vmapextract/model.cpp
rename to contrib/vmap3_extractor/vmapextract/model.cpp
diff --git a/contrib/vmap_extractor_v2/vmapextract/model.h b/contrib/vmap3_extractor/vmapextract/model.h
similarity index 100%
rename from contrib/vmap_extractor_v2/vmapextract/model.h
rename to contrib/vmap3_extractor/vmapextract/model.h
diff --git a/contrib/vmap_extractor_v2/vmapextract/modelheaders.h b/contrib/vmap3_extractor/vmapextract/modelheaders.h
similarity index 100%
rename from contrib/vmap_extractor_v2/vmapextract/modelheaders.h
rename to contrib/vmap3_extractor/vmapextract/modelheaders.h
diff --git a/contrib/vmap_extractor_v2/vmapextract/mpq_libmpq.cpp b/contrib/vmap3_extractor/vmapextract/mpq_libmpq.cpp
similarity index 100%
rename from contrib/vmap_extractor_v2/vmapextract/mpq_libmpq.cpp
rename to contrib/vmap3_extractor/vmapextract/mpq_libmpq.cpp
diff --git a/contrib/vmap_extractor_v2/vmapextract/mpq_libmpq04.h b/contrib/vmap3_extractor/vmapextract/mpq_libmpq04.h
similarity index 100%
rename from contrib/vmap_extractor_v2/vmapextract/mpq_libmpq04.h
rename to contrib/vmap3_extractor/vmapextract/mpq_libmpq04.h
diff --git a/contrib/vmap_extractor_v2/vmapextract/vec3d.h b/contrib/vmap3_extractor/vmapextract/vec3d.h
similarity index 100%
rename from contrib/vmap_extractor_v2/vmapextract/vec3d.h
rename to contrib/vmap3_extractor/vmapextract/vec3d.h
diff --git a/contrib/vmap_extractor_v2/vmapextract/vmapexport.cpp b/contrib/vmap3_extractor/vmapextract/vmapexport.cpp
similarity index 100%
rename from contrib/vmap_extractor_v2/vmapextract/vmapexport.cpp
rename to contrib/vmap3_extractor/vmapextract/vmapexport.cpp
diff --git a/contrib/vmap_extractor_v2/vmapextract/vmapexport.h b/contrib/vmap3_extractor/vmapextract/vmapexport.h
similarity index 100%
rename from contrib/vmap_extractor_v2/vmapextract/vmapexport.h
rename to contrib/vmap3_extractor/vmapextract/vmapexport.h
diff --git a/contrib/vmap_extractor_v2/vmapextract/wdtfile.cpp b/contrib/vmap3_extractor/vmapextract/wdtfile.cpp
similarity index 100%
rename from contrib/vmap_extractor_v2/vmapextract/wdtfile.cpp
rename to contrib/vmap3_extractor/vmapextract/wdtfile.cpp
diff --git a/contrib/vmap_extractor_v2/vmapextract/wdtfile.h b/contrib/vmap3_extractor/vmapextract/wdtfile.h
similarity index 100%
rename from contrib/vmap_extractor_v2/vmapextract/wdtfile.h
rename to contrib/vmap3_extractor/vmapextract/wdtfile.h
diff --git a/contrib/vmap_extractor_v2/vmapextract/wmo.cpp b/contrib/vmap3_extractor/vmapextract/wmo.cpp
similarity index 100%
rename from contrib/vmap_extractor_v2/vmapextract/wmo.cpp
rename to contrib/vmap3_extractor/vmapextract/wmo.cpp
diff --git a/contrib/vmap_extractor_v2/vmapextract/wmo.h b/contrib/vmap3_extractor/vmapextract/wmo.h
similarity index 100%
rename from contrib/vmap_extractor_v2/vmapextract/wmo.h
rename to contrib/vmap3_extractor/vmapextract/wmo.h
diff --git a/contrib/vmap_extractor_v2/win/vmapExtractor3_VC90.sln b/contrib/vmap3_extractor/win/vmapExtractor3_VC90.sln
similarity index 100%
rename from contrib/vmap_extractor_v2/win/vmapExtractor3_VC90.sln
rename to contrib/vmap3_extractor/win/vmapExtractor3_VC90.sln