From 0548f161d339743a65a292c0fd407636213e5768 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Mon, 27 May 2013 10:13:00 -0700
Subject: [PATCH] Streamline subdirectories for ripple_basics

---
 modules/ripple_basics/ripple_basics.cpp       | 16 ++--
 modules/ripple_basics/ripple_basics.h         | 21 ++---
 .../{memory => utility}/ripple_ByteOrder.cpp  |  0
 .../{memory => utility}/ripple_ByteOrder.h    |  0
 .../{types => utility}/ripple_IntegerTypes.h  |  0
 .../{diagnostic => utility}/ripple_Log.cpp    |  0
 .../{diagnostic => utility}/ripple_Log.h      |  0
 .../ripple_PlatformMacros.h                   |  0
 .../ripple_RandomNumbers.cpp                  |  0
 .../ripple_RandomNumbers.h                    |  0
 .../ripple_StringUtilities.cpp                |  0
 .../ripple_StringUtilities.h                  |  0
 .../{system => utility}/ripple_ThreadName.cpp |  0
 .../{system => utility}/ripple_ThreadName.h   |  0
 .../{system => utility}/ripple_Time.cpp       |  0
 .../{system => utility}/ripple_Time.h         |  0
 .../ripple_UptimeTimer.cpp                    |  0
 .../{events => utility}/ripple_UptimeTimer.h  |  0
 newcoin.vcxproj                               | 72 +++++++--------
 newcoin.vcxproj.filters                       | 90 ++++++++-----------
 20 files changed, 91 insertions(+), 108 deletions(-)
 rename modules/ripple_basics/{memory => utility}/ripple_ByteOrder.cpp (100%)
 rename modules/ripple_basics/{memory => utility}/ripple_ByteOrder.h (100%)
 rename modules/ripple_basics/{types => utility}/ripple_IntegerTypes.h (100%)
 rename modules/ripple_basics/{diagnostic => utility}/ripple_Log.cpp (100%)
 rename modules/ripple_basics/{diagnostic => utility}/ripple_Log.h (100%)
 rename modules/ripple_basics/{system => utility}/ripple_PlatformMacros.h (100%)
 rename modules/ripple_basics/{system => utility}/ripple_RandomNumbers.cpp (100%)
 rename modules/ripple_basics/{system => utility}/ripple_RandomNumbers.h (100%)
 rename modules/ripple_basics/{memory => utility}/ripple_StringUtilities.cpp (100%)
 rename modules/ripple_basics/{memory => utility}/ripple_StringUtilities.h (100%)
 rename modules/ripple_basics/{system => utility}/ripple_ThreadName.cpp (100%)
 rename modules/ripple_basics/{system => utility}/ripple_ThreadName.h (100%)
 rename modules/ripple_basics/{system => utility}/ripple_Time.cpp (100%)
 rename modules/ripple_basics/{system => utility}/ripple_Time.h (100%)
 rename modules/ripple_basics/{events => utility}/ripple_UptimeTimer.cpp (100%)
 rename modules/ripple_basics/{events => utility}/ripple_UptimeTimer.h (100%)

diff --git a/modules/ripple_basics/ripple_basics.cpp b/modules/ripple_basics/ripple_basics.cpp
index 21b6a20c47..665bd7ca79 100644
--- a/modules/ripple_basics/ripple_basics.cpp
+++ b/modules/ripple_basics/ripple_basics.cpp
@@ -51,11 +51,9 @@
 
 #include "containers/ripple_RangeSet.cpp"
 
-#include "diagnostic/ripple_Log.cpp"
-
-#include "events/ripple_UptimeTimer.cpp"
-
-#include "memory/ripple_StringUtilities.cpp"
+#include "utility/ripple_Log.cpp"
+#include "utility/ripple_UptimeTimer.cpp"
+#include "utility/ripple_StringUtilities.cpp"
 
 #ifdef WIN32
 #include <windows.h>  // for ripple_RandomNumbers.cpp
@@ -63,11 +61,11 @@
 // Winsock #defines 'max' and does other stupid things so put it last
 #include <Winsock2.h> // for ripple_ByteOrder.cpp
 #endif
-#include "memory/ripple_ByteOrder.cpp"
+#include "utility/ripple_ByteOrder.cpp"
 
