diff --git a/src/tools/genrevision/genrevision.cpp b/src/genrevision/genrevision.cpp
similarity index 100%
rename from src/tools/genrevision/genrevision.cpp
rename to src/genrevision/genrevision.cpp
diff --git a/contrib/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
similarity index 100%
rename from contrib/map_extractor/CMakeLists.txt
rename to src/tools/map_extractor/CMakeLists.txt
diff --git a/contrib/map_extractor/README.linux b/src/tools/map_extractor/README.linux
similarity index 100%
rename from contrib/map_extractor/README.linux
rename to src/tools/map_extractor/README.linux
diff --git a/contrib/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp
similarity index 100%
rename from contrib/map_extractor/System.cpp
rename to src/tools/map_extractor/System.cpp
diff --git a/contrib/map_extractor/VC90_AD.sln b/src/tools/map_extractor/VC90_AD.sln
similarity index 100%
rename from contrib/map_extractor/VC90_AD.sln
rename to src/tools/map_extractor/VC90_AD.sln
diff --git a/contrib/map_extractor/VC90_ad.vcproj b/src/tools/map_extractor/VC90_ad.vcproj
similarity index 100%
rename from contrib/map_extractor/VC90_ad.vcproj
rename to src/tools/map_extractor/VC90_ad.vcproj
diff --git a/contrib/map_extractor/ad b/src/tools/map_extractor/ad
similarity index 100%
rename from contrib/map_extractor/ad
rename to src/tools/map_extractor/ad
diff --git a/contrib/map_extractor/ad.exe b/src/tools/map_extractor/ad.exe
similarity index 100%
rename from contrib/map_extractor/ad.exe
rename to src/tools/map_extractor/ad.exe
diff --git a/contrib/map_extractor/adt.cpp b/src/tools/map_extractor/adt.cpp
similarity index 100%
rename from contrib/map_extractor/adt.cpp
rename to src/tools/map_extractor/adt.cpp
diff --git a/contrib/map_extractor/adt.h b/src/tools/map_extractor/adt.h
similarity index 100%
rename from contrib/map_extractor/adt.h
rename to src/tools/map_extractor/adt.h
diff --git a/contrib/map_extractor/dbcfile.cpp b/src/tools/map_extractor/dbcfile.cpp
similarity index 100%
rename from contrib/map_extractor/dbcfile.cpp
rename to src/tools/map_extractor/dbcfile.cpp
diff --git a/contrib/map_extractor/dbcfile.h b/src/tools/map_extractor/dbcfile.h
similarity index 100%
rename from contrib/map_extractor/dbcfile.h
rename to src/tools/map_extractor/dbcfile.h
diff --git a/contrib/map_extractor/debug/zlib.lib b/src/tools/map_extractor/debug/zlib.lib
similarity index 100%
rename from contrib/map_extractor/debug/zlib.lib
rename to src/tools/map_extractor/debug/zlib.lib
diff --git a/contrib/map_extractor/libmpq/CMakeLists.txt b/src/tools/map_extractor/libmpq/CMakeLists.txt
similarity index 100%
rename from contrib/map_extractor/libmpq/CMakeLists.txt
rename to src/tools/map_extractor/libmpq/CMakeLists.txt
diff --git a/contrib/map_extractor/libmpq/common.cpp b/src/tools/map_extractor/libmpq/common.cpp
similarity index 100%
rename from contrib/map_extractor/libmpq/common.cpp
rename to src/tools/map_extractor/libmpq/common.cpp
diff --git a/contrib/map_extractor/libmpq/common.h b/src/tools/map_extractor/libmpq/common.h
similarity index 100%
rename from contrib/map_extractor/libmpq/common.h
rename to src/tools/map_extractor/libmpq/common.h
diff --git a/contrib/map_extractor/libmpq/explode.cpp b/src/tools/map_extractor/libmpq/explode.cpp
similarity index 100%
rename from contrib/map_extractor/libmpq/explode.cpp
rename to src/tools/map_extractor/libmpq/explode.cpp
diff --git a/contrib/map_extractor/libmpq/explode.h b/src/tools/map_extractor/libmpq/explode.h
similarity index 100%
rename from contrib/map_extractor/libmpq/explode.h
rename to src/tools/map_extractor/libmpq/explode.h
diff --git a/contrib/map_extractor/libmpq/extract.cpp b/src/tools/map_extractor/libmpq/extract.cpp
similarity index 100%
rename from contrib/map_extractor/libmpq/extract.cpp
rename to src/tools/map_extractor/libmpq/extract.cpp
diff --git a/contrib/map_extractor/libmpq/huffman.cpp b/src/tools/map_extractor/libmpq/huffman.cpp
similarity index 100%
rename from contrib/map_extractor/libmpq/huffman.cpp
rename to src/tools/map_extractor/libmpq/huffman.cpp
diff --git a/contrib/map_extractor/libmpq/huffman.h b/src/tools/map_extractor/libmpq/huffman.h
similarity index 100%
rename from contrib/map_extractor/libmpq/huffman.h
rename to src/tools/map_extractor/libmpq/huffman.h
diff --git a/contrib/map_extractor/libmpq/mpq.cpp b/src/tools/map_extractor/libmpq/mpq.cpp
similarity index 100%
rename from contrib/map_extractor/libmpq/mpq.cpp
rename to src/tools/map_extractor/libmpq/mpq.cpp
diff --git a/contrib/map_extractor/libmpq/mpq.h b/src/tools/map_extractor/libmpq/mpq.h
similarity index 100%
rename from contrib/map_extractor/libmpq/mpq.h
rename to src/tools/map_extractor/libmpq/mpq.h
diff --git a/contrib/map_extractor/libmpq/parser.cpp b/src/tools/map_extractor/libmpq/parser.cpp
similarity index 100%
rename from contrib/map_extractor/libmpq/parser.cpp
rename to src/tools/map_extractor/libmpq/parser.cpp
diff --git a/contrib/map_extractor/libmpq/wave.cpp b/src/tools/map_extractor/libmpq/wave.cpp
similarity index 100%
rename from contrib/map_extractor/libmpq/wave.cpp
rename to src/tools/map_extractor/libmpq/wave.cpp
diff --git a/contrib/map_extractor/libmpq/wave.h b/src/tools/map_extractor/libmpq/wave.h
similarity index 100%
rename from contrib/map_extractor/libmpq/wave.h
rename to src/tools/map_extractor/libmpq/wave.h
diff --git a/contrib/map_extractor/libmpq/zconf.h b/src/tools/map_extractor/libmpq/zconf.h
similarity index 100%
rename from contrib/map_extractor/libmpq/zconf.h
rename to src/tools/map_extractor/libmpq/zconf.h
diff --git a/contrib/map_extractor/libmpq/zlib.h b/src/tools/map_extractor/libmpq/zlib.h
similarity index 100%
rename from contrib/map_extractor/libmpq/zlib.h
rename to src/tools/map_extractor/libmpq/zlib.h
diff --git a/contrib/map_extractor/loadlib/CMakeLists.txt b/src/tools/map_extractor/loadlib/CMakeLists.txt
similarity index 100%
rename from contrib/map_extractor/loadlib/CMakeLists.txt
rename to src/tools/map_extractor/loadlib/CMakeLists.txt
diff --git a/contrib/map_extractor/loadlib/adt.cpp b/src/tools/map_extractor/loadlib/adt.cpp
similarity index 100%
rename from contrib/map_extractor/loadlib/adt.cpp
rename to src/tools/map_extractor/loadlib/adt.cpp
diff --git a/contrib/map_extractor/loadlib/adt.h b/src/tools/map_extractor/loadlib/adt.h
similarity index 100%
rename from contrib/map_extractor/loadlib/adt.h
rename to src/tools/map_extractor/loadlib/adt.h
diff --git a/contrib/map_extractor/loadlib/loadlib.cpp b/src/tools/map_extractor/loadlib/loadlib.cpp
similarity index 100%
rename from contrib/map_extractor/loadlib/loadlib.cpp
rename to src/tools/map_extractor/loadlib/loadlib.cpp
diff --git a/contrib/map_extractor/loadlib/loadlib.h b/src/tools/map_extractor/loadlib/loadlib.h
similarity index 100%
rename from contrib/map_extractor/loadlib/loadlib.h
rename to src/tools/map_extractor/loadlib/loadlib.h
diff --git a/contrib/map_extractor/loadlib/wdt.cpp b/src/tools/map_extractor/loadlib/wdt.cpp
similarity index 100%
rename from contrib/map_extractor/loadlib/wdt.cpp
rename to src/tools/map_extractor/loadlib/wdt.cpp
diff --git a/contrib/map_extractor/loadlib/wdt.h b/src/tools/map_extractor/loadlib/wdt.h
similarity index 100%
rename from contrib/map_extractor/loadlib/wdt.h
rename to src/tools/map_extractor/loadlib/wdt.h
diff --git a/contrib/map_extractor/mpq_libmpq.cpp b/src/tools/map_extractor/mpq_libmpq.cpp
similarity index 100%
rename from contrib/map_extractor/mpq_libmpq.cpp
rename to src/tools/map_extractor/mpq_libmpq.cpp
diff --git a/contrib/map_extractor/mpq_libmpq.h b/src/tools/map_extractor/mpq_libmpq.h
similarity index 100%
rename from contrib/map_extractor/mpq_libmpq.h
rename to src/tools/map_extractor/mpq_libmpq.h
diff --git a/contrib/map_extractor/release/zlib.lib b/src/tools/map_extractor/release/zlib.lib
similarity index 100%
rename from contrib/map_extractor/release/zlib.lib
rename to src/tools/map_extractor/release/zlib.lib
diff --git a/contrib/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
similarity index 100%
rename from contrib/vmap3_assembler/CMakeLists.txt
rename to src/tools/vmap3_assembler/CMakeLists.txt
diff --git a/contrib/vmap3_assembler/VC90/vmap_assembler.vcproj b/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj
similarity index 100%
rename from contrib/vmap3_assembler/VC90/vmap_assembler.vcproj
rename to src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj
diff --git a/contrib/vmap3_assembler/splitConfig.txt b/src/tools/vmap3_assembler/splitConfig.txt
similarity index 100%
rename from contrib/vmap3_assembler/splitConfig.txt
rename to src/tools/vmap3_assembler/splitConfig.txt
diff --git a/contrib/vmap3_assembler/vmap_assembler.cpp b/src/tools/vmap3_assembler/vmap_assembler.cpp
similarity index 100%
rename from contrib/vmap3_assembler/vmap_assembler.cpp
rename to src/tools/vmap3_assembler/vmap_assembler.cpp
diff --git a/contrib/vmap3_assembler/vmap_assemblerVC90.sln b/src/tools/vmap3_assembler/vmap_assemblerVC90.sln
similarity index 100%
rename from contrib/vmap3_assembler/vmap_assemblerVC90.sln
rename to src/tools/vmap3_assembler/vmap_assemblerVC90.sln
diff --git a/contrib/vmap3_extractor/CMakeLists.txt b/src/tools/vmap3_extractor/CMakeLists.txt
similarity index 100%
rename from contrib/vmap3_extractor/CMakeLists.txt
rename to src/tools/vmap3_extractor/CMakeLists.txt
diff --git a/contrib/vmap3_extractor/vmapextract/CMakeLists.txt b/src/tools/vmap3_extractor/vmapextract/CMakeLists.txt
similarity index 100%
rename from contrib/vmap3_extractor/vmapextract/CMakeLists.txt
rename to src/tools/vmap3_extractor/vmapextract/CMakeLists.txt
diff --git a/contrib/vmap3_extractor/vmapextract/adtfile.cpp b/src/tools/vmap3_extractor/vmapextract/adtfile.cpp
similarity index 100%
rename from contrib/vmap3_extractor/vmapextract/adtfile.cpp
rename to src/tools/vmap3_extractor/vmapextract/adtfile.cpp
diff --git a/contrib/vmap3_extractor/vmapextract/adtfile.h b/src/tools/vmap3_extractor/vmapextract/adtfile.h
similarity index 100%
rename from contrib/vmap3_extractor/vmapextract/adtfile.h
rename to src/tools/vmap3_extractor/vmapextract/adtfile.h
diff --git a/contrib/vmap3_extractor/vmapextract/dbcfile.cpp b/src/tools/vmap3_extractor/vmapextract/dbcfile.cpp
similarity index 100%
rename from contrib/vmap3_extractor/vmapextract/dbcfile.cpp
rename to src/tools/vmap3_extractor/vmapextract/dbcfile.cpp
diff --git a/contrib/vmap3_extractor/vmapextract/dbcfile.h b/src/tools/vmap3_extractor/vmapextract/dbcfile.h
similarity index 100%
rename from contrib/vmap3_extractor/vmapextract/dbcfile.h
rename to src/tools/vmap3_extractor/vmapextract/dbcfile.h
diff --git a/contrib/vmap3_extractor/vmapextract/loadlib/loadlib.h b/src/tools/vmap3_extractor/vmapextract/loadlib/loadlib.h
similarity index 100%
rename from contrib/vmap3_extractor/vmapextract/loadlib/loadlib.h
rename to src/tools/vmap3_extractor/vmapextract/loadlib/loadlib.h
diff --git a/contrib/vmap3_extractor/vmapextract/model.cpp b/src/tools/vmap3_extractor/vmapextract/model.cpp
similarity index 100%
rename from contrib/vmap3_extractor/vmapextract/model.cpp
rename to src/tools/vmap3_extractor/vmapextract/model.cpp
diff --git a/contrib/vmap3_extractor/vmapextract/model.h b/src/tools/vmap3_extractor/vmapextract/model.h
similarity index 100%
rename from contrib/vmap3_extractor/vmapextract/model.h
rename to src/tools/vmap3_extractor/vmapextract/model.h
diff --git a/contrib/vmap3_extractor/vmapextract/modelheaders.h b/src/tools/vmap3_extractor/vmapextract/modelheaders.h
similarity index 100%
rename from contrib/vmap3_extractor/vmapextract/modelheaders.h
rename to src/tools/vmap3_extractor/vmapextract/modelheaders.h
diff --git a/contrib/vmap3_extractor/vmapextract/mpq_libmpq.cpp b/src/tools/vmap3_extractor/vmapextract/mpq_libmpq.cpp
similarity index 100%
rename from contrib/vmap3_extractor/vmapextract/mpq_libmpq.cpp
rename to src/tools/vmap3_extractor/vmapextract/mpq_libmpq.cpp
diff --git a/contrib/vmap3_extractor/vmapextract/mpq_libmpq04.h b/src/tools/vmap3_extractor/vmapextract/mpq_libmpq04.h
similarity index 100%
rename from contrib/vmap3_extractor/vmapextract/mpq_libmpq04.h
rename to src/tools/vmap3_extractor/vmapextract/mpq_libmpq04.h
diff --git a/contrib/vmap3_extractor/vmapextract/vec3d.h b/src/tools/vmap3_extractor/vmapextract/vec3d.h
similarity index 100%
rename from contrib/vmap3_extractor/vmapextract/vec3d.h
rename to src/tools/vmap3_extractor/vmapextract/vec3d.h
diff --git a/contrib/vmap3_extractor/vmapextract/vmapexport.cpp b/src/tools/vmap3_extractor/vmapextract/vmapexport.cpp
similarity index 100%
rename from contrib/vmap3_extractor/vmapextract/vmapexport.cpp
rename to src/tools/vmap3_extractor/vmapextract/vmapexport.cpp
diff --git a/contrib/vmap3_extractor/vmapextract/vmapexport.h b/src/tools/vmap3_extractor/vmapextract/vmapexport.h
similarity index 100%
rename from contrib/vmap3_extractor/vmapextract/vmapexport.h
rename to src/tools/vmap3_extractor/vmapextract/vmapexport.h
diff --git a/contrib/vmap3_extractor/vmapextract/wdtfile.cpp b/src/tools/vmap3_extractor/vmapextract/wdtfile.cpp
similarity index 100%
rename from contrib/vmap3_extractor/vmapextract/wdtfile.cpp
rename to src/tools/vmap3_extractor/vmapextract/wdtfile.cpp
diff --git a/contrib/vmap3_extractor/vmapextract/wdtfile.h b/src/tools/vmap3_extractor/vmapextract/wdtfile.h
similarity index 100%
rename from contrib/vmap3_extractor/vmapextract/wdtfile.h
rename to src/tools/vmap3_extractor/vmapextract/wdtfile.h
diff --git a/contrib/vmap3_extractor/vmapextract/wmo.cpp b/src/tools/vmap3_extractor/vmapextract/wmo.cpp
similarity index 100%
rename from contrib/vmap3_extractor/vmapextract/wmo.cpp
rename to src/tools/vmap3_extractor/vmapextract/wmo.cpp
diff --git a/contrib/vmap3_extractor/vmapextract/wmo.h b/src/tools/vmap3_extractor/vmapextract/wmo.h
similarity index 100%
rename from contrib/vmap3_extractor/vmapextract/wmo.h
rename to src/tools/vmap3_extractor/vmapextract/wmo.h
diff --git a/contrib/vmap3_extractor/win/vmapExtractor3_VC90.sln b/src/tools/vmap3_extractor/win/vmapExtractor3_VC90.sln
similarity index 100%
rename from contrib/vmap3_extractor/win/vmapExtractor3_VC90.sln
rename to src/tools/vmap3_extractor/win/vmapExtractor3_VC90.sln