Streamline subdirectories for ripple_basics

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)

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