reorganize files

* src/ -> km/src/
* utils/ -> um/
* Move WDK 7.1-specific *.bat files to km/build/wdk7.1/
* Move WDK 8.1 Update 1 solutions to km/build/wdk8.1update/

40 files changed, 5 insertions, 5 deletions

diff --git a/utils/CMakeLists.txt b/um/CMakeLists.txt
index 31c8511..31c8511 100644
--- a/utils/CMakeLists.txt
+++ b/um/CMakeLists.txt
diff --git a/utils/README.md b/um/README.md
index 1579471..f18091a 100644
--- a/utils/README.md
+++ b/um/README.md
@@ -9,9 +9,9 @@ A couple of usage examples are included along with the drivers.
 
 [libservice]: libservice/README.md
 [libsimple]: libsimple/README.md
-[simple]: ../src/simple
+[simple]: ../km/src/simple
 [libnt_path_converter]: libnt_path_converter/README.md
-[nt_path_converter]: ../src/nt_path_converter
+[nt_path_converter]: ../km/src/special/nt_path_converter
 
 Building the utilities
 ----------------------
@@ -24,7 +24,7 @@ x86):
     > cd
     C:\workspace\build\windows7-drivers
 
-    > cmake -G "Visual Studio 12 2013" C:\workspace\personal\windows7-drivers\utils
+    > cmake -G "Visual Studio 12 2013" C:\workspace\personal\windows7-drivers\um
     ...
 
     > msbuild windows7_drivers_utils.sln
diff --git a/utils/libnt_path_converter/CMakeLists.txt b/um/libnt_path_converter/CMakeLists.txt
index 69f85d0..69f85d0 100644
--- a/utils/libnt_path_converter/CMakeLists.txt
+++ b/um/libnt_path_converter/CMakeLists.txt
diff --git a/utils/libnt_path_converter/README.md b/um/libnt_path_converter/README.md
index b5830d6..74653dc 100644
--- a/utils/libnt_path_converter/README.md
+++ b/um/libnt_path_converter/README.md
@@ -3,7 +3,7 @@ nt_path_converter driver utilities
 
 [nt_path_converter] driver usage examples.
 
-[nt_path_converter]: ../../src/nt_path_converter
+[nt_path_converter]: ../../km/src/special/nt_path_converter
 
 Usage
 -----