-#include "system/ripple_RandomNumbers.cpp"
-#include "system/ripple_ThreadName.cpp"
-#include "system/ripple_Time.cpp"
+#include "utility/ripple_RandomNumbers.cpp"
+#include "utility/ripple_ThreadName.cpp"
+#include "utility/ripple_Time.cpp"
 
 #ifdef _MSC_VER
 //#pragma warning (pop)
diff --git a/modules/ripple_basics/ripple_basics.h b/modules/ripple_basics/ripple_basics.h
index 58d4835d40..6702114f7a 100644
--- a/modules/ripple_basics/ripple_basics.h
+++ b/modules/ripple_basics/ripple_basics.h
@@ -95,23 +95,20 @@ namespace boost {
 
 #include "../ripple_json/ripple_json.h"
 
-#include "types/ripple_IntegerTypes.h" // must come first
-
-#include "diagnostic/ripple_Log.h" // Needed by others
+#include "utility/ripple_IntegerTypes.h" // must come first
+#include "utility/ripple_Log.h" // Needed by others
 
 #include "containers/ripple_KeyCache.h"
 #include "containers/ripple_RangeSet.h"
 #include "containers/ripple_SecureAllocator.h"
 #include "containers/ripple_TaggedCache.h"
 
-#include "memory/ripple_ByteOrder.h"
-#include "memory/ripple_StringUtilities.h"
-
-#include "events/ripple_UptimeTimer.h"
-
-#include "system/ripple_PlatformMacros.h"
-#include "system/ripple_RandomNumbers.h"
-#include "system/ripple_ThreadName.h"
-#include "system/ripple_Time.h"
+#include "utility/ripple_ByteOrder.h"
+#include "utility/ripple_StringUtilities.h"
+#include "utility/ripple_UptimeTimer.h"
+#include "utility/ripple_PlatformMacros.h"
+#include "utility/ripple_RandomNumbers.h"
+#include "utility/ripple_ThreadName.h"
+#include "utility/ripple_Time.h"
 
 #endif
diff --git a/modules/ripple_basics/memory/ripple_ByteOrder.cpp b/modules/ripple_basics/utility/ripple_ByteOrder.cpp
similarity index 100%
rename from modules/ripple_basics/memory/ripple_ByteOrder.cpp
rename to modules/ripple_basics/utility/ripple_ByteOrder.cpp
diff --git a/modules/ripple_basics/memory/ripple_ByteOrder.h b/modules/ripple_basics/utility/ripple_ByteOrder.h
similarity index 100%
rename from modules/ripple_basics/memory/ripple_ByteOrder.h
rename to modules/ripple_basics/utility/ripple_ByteOrder.h
diff --git a/modules/ripple_basics/types/ripple_IntegerTypes.h b/modules/ripple_basics/utility/ripple_IntegerTypes.h
similarity index 100%
rename from modules/ripple_basics/types/ripple_IntegerTypes.h
rename to modules/ripple_basics/utility/ripple_IntegerTypes.h
diff --git a/modules/ripple_basics/diagnostic/ripple_Log.cpp b/modules/ripple_basics/utility/ripple_Log.cpp
similarity index 100%
rename from modules/ripple_basics/diagnostic/ripple_Log.cpp
rename to modules/ripple_basics/utility/ripple_Log.cpp
diff --git a/modules/ripple_basics/diagnostic/ripple_Log.h b/modules/ripple_basics/utility/ripple_Log.h
similarity index 100%
rename from modules/ripple_basics/diagnostic/ripple_Log.h
rename to modules/ripple_basics/utility/ripple_Log.h
diff --git a/modules/ripple_basics/system/ripple_PlatformMacros.h b/modules/ripple_basics/utility/ripple_PlatformMacros.h
similarity index 100%
rename from modules/ripple_basics/system/ripple_PlatformMacros.h
rename to modules/ripple_basics/utility/ripple_PlatformMacros.h
diff --git a/modules/ripple_basics/system/ripple_RandomNumbers.cpp b/modules/ripple_basics/utility/ripple_RandomNumbers.cpp
similarity index 100%
rename from modules/ripple_basics/system/ripple_RandomNumbers.cpp
rename to modules/ripple_basics/utility/ripple_RandomNumbers.cpp
diff --git a/modules/ripple_basics/system/ripple_RandomNumbers.h b/modules/ripple_basics/utility/ripple_RandomNumbers.h
similarity index 100%
rename from modules/ripple_basics/system/ripple_RandomNumbers.h
rename to modules/ripple_basics/utility/ripple_RandomNumbers.h
diff --git a/modules/ripple_basics/memory/ripple_StringUtilities.cpp b/modules/ripple_basics/utility/ripple_StringUtilities.cpp
similarity index 100%
rename from modules/ripple_basics/memory/ripple_StringUtilities.cpp
rename to modules/ripple_basics/utility/ripple_StringUtilities.cpp
diff --git a/modules/ripple_basics/memory/ripple_StringUtilities.h b/modules/ripple_basics/utility/ripple_StringUtilities.h
similarity index 100%
rename from modules/ripple_basics/memory/ripple_StringUtilities.h
rename to modules/ripple_basics/utility/ripple_StringUtilities.h
diff --git a/modules/ripple_basics/system/ripple_ThreadName.cpp b/modules/ripple_basics/utility/ripple_ThreadName.cpp
similarity index 100%
rename from modules/ripple_basics/system/ripple_ThreadName.cpp
rename to modules/ripple_basics/utility/ripple_ThreadName.cpp
diff --git a/modules/ripple_basics/system/ripple_ThreadName.h b/modules/ripple_basics/utility/ripple_ThreadName.h
similarity index 100%
rename from modules/ripple_basics/system/ripple_ThreadName.h
rename to modules/ripple_basics/utility/ripple_ThreadName.h
diff --git a/modules/ripple_basics/system/ripple_Time.cpp b/modules/ripple_basics/utility/ripple_Time.cpp
similarity index 100%
rename from modules/ripple_basics/system/ripple_Time.cpp
rename to modules/ripple_basics/utility/ripple_Time.cpp
diff --git a/modules/ripple_basics/system/ripple_Time.h b/modules/ripple_basics/utility/ripple_Time.h
similarity index 100%
rename from modules/ripple_basics/system/ripple_Time.h
rename to modules/ripple_basics/utility/ripple_Time.h
diff --git a/modules/ripple_basics/events/ripple_UptimeTimer.cpp b/modules/ripple_basics/utility/ripple_UptimeTimer.cpp
similarity index 100%
rename from modules/ripple_basics/events/ripple_UptimeTimer.cpp
rename to modules/ripple_basics/utility/ripple_UptimeTimer.cpp
diff --git a/modules/ripple_basics/events/ripple_UptimeTimer.h b/modules/ripple_basics/utility/ripple_UptimeTimer.h
similarity index 100%
rename from modules/ripple_basics/events/ripple_UptimeTimer.h
rename to modules/ripple_basics/utility/ripple_UptimeTimer.h
diff --git a/newcoin.vcxproj b/newcoin.vcxproj
index 6f972f8903..fd6f6f8ee1 100644
--- a/newcoin.vcxproj
+++ b/newcoin.vcxproj
@@ -179,50 +179,50 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="modules\ripple_basics\diagnostic\ripple_Log.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="modules\ripple_basics\diagnostic\ripple_LogWebsockets.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="modules\ripple_basics\events\ripple_UptimeTimer.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="modules\ripple_basics\memory\ripple_ByteOrder.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="modules\ripple_basics\memory\ripple_StringUtilities.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="modules\ripple_basics\ripple_basics.cpp" />
-    <ClCompile Include="modules\ripple_basics\system\ripple_RandomNumbers.cpp">
+    <ClCompile Include="modules\ripple_basics\utility\ripple_ByteOrder.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="modules\ripple_basics\system\ripple_ThreadName.cpp">
+    <ClCompile Include="modules\ripple_basics\utility\ripple_Log.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="modules\ripple_basics\system\ripple_Time.cpp">
+    <ClCompile Include="modules\ripple_basics\utility\ripple_RandomNumbers.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_basics\utility\ripple_StringUtilities.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_basics\utility\ripple_ThreadName.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_basics\utility\ripple_Time.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_basics\utility\ripple_UptimeTimer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -1203,16 +1203,16 @@
     <ClInclude Include="modules\ripple_basics\containers\ripple_RangeSet.h" />
     <ClInclude Include="modules\ripple_basics\containers\ripple_SecureAllocator.h" />
     <ClInclude Include="modules\ripple_basics\containers\ripple_TaggedCache.h" />
-    <ClInclude Include="modules\ripple_basics\diagnostic\ripple_Log.h" />
-    <ClInclude Include="modules\ripple_basics\events\ripple_UptimeTimer.h" />
-    <ClInclude Include="modules\ripple_basics\memory\ripple_ByteOrder.h" />
-    <ClInclude Include="modules\ripple_basics\memory\ripple_StringUtilities.h" />
     <ClInclude Include="modules\ripple_basics\ripple_basics.h" />
-    <ClInclude Include="modules\ripple_basics\system\ripple_PlatformMacros.h" />
-    <ClInclude Include="modules\ripple_basics\system\ripple_RandomNumbers.h" />
-    <ClInclude Include="modules\ripple_basics\system\ripple_ThreadName.h" />
-    <ClInclude Include="modules\ripple_basics\system\ripple_Time.h" />
-    <ClInclude Include="modules\ripple_basics\types\ripple_IntegerTypes.h" />
+    <ClInclude Include="modules\ripple_basics\utility\ripple_ByteOrder.h" />
+    <ClInclude Include="modules\ripple_basics\utility\ripple_IntegerTypes.h" />
+    <ClInclude Include="modules\ripple_basics\utility\ripple_Log.h" />
+    <ClInclude Include="modules\ripple_basics\utility\ripple_PlatformMacros.h" />
+    <ClInclude Include="modules\ripple_basics\utility\ripple_RandomNumbers.h" />
+    <ClInclude Include="modules\ripple_basics\utility\ripple_StringUtilities.h" />
+    <ClInclude Include="modules\ripple_basics\utility\ripple_ThreadName.h" />
+    <ClInclude Include="modules\ripple_basics\utility\ripple_Time.h" />
+    <ClInclude Include="modules\ripple_basics\utility\ripple_UptimeTimer.h" />
     <ClInclude Include="modules\ripple_client\ripple_client.h" />
     <ClInclude Include="modules\ripple_db\ripple_db.h" />
     <ClInclude Include="modules\ripple_json\json\json.h" />
diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters
index db8a5ba6b8..3cba325486 100644
--- a/newcoin.vcxproj.filters
+++ b/newcoin.vcxproj.filters
@@ -97,9 +97,6 @@
     <Filter Include="1. Modules\ripple_net\overlay">
       <UniqueIdentifier>{1b44bca2-5d6b-45b6-815b-797059fb2c8e}</UniqueIdentifier>
     </Filter>
-    <Filter Include="1. Modules\ripple_basics\types">
-      <UniqueIdentifier>{71aefc54-1459-47a5-af76-995f121d498a}</UniqueIdentifier>
-    </Filter>
     <Filter Include="1. Modules\ripple_mess">
       <UniqueIdentifier>{becffa9b-61f7-42d4-815a-1ec822cad0e7}</UniqueIdentifier>
     </Filter>
@@ -115,9 +112,6 @@
     <Filter Include="1. Modules\ripple_basics\containers">
       <UniqueIdentifier>{96cbc9ff-0118-4844-bb4c-05aef58a60b5}</UniqueIdentifier>
     </Filter>
-    <Filter Include="1. Modules\ripple_basics\events">
-      <UniqueIdentifier>{f585ac4d-1867-4f3d-b0a2-eceae4d7e7e7}</UniqueIdentifier>
-    </Filter>
     <Filter Include="1. Modules\ripple_json">
       <UniqueIdentifier>{9f33883e-d53d-469f-ab51-653ac3e8780b}</UniqueIdentifier>
     </Filter>
@@ -127,17 +121,11 @@
     <Filter Include="1. Modules\ripple_json\json\DEPRECATED">
       <UniqueIdentifier>{e398b116-a7fa-4850-8b8e-6de95efdea4e}</UniqueIdentifier>
     </Filter>
-    <Filter Include="1. Modules\ripple_basics\diagnostic">
-      <UniqueIdentifier>{8d816d89-3ab2-4a9f-ac8e-8b4346b23cf8}</UniqueIdentifier>
-    </Filter>
     <Filter Include="1. Modules\ripple_net\sockets\_OLD">
       <UniqueIdentifier>{1194480b-fa6b-4d92-8656-2470f45f2753}</UniqueIdentifier>
     </Filter>
-    <Filter Include="1. Modules\ripple_basics\memory">
-      <UniqueIdentifier>{49faa808-02f3-44ba-a17c-43dce213672e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="1. Modules\ripple_basics\system">
-      <UniqueIdentifier>{c4b8f568-a8ff-40a6-9eae-1d1f41d58e7a}</UniqueIdentifier>
+    <Filter Include="1. Modules\ripple_basics\utility">
+      <UniqueIdentifier>{c30623e7-e0ab-4a8e-a213-aeaceb4327e2}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -717,9 +705,6 @@
     <ClCompile Include="modules\ripple_mess\ripple_mess.cpp">
       <Filter>1. Modules\ripple_mess</Filter>
     </ClCompile>
-    <ClCompile Include="modules\ripple_basics\events\ripple_UptimeTimer.cpp">
-      <Filter>1. Modules\ripple_basics\events</Filter>
-    </ClCompile>
     <ClCompile Include="modules\ripple_json\json\json_reader.cpp">
       <Filter>1. Modules\ripple_json\json</Filter>
     </ClCompile>
@@ -732,9 +717,6 @@
     <ClCompile Include="modules\ripple_json\ripple_json.cpp">
       <Filter>1. Modules\ripple_json</Filter>
     </ClCompile>
-    <ClCompile Include="modules\ripple_basics\diagnostic\ripple_Log.cpp">
-      <Filter>1. Modules\ripple_basics\diagnostic</Filter>
-    </ClCompile>
     <ClCompile Include="src\cpp\ripple\ConnectionPool.cpp">
       <Filter>1. Modules\ripple_net\sockets\_OLD</Filter>
     </ClCompile>
@@ -756,20 +738,26 @@
     <ClCompile Include="modules\ripple_basics\containers\ripple_RangeSet.cpp">
       <Filter>1. Modules\ripple_basics\containers</Filter>
     </ClCompile>
-    <ClCompile Include="modules\ripple_basics\memory\ripple_ByteOrder.cpp">
-      <Filter>1. Modules\ripple_basics\memory</Filter>
+    <ClCompile Include="modules\ripple_basics\utility\ripple_Time.cpp">
+      <Filter>1. Modules\ripple_basics\utility</Filter>
     </ClCompile>
-    <ClCompile Include="modules\ripple_basics\memory\ripple_StringUtilities.cpp">
-      <Filter>1. Modules\ripple_basics\memory</Filter>
+    <ClCompile Include="modules\ripple_basics\utility\ripple_ThreadName.cpp">
+      <Filter>1. Modules\ripple_basics\utility</Filter>
     </ClCompile>
-    <ClCompile Include="modules\ripple_basics\system\ripple_RandomNumbers.cpp">
-      <Filter>1. Modules\ripple_basics\system</Filter>
+    <ClCompile Include="modules\ripple_basics\utility\ripple_RandomNumbers.cpp">
+      <Filter>1. Modules\ripple_basics\utility</Filter>
     </ClCompile>
-    <ClCompile Include="modules\ripple_basics\system\ripple_Time.cpp">
-      <Filter>1. Modules\ripple_basics\system</Filter>
+    <ClCompile Include="modules\ripple_basics\utility\ripple_Log.cpp">
+      <Filter>1. Modules\ripple_basics\utility</Filter>
     </ClCompile>
-    <ClCompile Include="modules\ripple_basics\system\ripple_ThreadName.cpp">
-      <Filter>1. Modules\ripple_basics\system</Filter>
+    <ClCompile Include="modules\ripple_basics\utility\ripple_StringUtilities.cpp">
+      <Filter>1. Modules\ripple_basics\utility</Filter>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_basics\utility\ripple_ByteOrder.cpp">
+      <Filter>1. Modules\ripple_basics\utility</Filter>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_basics\utility\ripple_UptimeTimer.cpp">
+      <Filter>1. Modules\ripple_basics\utility</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -1346,15 +1334,9 @@
     <ClInclude Include="modules\ripple_mess\ripple_mess.h">
       <Filter>1. Modules\ripple_mess</Filter>
     </ClInclude>
-    <ClInclude Include="modules\ripple_basics\events\ripple_UptimeTimer.h">
-      <Filter>1. Modules\ripple_basics\events</Filter>
-    </ClInclude>
     <ClInclude Include="modules\ripple_basics\containers\ripple_KeyCache.h">
       <Filter>1. Modules\ripple_basics\containers</Filter>
     </ClInclude>
-    <ClInclude Include="modules\ripple_basics\types\ripple_IntegerTypes.h">
-      <Filter>1. Modules\ripple_basics\types</Filter>
-    </ClInclude>
     <ClInclude Include="modules\ripple_json\json\json_batchallocator.h">
       <Filter>1. Modules\ripple_json\json</Filter>
     </ClInclude>
@@ -1385,9 +1367,6 @@
     <ClInclude Include="modules\ripple_json\json\json_features.h">
       <Filter>1. Modules\ripple_json\json</Filter>
     </ClInclude>
-    <ClInclude Include="modules\ripple_basics\diagnostic\ripple_Log.h">
-      <Filter>1. Modules\ripple_basics\diagnostic</Filter>
-    </ClInclude>
     <ClInclude Include="src\cpp\ripple\AutoSocket.h">
       <Filter>1. Modules\ripple_net\sockets\_OLD</Filter>
     </ClInclude>
@@ -1418,23 +1397,32 @@
     <ClInclude Include="modules\ripple_basics\containers\ripple_TaggedCache.h">
       <Filter>1. Modules\ripple_basics\containers</Filter>
     </ClInclude>
-    <ClInclude Include="modules\ripple_basics\memory\ripple_ByteOrder.h">
-      <Filter>1. Modules\ripple_basics\memory</Filter>
+    <ClInclude Include="modules\ripple_basics\utility\ripple_Time.h">
+      <Filter>1. Modules\ripple_basics\utility</Filter>
     </ClInclude>
-    <ClInclude Include="modules\ripple_basics\memory\ripple_StringUtilities.h">
-      <Filter>1. Modules\ripple_basics\memory</Filter>
+    <ClInclude Include="modules\ripple_basics\utility\ripple_ThreadName.h">
+      <Filter>1. Modules\ripple_basics\utility</Filter>
     </ClInclude>
-    <ClInclude Include="modules\ripple_basics\system\ripple_PlatformMacros.h">
-      <Filter>1. Modules\ripple_basics\system</Filter>
+    <ClInclude Include="modules\ripple_basics\utility\ripple_RandomNumbers.h">
+      <Filter>1. Modules\ripple_basics\utility</Filter>
     </ClInclude>
-    <ClInclude Include="modules\ripple_basics\system\ripple_RandomNumbers.h">
-      <Filter>1. Modules\ripple_basics\system</Filter>
+    <ClInclude Include="modules\ripple_basics\utility\ripple_PlatformMacros.h">
+      <Filter>1. Modules\ripple_basics\utility</Filter>
     </ClInclude>
-    <ClInclude Include="modules\ripple_basics\system\ripple_Time.h">
-      <Filter>1. Modules\ripple_basics\system</Filter>
+    <ClInclude Include="modules\ripple_basics\utility\ripple_Log.h">
+      <Filter>1. Modules\ripple_basics\utility</Filter>
     </ClInclude>
-    <ClInclude Include="modules\ripple_basics\system\ripple_ThreadName.h">
-      <Filter>1. Modules\ripple_basics\system</Filter>
+    <ClInclude Include="modules\ripple_basics\utility\ripple_ByteOrder.h">
+      <Filter>1. Modules\ripple_basics\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="modules\ripple_basics\utility\ripple_StringUtilities.h">
+      <Filter>1. Modules\ripple_basics\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="modules\ripple_basics\utility\ripple_UptimeTimer.h">
+      <Filter>1. Modules\ripple_basics\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="modules\ripple_basics\utility\ripple_IntegerTypes.h">
+      <Filter>1. Modules\ripple_basics\utility</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>