diff --git a/win/cmakefiles/client b/client/cmakelists.txt
similarity index 100%
rename from win/cmakefiles/client
rename to client/cmakelists.txt
diff --git a/win/cmakefiles/base b/cmakelists.txt
similarity index 100%
rename from win/cmakefiles/base
rename to cmakelists.txt
diff --git a/win/cmakefiles/dbug b/dbug/cmakelists.txt
similarity index 100%
rename from win/cmakefiles/dbug
rename to dbug/cmakelists.txt
diff --git a/win/cmakefiles/extra b/extra/cmakelists.txt
similarity index 100%
rename from win/cmakefiles/extra
rename to extra/cmakelists.txt
diff --git a/win/cmakefiles/yassl b/extra/yassl/cmakelists.txt
similarity index 100%
rename from win/cmakefiles/yassl
rename to extra/yassl/cmakelists.txt
diff --git a/win/cmakefiles/taocrypt b/extra/yassl/taocrypt/cmakelists.txt
similarity index 100%
rename from win/cmakefiles/taocrypt
rename to extra/yassl/taocrypt/cmakelists.txt
diff --git a/win/cmakefiles/libmysql b/libmysql/cmakelists.txt
similarity index 100%
rename from win/cmakefiles/libmysql
rename to libmysql/cmakelists.txt
diff --git a/win/cmakefiles/mysys b/mysys/cmakelists.txt
similarity index 100%
rename from win/cmakefiles/mysys
rename to mysys/cmakelists.txt
diff --git a/win/cmakefiles/regex b/regex/cmakelists.txt
similarity index 100%
rename from win/cmakefiles/regex
rename to regex/cmakelists.txt
diff --git a/win/cmakefiles/im b/server-tools/instance-manager/cmakelists.txt
similarity index 100%
rename from win/cmakefiles/im
rename to server-tools/instance-manager/cmakelists.txt
diff --git a/win/cmakefiles/sql b/sql/cmakelists.txt
similarity index 100%
rename from win/cmakefiles/sql
rename to sql/cmakelists.txt
diff --git a/win/cmakefiles/bdb b/storage/bdb/cmakelists.txt
similarity index 100%
rename from win/cmakefiles/bdb
rename to storage/bdb/cmakelists.txt
diff --git a/win/cmakefiles/heap b/storage/heap/cmakelists.txt
similarity index 100%
rename from win/cmakefiles/heap
rename to storage/heap/cmakelists.txt
diff --git a/win/cmakefiles/innobase b/storage/innobase/cmakelists.txt
similarity index 100%
rename from win/cmakefiles/innobase
rename to storage/innobase/cmakelists.txt
diff --git a/win/cmakefiles/myisam b/storage/myisam/cmakelists.txt
similarity index 100%
rename from win/cmakefiles/myisam
rename to storage/myisam/cmakelists.txt
diff --git a/win/cmakefiles/myisammrg b/storage/myisammrg/cmakelists.txt
similarity index 100%
rename from win/cmakefiles/myisammrg
rename to storage/myisammrg/cmakelists.txt
diff --git a/win/cmakefiles/strings b/strings/cmakelists.txt
similarity index 100%
rename from win/cmakefiles/strings
rename to strings/cmakelists.txt
diff --git a/win/cmakefiles/tests b/tests/cmakelists.txt
similarity index 100%
rename from win/cmakefiles/tests
rename to tests/cmakelists.txt
diff --git a/win/cmakefiles/vio b/vio/cmakelists.txt
similarity index 100%
rename from win/cmakefiles/vio
rename to vio/cmakelists.txt
diff --git a/win/cmakefiles/deploy.bat b/win/cmakefiles/deploy.bat
deleted file mode 100644
index 44ecb2d55fb..00000000000
--- a/win/cmakefiles/deploy.bat
+++ /dev/null
@@ -1,21 +0,0 @@
-@echo off
-copy base ..\..\cmakelists.txt
-copy client ..\..\client\cmakelists.txt
-copy dbug ..\..\dbug\cmakelists.txt
-copy extra ..\..\extra\cmakelists.txt
-copy mysys ..\..\mysys\cmakelists.txt
-copy regex ..\..\regex\cmakelists.txt
-copy sql ..\..\sql\cmakelists.txt
-copy strings ..\..\strings\cmakelists.txt
-copy vio ..\..\vio\cmakelists.txt
-copy zlib ..\..\zlib\cmakelists.txt
-copy yassl ..\..\extra\yassl\cmakelists.txt
-copy taocrypt ..\..\extra\yassl\taocrypt\cmakelists.txt
-copy bdb ..\..\storage\bdb\cmakelists.txt
-copy heap ..\..\storage\heap\cmakelists.txt
-copy innobase ..\..\storage\innobase\cmakelists.txt
-copy myisam ..\..\storage\myisam\cmakelists.txt
-copy myisammrg ..\..\storage\myisammrg\cmakelists.txt
-copy im ..\..\server-tools\instance-manager\cmakelists.txt
-copy libmysql ..\..\libmysql\cmakelists.txt
-copy tests ..\..\tests\cmakelists.txt
diff --git a/win/cmakefiles/zlib b/zlib/cmakelists.txt
similarity index 100%
rename from win/cmakefiles/zlib
rename to zlib/cmakelists.txt