diff --git a/utils/libnt_path_converter/include/libnt_path_converter/all.hpp b/um/libnt_path_converter/include/libnt_path_converter/all.hpp
index 474b802..474b802 100644
--- a/utils/libnt_path_converter/include/libnt_path_converter/all.hpp
+++ b/um/libnt_path_converter/include/libnt_path_converter/all.hpp
diff --git a/utils/libnt_path_converter/include/libnt_path_converter/device.hpp b/um/libnt_path_converter/include/libnt_path_converter/device.hpp
index e1d75fb..e1d75fb 100644
--- a/utils/libnt_path_converter/include/libnt_path_converter/device.hpp
+++ b/um/libnt_path_converter/include/libnt_path_converter/device.hpp
diff --git a/utils/libnt_path_converter/src/device.cpp b/um/libnt_path_converter/src/device.cpp
index 90cd12f..90cd12f 100644
--- a/utils/libnt_path_converter/src/device.cpp
+++ b/um/libnt_path_converter/src/device.cpp
diff --git a/utils/libnt_path_converter/utils/CMakeLists.txt b/um/libnt_path_converter/utils/CMakeLists.txt
index 9915995..9915995 100644
--- a/utils/libnt_path_converter/utils/CMakeLists.txt
+++ b/um/libnt_path_converter/utils/CMakeLists.txt
diff --git a/utils/libnt_path_converter/utils/convert_nt_path.cpp b/um/libnt_path_converter/utils/convert_nt_path.cpp
index 0055db2..0055db2 100644
--- a/utils/libnt_path_converter/utils/convert_nt_path.cpp
+++ b/um/libnt_path_converter/utils/convert_nt_path.cpp
diff --git a/utils/libservice/CMakeLists.txt b/um/libservice/CMakeLists.txt
index 34b3d13..34b3d13 100644
--- a/utils/libservice/CMakeLists.txt
+++ b/um/libservice/CMakeLists.txt
diff --git a/utils/libservice/README.md b/um/libservice/README.md
index f9fb601..f9fb601 100644
--- a/utils/libservice/README.md
+++ b/um/libservice/README.md
diff --git a/utils/libservice/include/libservice/all.hpp b/um/libservice/include/libservice/all.hpp
index a5761e0..a5761e0 100644
--- a/utils/libservice/include/libservice/all.hpp
+++ b/um/libservice/include/libservice/all.hpp
diff --git a/utils/libservice/include/libservice/common.hpp b/um/libservice/include/libservice/common.hpp
index a1c46fb..a1c46fb 100644
--- a/utils/libservice/include/libservice/common.hpp
+++ b/um/libservice/include/libservice/common.hpp
diff --git a/utils/libservice/include/libservice/device.hpp b/um/libservice/include/libservice/device.hpp
index ac292c8..ac292c8 100644
--- a/utils/libservice/include/libservice/device.hpp
+++ b/um/libservice/include/libservice/device.hpp
diff --git a/utils/libservice/include/libservice/handle.hpp b/um/libservice/include/libservice/handle.hpp
index 5e351d2..5e351d2 100644
--- a/utils/libservice/include/libservice/handle.hpp
+++ b/um/libservice/include/libservice/handle.hpp
diff --git a/utils/libservice/include/libservice/service.hpp b/um/libservice/include/libservice/service.hpp
index 089f790..089f790 100644
--- a/utils/libservice/include/libservice/service.hpp
+++ b/um/libservice/include/libservice/service.hpp
diff --git a/utils/libservice/include/libservice/service_handle.hpp b/um/libservice/include/libservice/service_handle.hpp
index 2883ff3..2883ff3 100644
--- a/utils/libservice/include/libservice/service_handle.hpp
+++ b/um/libservice/include/libservice/service_handle.hpp
diff --git a/utils/libservice/include/libservice/service_manager.hpp b/um/libservice/include/libservice/service_manager.hpp
index 80e6f12..80e6f12 100644
--- a/utils/libservice/include/libservice/service_manager.hpp
+++ b/um/libservice/include/libservice/service_manager.hpp
diff --git a/utils/libservice/include/libservice/singleton.hpp b/um/libservice/include/libservice/singleton.hpp
index 1c7b1a7..1c7b1a7 100644
--- a/utils/libservice/include/libservice/singleton.hpp
+++ b/um/libservice/include/libservice/singleton.hpp
diff --git a/utils/libservice/include/libservice/windows_error.hpp b/um/libservice/include/libservice/windows_error.hpp
index f7ac90e..f7ac90e 100644
--- a/utils/libservice/include/libservice/windows_error.hpp
+++ b/um/libservice/include/libservice/windows_error.hpp
diff --git a/utils/libservice/src/device.cpp b/um/libservice/src/device.cpp
index 5643106..5643106 100644
--- a/utils/libservice/src/device.cpp
+++ b/um/libservice/src/device.cpp
diff --git a/utils/libservice/src/handle.cpp b/um/libservice/src/handle.cpp
index 7567781..7567781 100644
--- a/utils/libservice/src/handle.cpp
+++ b/um/libservice/src/handle.cpp
diff --git a/utils/libservice/src/service.cpp b/um/libservice/src/service.cpp
index 8b5e043..8b5e043 100644
--- a/utils/libservice/src/service.cpp
+++ b/um/libservice/src/service.cpp
diff --git a/utils/libservice/src/service_handle.cpp b/um/libservice/src/service_handle.cpp
index adce7f0..adce7f0 100644
--- a/utils/libservice/src/service_handle.cpp
+++ b/um/libservice/src/service_handle.cpp
diff --git a/utils/libservice/src/service_manager.cpp b/um/libservice/src/service_manager.cpp
index 61662de..61662de 100644
--- a/utils/libservice/src/service_manager.cpp
+++ b/um/libservice/src/service_manager.cpp
diff --git a/utils/libservice/src/windows_error.cpp b/um/libservice/src/windows_error.cpp
index f27018b..f27018b 100644
--- a/utils/libservice/src/windows_error.cpp
+++ b/um/libservice/src/windows_error.cpp
diff --git a/utils/libservice/test/CMakeLists.txt b/um/libservice/test/CMakeLists.txt
index 4780deb..4780deb 100644
--- a/utils/libservice/test/CMakeLists.txt
+++ b/um/libservice/test/CMakeLists.txt
diff --git a/utils/libservice/test/windows_error.cpp b/um/libservice/test/windows_error.cpp
index b909670..b909670 100644
--- a/utils/libservice/test/windows_error.cpp
+++ b/um/libservice/test/windows_error.cpp
diff --git a/utils/libservice/utils/CMakeLists.txt b/um/libservice/utils/CMakeLists.txt
index 061ab25..061ab25 100644
--- a/utils/libservice/utils/CMakeLists.txt
+++ b/um/libservice/utils/CMakeLists.txt
diff --git a/utils/libservice/utils/install_service.cpp b/um/libservice/utils/install_service.cpp
index f36af75..f36af75 100644
--- a/utils/libservice/utils/install_service.cpp
+++ b/um/libservice/utils/install_service.cpp
diff --git a/utils/libservice/utils/start_service.cpp b/um/libservice/utils/start_service.cpp
index fafee53..fafee53 100644
--- a/utils/libservice/utils/start_service.cpp
+++ b/um/libservice/utils/start_service.cpp
diff --git a/utils/libservice/utils/stop_service.cpp b/um/libservice/utils/stop_service.cpp
index 800c7a9..800c7a9 100644
--- a/utils/libservice/utils/stop_service.cpp
+++ b/um/libservice/utils/stop_service.cpp
diff --git a/utils/libservice/utils/uninstall_service.cpp b/um/libservice/utils/uninstall_service.cpp
index 395bb51..395bb51 100644
--- a/utils/libservice/utils/uninstall_service.cpp
+++ b/um/libservice/utils/uninstall_service.cpp
diff --git a/utils/libsimple/CMakeLists.txt b/um/libsimple/CMakeLists.txt
index ff61bd7..ff61bd7 100644
--- a/utils/libsimple/CMakeLists.txt
+++ b/um/libsimple/CMakeLists.txt
diff --git a/utils/libsimple/README.md b/um/libsimple/README.md
index 1d9896a..ac00d63 100644
--- a/utils/libsimple/README.md
+++ b/um/libsimple/README.md
@@ -3,7 +3,7 @@ simple driver utilities
 
 [simple] driver usage examples.
 
