diff --git a/src/ctpp2/src/Makefile.mvsc b/src/ctpp2/src/Makefile.mvsc
deleted file mode 100644
index fc5d450..0000000
--- a/src/ctpp2/src/Makefile.mvsc
+++ /dev/null
@@ -1,13 +0,0 @@
-CC=cl.exe
-LD=link.exe
-
-# Compiler and linker flags
-CFLAGS=-O2 -Oi -I"../include"  -I"../include/functions" -D"WIN32" -FD -EHsc -MT -Gy -nologo -c -Zi -TP		    
-all: ctpp2.lib
-
-objs:
-	rm -f vc90*
-	$(CC) $(CFLAGS) *.cpp functions/*.cpp
-
-ctpp2.lib: objs
-	$(LD) -lib -NOLOGO -NODEFAULTLIB:"MSVCRT" -MACHINE:X86 -OUT:ctpp2.lib $(LDFLAGS) *.obj
diff --git a/src/indexer/Makefile.mvsc b/src/indexer/Makefile.mvsc
deleted file mode 100644
index ee6b928..0000000
--- a/src/indexer/Makefile.mvsc
+++ /dev/null
@@ -1,32 +0,0 @@
-CC=cl.exe
-LD=link.exe
-
-# Global paths
-ZIM=../zimlib
-ICU=../dependences/icu
-XAPIAN=../dependences/xapian-core-1.2.3
-ARGTABLE=../dependences/argtable
-
-# Include paths
-ZIM_INCLUDE=${ZIM}/include
-ICU_INCLUDE=${ICU}/include
-XAPIAN_INCLUDE=${XAPIAN}/include
-ARGTABLE_INCLUDE=${ARGTABLE}/src
-
-# Lib paths
-ZIM_LIB=${ZIM}/src
-ICU_LIB=${ICU}/lib
-XAPIAN_LIB=${XAPIAN}/win32/Release/libs
-ARGTABLE_LIB=${ARGTABLE}/src
-
-# Compiler and linker flags
-CFLAGS=-D"XP_WIN" -D"__GNU_LIBRARY__" -D"(__STDC__)" -D"__STDC__"  -D"XP_WIN32" -O2 -Oi -I"${XAPIAN_INCLUDE}" -I"${ZIM_INCLUDE}" -I${ARGTABLE_INCLUDE} -I$(ICU_INCLUDE) -I../common/ -I../zimlib/include/win -D"_WINDLL" -D"_MBCS" -FD -EHsc -MT -Gy -nologo -c -Zi -TP
-LDFLAGS=-nologo -LIBPATH:"${ZIM_LIB}" -LIBPATH:"$(ICU_LIB)" -LIBPATH:"$(XAPIAN_LIB)" -LIBPATH:"${ARGTABLE_LIB}" 
-
-all: kiwix-index.exe
-
-objs:
-	$(CC) $(CFLAGS) kiwix-index.cpp ../common/kiwix/xapian/myhtmlparse.cc ../common/kiwix/xapian/htmlparse.cc ../common/unaccent.cpp ../common/kiwix/indexer.cpp ../common/kiwix/xapianIndexer.cpp 
-
-kiwix-index.exe: objs
-	$(LD) -OUT:"kiwix-index.exe" -NOLOGO $(LDFLAGS) -NODEFAULTLIB:"MSVCRT" -OPT:REF -OPT:ICF -DYNAMICBASE -NXCOMPAT -MACHINE:X86 zim.lib argtable2.lib libcommon.lib libbackend.lib libbrass.lib Rpcrt4.lib libbrassbtreecheck.lib libbrassbtreecheck.lib libexpand.lib libflint.lib libflintbtreecheck.lib libchert.lib libweight.lib libinmemory.lib libmulti.lib libmatcher.lib libnet.lib liblanguages.lib libapi.lib libremote.lib libunicode.lib libqueryparser.lib icuin.lib icuio.lib icule.lib iculx.lib icutu.lib icuuc.lib libcmt.lib ws2_32.lib DelayImp.lib winmm.lib *.obj
diff --git a/src/installer/Makefile.mvsc b/src/installer/Makefile.mvsc
deleted file mode 100644
index 50896a6..0000000
--- a/src/installer/Makefile.mvsc
+++ /dev/null
@@ -1,38 +0,0 @@
-CC=cl.exe
-LD=link.exe
-
-# Global paths
-ZIM=../zimlib
-ICU=../dependences/icu
-PUGIXML=../pugixml
-XAPIAN=../dependences/xapian-core-1.2.3
-ARGTABLE=../dependences/argtable
-
-# Include paths
-ZIM_INCLUDE=${ZIM}/include
-ICU_INCLUDE=${ICU}/include
-PUGIXML_INCLUDE=${PUGIXML}
-XAPIAN_INCLUDE=${XAPIAN}/include
-ARGTABLE_INCLUDE=${ARGTABLE}/src
-
-# Lib paths
-ZIM_LIB=${ZIM}/src
-ICU_LIB=${ICU}/lib
-PUGIXML_LIB=${PUGIXML}
-XAPIAN_LIB=${XAPIAN}/win32/Release/libs
-ARGTABLE_LIB=${ARGTABLE}/src
-
-# Compiler and linker flags
-CFLAGS=-D"XP_WIN" -D"XP_WIN32" -O2 -Oi -I"${ZIM_INCLUDE}" -I"${PUGIXML_INCLUDE}" -I${ARGTABLE_INCLUDE} -I${XAPIAN_INCLUDE} -I$(ICU_INCLUDE) -I../common/ -I../zimlib/include/win -D"_WINDLL" -D"_MBCS" -FD -EHsc -MT -Gy -nologo -c -Zi -TP
-LDFLAGS=-nologo -LIBPATH:"${PUGIXML_LIB}" -LIBPATH:"${XAPIAN_LIB}" -LIBPATH:"${ZIM_LIB}" -LIBPATH:"$(ICU_LIB)" -LIBPATH:"${ARGTABLE_LIB}" 
-
-all: kiwix-install.exe
-
-argtableobjs:
-	$(CC) $(CFLAGS) -D"__GNU_LIBRARY__" -D"(__STDC__)" -D"__STDC__" kiwix-install.cpp
-
-objs:
-	$(CC) $(CFLAGS)	../common/kiwix/xapian/myhtmlparse.cc ../common/kiwix/xapian/htmlparse.cc ../common/kiwix/xapianIndexer.cpp ../common/unaccent.cpp ../common/base64.cpp ../common/kiwix/indexer.cpp ../common/kiwix/reader.cpp ../common/kiwix/library.cpp ../common/kiwix/manager.cpp ../common/regexTools.cpp ../common/pathTools.cpp 
-
-kiwix-install.exe: objs argtableobjs
-	$(LD) -OUT:"kiwix-install.exe" -NOLOGO $(LDFLAGS) -NODEFAULTLIB:"MSVCRT" -OPT:REF -OPT:ICF -DYNAMICBASE -NXCOMPAT -MACHINE:X86 pugixml.lib zim.lib argtable2.lib libcommon.lib libbackend.lib libbrass.lib Rpcrt4.lib libbrassbtreecheck.lib libbrassbtreecheck.lib libexpand.lib libflint.lib libflintbtreecheck.lib libchert.lib libweight.lib libinmemory.lib libmulti.lib libmatcher.lib libnet.lib liblanguages.lib libapi.lib libremote.lib libunicode.lib libqueryparser.lib icuin.lib icuio.lib icule.lib iculx.lib icutu.lib icuuc.lib libcmt.lib ws2_32.lib DelayImp.lib winmm.lib *.obj
diff --git a/src/manager/Makefile.mvsc b/src/manager/Makefile.mvsc
deleted file mode 100644
index a007a6a..0000000
--- a/src/manager/Makefile.mvsc
+++ /dev/null
@@ -1,35 +0,0 @@
-CC=cl.exe
-LD=link.exe
-
-# Global paths
-ZIM=../zimlib
-ICU=../dependences/icu
-PUGIXML=../pugixml
-ARGTABLE=../dependences/argtable
-
-# Include paths
-ZIM_INCLUDE=${ZIM}/include
-ICU_INCLUDE=${ICU}/include
-PUGIXML_INCLUDE=${PUGIXML}
-ARGTABLE_INCLUDE=${ARGTABLE}/src
-
-# Lib paths
-ZIM_LIB=${ZIM}/src
-ICU_LIB=${ICU}/lib
-PUGIXML_LIB=${PUGIXML}
-ARGTABLE_LIB=${ARGTABLE}/src
-
-# Compiler and linker flags
-CFLAGS=-D"XP_WIN" -D"XP_WIN32" -O2 -Oi -I"${ZIM_INCLUDE}" -I"${PUGIXML_INCLUDE}" -I${ARGTABLE_INCLUDE} -I$(ICU_INCLUDE) -I../common/ -I../zimlib/include/win -D"_WINDLL" -D"_MBCS" -FD -EHsc -MT -Gy -nologo -c -Zi -TP
-LDFLAGS=-nologo -LIBPATH:"${PUGIXML_LIB}" -LIBPATH:"${ZIM_LIB}" -LIBPATH:"$(ICU_LIB)" -LIBPATH:"${ARGTABLE_LIB}" 
-
-all: kiwix-manage.exe
-
-argtableobjs:
-	$(CC) $(CFLAGS) -D"__GNU_LIBRARY__" -D"(__STDC__)" -D"__STDC__" kiwix-manage.cpp
-
-objs:
-	$(CC) $(CFLAGS) ../common/unaccent.cpp ../common/kiwix/library.cpp ../common/base64.cpp ../common/regexTools.cpp ../common/pathTools.cpp ../common/kiwix/reader.cpp ../common/kiwix/manager.cpp
-
-kiwix-manage.exe: objs argtableobjs
-	$(LD) -OUT:"kiwix-manage.exe" -NOLOGO $(LDFLAGS) -NODEFAULTLIB:"MSVCRT" -OPT:REF -OPT:ICF -DYNAMICBASE -NXCOMPAT -MACHINE:X86 pugixml.lib zim.lib argtable2.lib icuin.lib icuio.lib icule.lib iculx.lib icutu.lib icuuc.lib libcmt.lib ws2_32.lib DelayImp.lib winmm.lib *.obj
diff --git a/src/pugixml/Makefile.mvsc b/src/pugixml/Makefile.mvsc
deleted file mode 100644
index 31d82d1..0000000
--- a/src/pugixml/Makefile.mvsc
+++ /dev/null
@@ -1,13 +0,0 @@
-CC=cl.exe
-LD=link.exe
-
-# Compiler and linker flags
-CFLAGS=-O2 -Oi -I"./"  -D"WIN32" -FD -EHsc -MT -Gy -nologo -c -Zi -TP		    
-all: pugixml.lib
-
-objs:
-	rm -f vc90*
-	$(CC) $(CFLAGS) *.cpp 
-
-pugixml.lib: objs
-	$(LD) -lib -NOLOGO -NODEFAULTLIB:"MSVCRT" -MACHINE:X86 -OUT:pugixml.lib $(LDFLAGS) *.obj
diff --git a/src/server/Makefile.mvsc b/src/server/Makefile.mvsc
deleted file mode 100644
index a6723ac..0000000
--- a/src/server/Makefile.mvsc
+++ /dev/null
@@ -1,50 +0,0 @@
-CC=cl.exe
-LD=link.exe
-
-# Global paths
-ZIM=../zimlib
-PUGIXML=../pugixml
-ICU=../dependences/icu
-CTPP2=../ctpp2
-ARGTABLE=../dependences/argtable
-HTTPD=../dependences/libmicrohttpd
-XAPIAN=../dependences/xapian-core-1.2.3
-PTHREAD=../dependences/pthread-win32
-ZLIB=../dependences/zlib-1.2.3
-
-# Include paths
-ZIM_INCLUDE=${ZIM}/include
-PUGIXML_INCLUDE=${PUGIXML}
-ICU_INCLUDE=${ICU}/include
-CTPP2_INCLUDE=${CTPP2}/include
-ARGTABLE_INCLUDE=${ARGTABLE}/src
-HTTPD_INCLUDE=${HTTPD}/include
-XAPIAN_INCLUDE=${XAPIAN}/include
-PTHREAD_INCLUDE=${PTHREAD}/include
-ZLIB_INCLUDE=${ZLIB}
-
-# Lib paths
-ZIM_LIB=${ZIM}/src
-PUGIXML_LIB=${PUGIXML}
-ICU_LIB=${ICU}/lib
-CTPP2_LIB=${CTPP2}/src
-ARGTABLE_LIB=${ARGTABLE}/src
-HTTPD_LIB=${HTTPD}/lib
-XAPIAN_LIB=${XAPIAN}/win32/Release/libs
-PTHREAD_LIB=${PTHREAD}/lib
-ZLIB_LIB=${ZLIB}
-
-# Compiler and linker flags
-CFLAGS=-D"XP_WIN" -D"XP_WIN32" -D"WIN32" -O2 -Oi -I"${XAPIAN_INCLUDE}" -I"${HTTPD_INCLUDE}" -I"${ZIM_INCLUDE}" -I"${PTHREAD_INCLUDE}" -I"${PUGIXML_INCLUDE}" -I${ARGTABLE_INCLUDE} -I$(ZLIB_INCLUDE) -I$(ICU_INCLUDE) -I${CTPP2_INCLUDE} -I../common/ -I../zimlib/include/win -D"_WINDLL" -D"_MBCS" -FD -EHsc -MT -Gy -nologo -c -Zi -TP
-LDFLAGS=-nologo -LIBPATH:"$(PTHREAD_LIB)" -LIBPATH:"$(CTPP2_LIB)" -LIBPATH:"${XAPIAN_LIB}" -LIBPATH:"${HTTPD_LIB}" -LIBPATH:"${ZIM_LIB}" -LIBPATH:"${PUGIXML_LIB}" -LIBPATH:"$(ZLIB_LIB)" -LIBPATH:"$(ICU_LIB)" -LIBPATH:"${ARGTABLE_LIB}" 
-
-all: kiwix-serve.exe
-
-argtableobjs:
-	$(CC) $(CFLAGS) -D"MHD_PLATFORM_H" -D"__GNU_LIBRARY__" -D"(__STDC__)" -D"__STDC__" kiwix-serve.cpp
-
-objs:
-	$(CC) $(CFLAGS) ../common/base64.cpp ../common/kiwix/manager.cpp ../common/kiwix/reader.cpp ../common/kiwix/library.cpp ../common/kiwix/searcher.cpp ../common/kiwix/xapianSearcher.cpp ../common/unaccent.cpp ../common/stringTools.cpp ../common/regexTools.cpp ../common/pathTools.cpp ../common/resourceTools.cpp
-
-kiwix-serve.exe: argtableobjs objs
-	$(LD) -OUT:"kiwix-serve.exe" -NOLOGO $(LDFLAGS) -NODEFAULTLIB:"MSVCRT" -OPT:REF -OPT:ICF -DYNAMICBASE -NXCOMPAT -MACHINE:X86 zim.lib argtable2.lib pugixml.lib libmicrohttpd.dll.a ctpp2.lib libcommon.lib libbackend.lib libbrass.lib Rpcrt4.lib libbrassbtreecheck.lib libbrassbtreecheck.lib libexpand.lib libflint.lib libflintbtreecheck.lib libchert.lib libweight.lib libinmemory.lib libmulti.lib libmatcher.lib libnet.lib liblanguages.lib libapi.lib libremote.lib libunicode.lib libqueryparser.lib icuin.lib icuio.lib icule.lib iculx.lib icutu.lib icuuc.lib libcmt.lib ws2_32.lib DelayImp.lib winmm.lib pthreadVC2.lib zlib.lib *.obj
diff --git a/src/zimlib/src/Makefile.mvsc b/src/zimlib/src/Makefile.mvsc
deleted file mode 100644
index 6c81ba6..0000000
--- a/src/zimlib/src/Makefile.mvsc
+++ /dev/null
@@ -1,28 +0,0 @@
-CC=cl.exe
-LD=link.exe
-
-# Global paths
-Z=../../dependences/zlib-1.2.3
-LZMA=../../dependences/xz/
-
-# Include paths
-Z_INCLUDE=${Z}
-LZMA_INCLUDE=${LZMA}/src/liblzma/api
-
-# Lib paths
-Z_LIB=${Z}
-LZMA_LIB=${LZMA}/windows
-
-# Compiler and linker flags
-CFLAGS=-O2 -Oi -I"../include/win" -I"../include" -I"${LZMA_INCLUDE}" -I"${Z_INCLUDE}" -D"WIN32" -FD -EHsc -MT -Gy  -nologo -c -Zi -TP		    
-LDFLAGS=-LIBPATH:"$(Z_LIB)"  -LIBPATH:"${LZMA_LIB}"
-
-all: zim.lib
-     
-
-objs:
-	rm -f vc90*
-	$(CC) $(CFLAGS) *.cpp
-
-zim.lib: objs
-	$(LD) -lib -NOLOGO -NODEFAULTLIB:"MSVCRT" -MACHINE:X86 -OUT:zim.lib $(LDFLAGS) zlib.lib liblzma.lib *.obj