diff --git a/.gitignore b/.gitignore
index d3ddc045..1b2ca5e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 .vim/.netrwhist
 .vim/bundle/*
 !.vim/bundle/Vundle.vim
+setup*.exe
+*mirror*cygwin*/
diff --git a/windows_cygwin/.minttyrc b/windows/.minttyrc
similarity index 100%
rename from windows_cygwin/.minttyrc
rename to windows/.minttyrc
diff --git a/windows_cygwin/README.md b/windows/README.md
similarity index 100%
rename from windows_cygwin/README.md
rename to windows/README.md
diff --git a/windows_cygwin/bootstrap.ps1 b/windows/bootstrap.ps1
similarity index 100%
rename from windows_cygwin/bootstrap.ps1
rename to windows/bootstrap.ps1
diff --git a/windows_cygwin/build.bat b/windows/build.bat
old mode 100755
new mode 100644
similarity index 93%
rename from windows_cygwin/build.bat
rename to windows/build.bat
index 500e58d8..93b04b91
--- a/windows_cygwin/build.bat
+++ b/windows/build.bat
@@ -1,5 +1,5 @@
 @echo on
-choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs.install stylecop
+choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs.install stylecop conemu dejavufonts
 call refreshenv
 
 wget -c https://cygwin.com/setup-x86_64.exe
diff --git a/windows_cygwin/build_insider.sh b/windows/build_insider.sh
old mode 100755
new mode 100644
similarity index 100%
rename from windows_cygwin/build_insider.sh
rename to windows/build_insider.sh