-[simple]: ../../src/simple
+[simple]: ../../km/src/simple
 
 Usage
 -----
diff --git a/utils/libsimple/include/libsimple/all.hpp b/um/libsimple/include/libsimple/all.hpp
index 474b802..474b802 100644
--- a/utils/libsimple/include/libsimple/all.hpp
+++ b/um/libsimple/include/libsimple/all.hpp
diff --git a/utils/libsimple/include/libsimple/device.hpp b/um/libsimple/include/libsimple/device.hpp
index 3318818..3318818 100644
--- a/utils/libsimple/include/libsimple/device.hpp
+++ b/um/libsimple/include/libsimple/device.hpp
diff --git a/utils/libsimple/src/device.cpp b/um/libsimple/src/device.cpp
index 57e6963..57e6963 100644
--- a/utils/libsimple/src/device.cpp
+++ b/um/libsimple/src/device.cpp
diff --git a/utils/libsimple/utils/CMakeLists.txt b/um/libsimple/utils/CMakeLists.txt
index 8824e3e..8824e3e 100644
--- a/utils/libsimple/utils/CMakeLists.txt
+++ b/um/libsimple/utils/CMakeLists.txt
diff --git a/utils/libsimple/utils/exchange_ints.cpp b/um/libsimple/utils/exchange_ints.cpp
index 2935b2f..2935b2f 100644
--- a/utils/libsimple/utils/exchange_ints.cpp
+++ b/um/libsimple/utils/exchange_ints.cpp