59 files changed, 89 insertions, 158 deletions

diff --git a/src/mem/ruby/SConscript b/src/mem/ruby/SConscript
index 2072470ac..3029c3297 100644
--- a/src/mem/ruby/SConscript
+++ b/src/mem/ruby/SConscript
@@ -118,21 +118,21 @@ MakeInclude('slicc_interface/NetworkMessage.hh')
 MakeInclude('slicc_interface/RubyRequest.hh')
 
 # External types
-MakeInclude('buffers/MessageBuffer.hh')
 MakeInclude('common/Address.hh')
 MakeInclude('common/DataBlock.hh')
+MakeInclude('common/MachineID.hh')
 MakeInclude('common/NetDest.hh')
 MakeInclude('common/Set.hh')
 MakeInclude('filters/GenericBloomFilter.hh')
+MakeInclude('network/MessageBuffer.hh')
 MakeInclude('structures/Prefetcher.hh')
-MakeInclude('system/CacheMemory.hh')
+MakeInclude('structures/CacheMemory.hh')
 MakeInclude('system/DMASequencer.hh')
-MakeInclude('system/DirectoryMemory.hh')
-MakeInclude('system/MachineID.hh')
-MakeInclude('system/MemoryControl.hh')
-MakeInclude('system/WireBuffer.hh')
-MakeInclude('system/PerfectCacheMemory.hh')
-MakeInclude('system/PersistentTable.hh')
+MakeInclude('structures/DirectoryMemory.hh')
+MakeInclude('structures/MemoryControl.hh')
+MakeInclude('structures/WireBuffer.hh')
+MakeInclude('structures/PerfectCacheMemory.hh')
+MakeInclude('structures/PersistentTable.hh')
 MakeInclude('system/Sequencer.hh')
-MakeInclude('system/TBETable.hh')
-MakeInclude('system/TimerTable.hh')
+MakeInclude('structures/TBETable.hh')
+MakeInclude('structures/TimerTable.hh')
diff --git a/src/mem/ruby/buffers/SConscript b/src/mem/ruby/buffers/SConscript
deleted file mode 100644
index ff0b5e9bc..000000000
--- a/src/mem/ruby/buffers/SConscript
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- mode:python -*-
-
-# Copyright (c) 2009 The Hewlett-Packard Development Company
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met: redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer;
-# redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution;
-# neither the name of the copyright holders nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Authors: Nathan Binkert
-
-Import('*')
-
-if env['PROTOCOL'] == 'None':
-    Return()
-
-Source('MessageBuffer.cc')
-Source('MessageBufferNode.cc')
diff --git a/src/mem/ruby/system/MachineID.hh b/src/mem/ruby/common/MachineID.hh
index 0ad898959..0ad898959 100644
--- a/src/mem/ruby/system/MachineID.hh
+++ b/src/mem/ruby/common/MachineID.hh
diff --git a/src/mem/ruby/common/NetDest.hh b/src/mem/ruby/common/NetDest.hh
index f982b7c38..ba72fe214 100644
--- a/src/mem/ruby/common/NetDest.hh
+++ b/src/mem/ruby/common/NetDest.hh
@@ -38,7 +38,7 @@
 #include <vector>
 
 #include "mem/ruby/common/Set.hh"
-#include "mem/ruby/system/MachineID.hh"
+#include "mem/ruby/common/MachineID.hh"
 
 class NetDest
 {
diff --git a/src/mem/ruby/buffers/MessageBuffer.cc b/src/mem/ruby/network/MessageBuffer.cc
index b63b07976..1961765c5 100644
--- a/src/mem/ruby/buffers/MessageBuffer.cc
+++ b/src/mem/ruby/network/MessageBuffer.cc
@@ -32,7 +32,7 @@
 #include "base/misc.hh"
 #include "base/stl_helpers.hh"
 #include "debug/RubyQueue.hh"
-#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/MessageBuffer.hh"
 #include "mem/ruby/system/System.hh"
 
 using namespace std;
diff --git a/src/mem/ruby/buffers/MessageBuffer.hh b/src/mem/ruby/network/MessageBuffer.hh
index 3b3a69a3e..6d51eade9 100644
--- a/src/mem/ruby/buffers/MessageBuffer.hh
+++ b/src/mem/ruby/network/MessageBuffer.hh
@@ -41,11 +41,11 @@
 #include <string>
 #include <vector>
 
-#include "mem/packet.hh"
-#include "mem/ruby/buffers/MessageBufferNode.hh"
 #include "mem/ruby/common/Address.hh"
 #include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/MessageBufferNode.hh"
 #include "mem/ruby/slicc_interface/Message.hh"
+#include "mem/packet.hh"
 
 class MessageBuffer
 {
diff --git a/src/mem/ruby/buffers/MessageBufferNode.cc b/src/mem/ruby/network/MessageBufferNode.cc
index d54d8345e..2e682b096 100644
--- a/src/mem/ruby/buffers/MessageBufferNode.cc
+++ b/src/mem/ruby/network/MessageBufferNode.cc
@@ -26,7 +26,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "mem/ruby/buffers/MessageBufferNode.hh"
+#include "mem/ruby/network/MessageBufferNode.hh"
 
 void
 MessageBufferNode::print(std::ostream& out) const
diff --git a/src/mem/ruby/buffers/MessageBufferNode.hh b/src/mem/ruby/network/MessageBufferNode.hh
index 16aec8a1b..16aec8a1b 100644
--- a/src/mem/ruby/buffers/MessageBufferNode.hh
+++ b/src/mem/ruby/network/MessageBufferNode.hh
diff --git a/src/mem/ruby/network/SConscript b/src/mem/ruby/network/SConscript
index c4abba716..1b0b1c94b 100644
--- a/src/mem/ruby/network/SConscript
+++ b/src/mem/ruby/network/SConscript
@@ -39,5 +39,7 @@ SimObject('Network.py')
 
 Source('BasicLink.cc')
 Source('BasicRouter.cc')
+Source('MessageBuffer.cc')
+Source('MessageBufferNode.cc')
 Source('Network.cc')
 Source('Topology.cc')
diff --git a/src/mem/ruby/network/garnet/BaseGarnetNetwork.cc b/src/mem/ruby/network/garnet/BaseGarnetNetwork.cc
index f237c4dcc..01f1b80ed 100644
--- a/src/mem/ruby/network/garnet/BaseGarnetNetwork.cc
+++ b/src/mem/ruby/network/garnet/BaseGarnetNetwork.cc
@@ -28,8 +28,8 @@
  * Authors: Niket Agarwal
  */
 
-#include "mem/ruby/buffers/MessageBuffer.hh"
 #include "mem/ruby/network/garnet/BaseGarnetNetwork.hh"
+#include "mem/ruby/network/MessageBuffer.hh"
 
 using namespace std;
 
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
index 3e4088038..5f9493806 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
@@ -34,7 +34,7 @@
 #include "base/cast.hh"
 #include "base/stl_helpers.hh"
 #include "debug/RubyNetwork.hh"
-#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/MessageBuffer.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh"
 #include "mem/ruby/slicc_interface/NetworkMessage.hh"
diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc
index ba32abd44..13bbe2b08 100644
--- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc
@@ -34,7 +34,7 @@
 #include "base/cast.hh"
 #include "base/stl_helpers.hh"
 #include "debug/RubyNetwork.hh"
-#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/MessageBuffer.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh"
 #include "mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh"
 #include "mem/ruby/slicc_interface/NetworkMessage.hh"
diff --git a/src/mem/ruby/network/simple/PerfectSwitch.cc b/src/mem/ruby/network/simple/PerfectSwitch.cc
index cf2430e36..0c6111c48 100644
--- a/src/mem/ruby/network/simple/PerfectSwitch.cc
+++ b/src/mem/ruby/network/simple/PerfectSwitch.cc
@@ -30,7 +30,7 @@
 
 #include "base/cast.hh"
 #include "debug/RubyNetwork.hh"
-#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/MessageBuffer.hh"
 #include "mem/ruby/network/simple/PerfectSwitch.hh"
 #include "mem/ruby/network/simple/SimpleNetwork.hh"
 #include "mem/ruby/network/simple/Switch.hh"
diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc
index 05b729183..9eca157f6 100644
--- a/src/mem/ruby/network/simple/SimpleNetwork.cc
+++ b/src/mem/ruby/network/simple/SimpleNetwork.cc
@@ -31,8 +31,8 @@
 
 #include "base/cast.hh"
 #include "base/stl_helpers.hh"
-#include "mem/ruby/buffers/MessageBuffer.hh"
 #include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/MessageBuffer.hh"
 #include "mem/ruby/network/simple/SimpleLink.hh"
 #include "mem/ruby/network/simple/SimpleNetwork.hh"
 #include "mem/ruby/network/simple/Switch.hh"
diff --git a/src/mem/ruby/network/simple/Switch.cc b/src/mem/ruby/network/simple/Switch.cc
index 1e153be76..6e116d82c 100644
--- a/src/mem/ruby/network/simple/Switch.cc
+++ b/src/mem/ruby/network/simple/Switch.cc
@@ -30,7 +30,7 @@
 
 #include "base/cast.hh"
 #include "base/stl_helpers.hh"
-#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/MessageBuffer.hh"
 #include "mem/ruby/network/simple/PerfectSwitch.hh"
 #include "mem/ruby/network/simple/SimpleNetwork.hh"
 #include "mem/ruby/network/simple/Switch.hh"
diff --git a/src/mem/ruby/network/simple/Throttle.cc b/src/mem/ruby/network/simple/Throttle.cc
index da7b1732b..40958a6da 100644
--- a/src/mem/ruby/network/simple/Throttle.cc
+++ b/src/mem/ruby/network/simple/Throttle.cc
@@ -31,8 +31,8 @@
 #include "base/cast.hh"
 #include "base/cprintf.hh"
 #include "debug/RubyNetwork.hh"
-#include "mem/ruby/buffers/MessageBuffer.hh"
 #include "mem/ruby/network/simple/Throttle.hh"
+#include "mem/ruby/network/MessageBuffer.hh"
 #include "mem/ruby/network/Network.hh"
 #include "mem/ruby/slicc_interface/NetworkMessage.hh"
 #include "mem/ruby/system/System.hh"
diff --git a/src/mem/ruby/profiler/Profiler.hh b/src/mem/ruby/profiler/Profiler.hh
index 2a0ff71b2..07d1411c0 100644
--- a/src/mem/ruby/profiler/Profiler.hh
+++ b/src/mem/ruby/profiler/Profiler.hh
@@ -57,7 +57,7 @@
 #include "mem/protocol/RubyAccessMode.hh"
 #include "mem/protocol/RubyRequestType.hh"
 #include "mem/ruby/common/Global.hh"
-#include "mem/ruby/system/MachineID.hh"
+#include "mem/ruby/common/MachineID.hh"
 #include "params/RubySystem.hh"
 
 class RubyRequest;
diff --git a/src/mem/ruby/recorder/SConscript b/src/mem/ruby/recorder/SConscript
deleted file mode 100644
index e1b3d78b7..000000000
--- a/src/mem/ruby/recorder/SConscript
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- mode:python -*-
-
-# Copyright (c) 2009 The Hewlett-Packard Development Company
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met: redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer;
-# redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution;
-# neither the name of the copyright holders nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Authors: Nathan Binkert
-
-Import('*')
-
-if env['PROTOCOL'] == 'None':
-    Return()
-
-Source('CacheRecorder.cc')
diff --git a/src/mem/ruby/slicc_interface/AbstractController.hh b/src/mem/ruby/slicc_interface/AbstractController.hh
index 4ef3f328b..7dcb3b8ba 100644
--- a/src/mem/ruby/slicc_interface/AbstractController.hh
+++ b/src/mem/ruby/slicc_interface/AbstractController.hh
@@ -34,14 +34,14 @@
 
 #include "base/callback.hh"
 #include "mem/protocol/AccessPermission.hh"
-#include "mem/ruby/buffers/MessageBuffer.hh"
 #include "mem/ruby/common/Address.hh"
 #include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/common/DataBlock.hh"
 #include "mem/ruby/common/Histogram.hh"
+#include "mem/ruby/common/MachineID.hh"
+#include "mem/ruby/network/MessageBuffer.hh"
 #include "mem/ruby/network/Network.hh"
-#include "mem/ruby/recorder/CacheRecorder.hh"
-#include "mem/ruby/system/MachineID.hh"
+#include "mem/ruby/system/CacheRecorder.hh"
 #include "mem/packet.hh"
 #include "params/RubyController.hh"
 #include "sim/clocked_object.hh"
diff --git a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh
index 894777b97..14d24f028 100644
--- a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh
@@ -31,9 +31,9 @@
 
 #include "mem/protocol/MachineType.hh"
 #include "mem/ruby/common/Address.hh"
+#include "mem/ruby/common/MachineID.hh"
 #include "mem/ruby/common/NetDest.hh"
-#include "mem/ruby/system/DirectoryMemory.hh"
-#include "mem/ruby/system/MachineID.hh"
+#include "mem/ruby/structures/DirectoryMemory.hh"
 
 // used to determine the home directory
 // returns a value between 0 and total_directories_within_the_system
diff --git a/src/mem/ruby/system/AbstractReplacementPolicy.hh b/src/mem/ruby/structures/AbstractReplacementPolicy.hh
index 3c492377e..3c492377e 100644
--- a/src/mem/ruby/system/AbstractReplacementPolicy.hh
+++ b/src/mem/ruby/structures/AbstractReplacementPolicy.hh
diff --git a/src/mem/ruby/system/BankedArray.cc b/src/mem/ruby/structures/BankedArray.cc
index df7852a0e..0644ffe8b 100644
--- a/src/mem/ruby/system/BankedArray.cc
+++ b/src/mem/ruby/structures/BankedArray.cc
@@ -30,7 +30,7 @@
  */
 
 #include "base/intmath.hh"
-#include "mem/ruby/system/BankedArray.hh"
+#include "mem/ruby/structures/BankedArray.hh"
 #include "mem/ruby/system/System.hh"
 
 BankedArray::BankedArray(unsigned int banks, Cycles accessLatency,
diff --git a/src/mem/ruby/system/BankedArray.hh b/src/mem/ruby/structures/BankedArray.hh
index 89007befa..89007befa 100644
--- a/src/mem/ruby/system/BankedArray.hh
+++ b/src/mem/ruby/structures/BankedArray.hh
diff --git a/src/mem/ruby/system/Cache.py b/src/mem/ruby/structures/Cache.py
index d4af1320a..14a359233 100644
--- a/src/mem/ruby/system/Cache.py
+++ b/src/mem/ruby/structures/Cache.py
@@ -34,7 +34,7 @@ from Controller import RubyController
 class RubyCache(SimObject):
     type = 'RubyCache'
     cxx_class = 'CacheMemory'
-    cxx_header = "mem/ruby/system/CacheMemory.hh"
+    cxx_header = "mem/ruby/structures/CacheMemory.hh"
     size = Param.MemorySize("capacity in bytes");
     latency = Param.Cycles("");
     assoc = Param.Int("");
diff --git a/src/mem/ruby/system/CacheMemory.cc b/src/mem/ruby/structures/CacheMemory.cc
index 2ea6942ff..7ce6cd584 100644
--- a/src/mem/ruby/system/CacheMemory.cc
+++ b/src/mem/ruby/structures/CacheMemory.cc
@@ -32,7 +32,7 @@
 #include "debug/RubyResourceStalls.hh"
 #include "debug/RubyStats.hh"
 #include "mem/protocol/AccessPermission.hh"
-#include "mem/ruby/system/CacheMemory.hh"
+#include "mem/ruby/structures/CacheMemory.hh"
 #include "mem/ruby/system/System.hh"
 
 using namespace std;
diff --git a/src/mem/ruby/system/CacheMemory.hh b/src/mem/ruby/structures/CacheMemory.hh
index aa619e59d..87a0b40c0 100644
--- a/src/mem/ruby/system/CacheMemory.hh
+++ b/src/mem/ruby/structures/CacheMemory.hh
@@ -34,16 +34,16 @@
 
 #include "base/hashmap.hh"
 #include "base/statistics.hh"
-#include "mem/protocol/CacheResourceType.hh"
 #include "mem/protocol/CacheRequestType.hh"
+#include "mem/protocol/CacheResourceType.hh"
 #include "mem/protocol/RubyRequest.hh"
 #include "mem/ruby/common/DataBlock.hh"
-#include "mem/ruby/recorder/CacheRecorder.hh"
 #include "mem/ruby/slicc_interface/AbstractCacheEntry.hh"
 #include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
-#include "mem/ruby/system/BankedArray.hh"
-#include "mem/ruby/system/LRUPolicy.hh"
-#include "mem/ruby/system/PseudoLRUPolicy.hh"
+#include "mem/ruby/structures/BankedArray.hh"
+#include "mem/ruby/structures/LRUPolicy.hh"
+#include "mem/ruby/structures/PseudoLRUPolicy.hh"
+#include "mem/ruby/system/CacheRecorder.hh"
 #include "params/RubyCache.hh"
 #include "sim/sim_object.hh"
 
diff --git a/src/mem/ruby/system/DirectoryMemory.cc b/src/mem/ruby/structures/DirectoryMemory.cc
index cb1bf6f90..db165460c 100644
--- a/src/mem/ruby/system/DirectoryMemory.cc
+++ b/src/mem/ruby/structures/DirectoryMemory.cc
@@ -30,7 +30,7 @@
 #include "debug/RubyCache.hh"
 #include "debug/RubyStats.hh"
 #include "mem/ruby/slicc_interface/RubySlicc_Util.hh"
-#include "mem/ruby/system/DirectoryMemory.hh"
+#include "mem/ruby/structures/DirectoryMemory.hh"
 #include "mem/ruby/system/System.hh"
 
 using namespace std;
diff --git a/src/mem/ruby/system/DirectoryMemory.hh b/src/mem/ruby/structures/DirectoryMemory.hh
index 8aa89ce12..cc390e428 100644
--- a/src/mem/ruby/system/DirectoryMemory.hh
+++ b/src/mem/ruby/structures/DirectoryMemory.hh
@@ -32,11 +32,11 @@
 #include <iostream>
 #include <string>
 
-#include "mem/ruby/common/Address.hh"
 #include "mem/protocol/DirectoryRequestType.hh"
+#include "mem/ruby/common/Address.hh"
 #include "mem/ruby/slicc_interface/AbstractEntry.hh"
-#include "mem/ruby/system/MemoryVector.hh"
-#include "mem/ruby/system/SparseMemory.hh"
+#include "mem/ruby/structures/MemoryVector.hh"
+#include "mem/ruby/structures/SparseMemory.hh"
 #include "params/RubyDirectoryMemory.hh"
 #include "sim/sim_object.hh"
 
diff --git a/src/mem/ruby/system/DirectoryMemory.py b/src/mem/ruby/structures/DirectoryMemory.py
index ac4dd5934..c64439ce5 100644
--- a/src/mem/ruby/system/DirectoryMemory.py
+++ b/src/mem/ruby/structures/DirectoryMemory.py
@@ -34,7 +34,7 @@ from m5.SimObject import SimObject
 class RubyDirectoryMemory(SimObject):
     type = 'RubyDirectoryMemory'
     cxx_class = 'DirectoryMemory'
-    cxx_header = "mem/ruby/system/DirectoryMemory.hh"
+    cxx_header = "mem/ruby/structures/DirectoryMemory.hh"
     version = Param.Int(0, "")
     size = Param.MemorySize("1GB", "capacity in bytes")
     use_map = Param.Bool(False, "enable sparse memory")
diff --git a/src/mem/ruby/system/LRUPolicy.hh b/src/mem/ruby/structures/LRUPolicy.hh
index 622e28659..bb61b9d50 100644
--- a/src/mem/ruby/system/LRUPolicy.hh
+++ b/src/mem/ruby/structures/LRUPolicy.hh
@@ -29,7 +29,7 @@
 #ifndef __MEM_RUBY_SYSTEM_LRUPOLICY_HH__
 #define __MEM_RUBY_SYSTEM_LRUPOLICY_HH__
 
-#include "mem/ruby/system/AbstractReplacementPolicy.hh"
+#include "mem/ruby/structures/AbstractReplacementPolicy.hh"
 
 /* Simple true LRU replacement policy */
 
diff --git a/src/mem/ruby/system/MemoryControl.cc b/src/mem/ruby/structures/MemoryControl.cc
index e58b36f63..6c933b4d4 100644
--- a/src/mem/ruby/system/MemoryControl.cc
+++ b/src/mem/ruby/structures/MemoryControl.cc
@@ -30,7 +30,7 @@
 #include "debug/RubyStats.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
-#include "mem/ruby/system/MemoryControl.hh"
+#include "mem/ruby/structures/MemoryControl.hh"
 #include "mem/ruby/system/System.hh"
 
 using namespace std;
diff --git a/src/mem/ruby/system/MemoryControl.hh b/src/mem/ruby/structures/MemoryControl.hh
index 35eb057f5..7285e0021 100644
--- a/src/mem/ruby/system/MemoryControl.hh
+++ b/src/mem/ruby/structures/MemoryControl.hh
@@ -37,7 +37,7 @@
 #include "mem/protocol/MemoryControlRequestType.hh"
 #include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/slicc_interface/Message.hh"
-#include "mem/ruby/system/MemoryNode.hh"
+#include "mem/ruby/structures/MemoryNode.hh"
 #include "params/MemoryControl.hh"
 #include "sim/clocked_object.hh"
 
diff --git a/src/mem/ruby/system/MemoryControl.py b/src/mem/ruby/structures/MemoryControl.py
index ad18efec5..8a6879cb9 100644
--- a/src/mem/ruby/system/MemoryControl.py
+++ b/src/mem/ruby/structures/MemoryControl.py
@@ -34,6 +34,6 @@ class MemoryControl(ClockedObject):
     abstract = True
     type = 'MemoryControl'
     cxx_class = 'MemoryControl'
-    cxx_header = "mem/ruby/system/MemoryControl.hh"
+    cxx_header = "mem/ruby/structures/MemoryControl.hh"
     version = Param.Int("");
     ruby_system = Param.RubySystem("")
diff --git a/src/mem/ruby/system/MemoryNode.cc b/src/mem/ruby/structures/MemoryNode.cc
index 07262fba0..2a5cbb189 100644
--- a/src/mem/ruby/system/MemoryNode.cc
+++ b/src/mem/ruby/structures/MemoryNode.cc
@@ -26,7 +26,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "mem/ruby/system/MemoryNode.hh"
+#include "mem/ruby/structures/MemoryNode.hh"
 
 using namespace std;
 
diff --git a/src/mem/ruby/system/MemoryNode.hh b/src/mem/ruby/structures/MemoryNode.hh
index f215ab649..f215ab649 100644
--- a/src/mem/ruby/system/MemoryNode.hh
+++ b/src/mem/ruby/structures/MemoryNode.hh
diff --git a/src/mem/ruby/system/MemoryVector.hh b/src/mem/ruby/structures/MemoryVector.hh
index f2488b591..f2488b591 100644
--- a/src/mem/ruby/system/MemoryVector.hh
+++ b/src/mem/ruby/structures/MemoryVector.hh
diff --git a/src/mem/ruby/system/PerfectCacheMemory.hh b/src/mem/ruby/structures/PerfectCacheMemory.hh
index b56543c41..b56543c41 100644
--- a/src/mem/ruby/system/PerfectCacheMemory.hh
+++ b/src/mem/ruby/structures/PerfectCacheMemory.hh
diff --git a/src/mem/ruby/system/PersistentTable.cc b/src/mem/ruby/structures/PersistentTable.cc
index c60d39b8a..57b06946e 100644
--- a/src/mem/ruby/system/PersistentTable.cc
+++ b/src/mem/ruby/structures/PersistentTable.cc
@@ -26,7 +26,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "mem/ruby/system/PersistentTable.hh"
+#include "mem/ruby/structures/PersistentTable.hh"
 
 using namespace std;
 
diff --git a/src/mem/ruby/system/PersistentTable.hh b/src/mem/ruby/structures/PersistentTable.hh
index f634c35d1..b023987a4 100644
--- a/src/mem/ruby/system/PersistentTable.hh
+++ b/src/mem/ruby/structures/PersistentTable.hh
@@ -34,8 +34,8 @@
 #include "base/hashmap.hh"
 #include "mem/protocol/AccessType.hh"
 #include "mem/ruby/common/Address.hh"
+#include "mem/ruby/common/MachineID.hh"
 #include "mem/ruby/common/NetDest.hh"
-#include "mem/ruby/system/MachineID.hh"
 
 class PersistentTableEntry
 {
diff --git a/src/mem/ruby/structures/Prefetcher.hh b/src/mem/ruby/structures/Prefetcher.hh
index 967d96086..2bc7d812e 100644
--- a/src/mem/ruby/structures/Prefetcher.hh
+++ b/src/mem/ruby/structures/Prefetcher.hh
@@ -34,8 +34,8 @@
 #include <bitset>
 
 #include "base/statistics.hh"
-#include "mem/ruby/buffers/MessageBuffer.hh"
 #include "mem/ruby/common/Address.hh"
+#include "mem/ruby/network/MessageBuffer.hh"
 #include "mem/ruby/slicc_interface/AbstractController.hh"
 #include "mem/ruby/slicc_interface/RubyRequest.hh"
 #include "mem/ruby/system/System.hh"
diff --git a/src/mem/ruby/system/PseudoLRUPolicy.hh b/src/mem/ruby/structures/PseudoLRUPolicy.hh
index 4b6ba0db6..e464bbeac 100644
--- a/src/mem/ruby/system/PseudoLRUPolicy.hh
+++ b/src/mem/ruby/structures/PseudoLRUPolicy.hh
@@ -29,7 +29,7 @@
 #ifndef __MEM_RUBY_SYSTEM_PSEUDOLRUPOLICY_HH__
 #define __MEM_RUBY_SYSTEM_PSEUDOLRUPOLICY_HH__
 
-#include "mem/ruby/system/AbstractReplacementPolicy.hh"
+#include "mem/ruby/structures/AbstractReplacementPolicy.hh"
 
 /**
  * Implementation of tree-based pseudo-LRU replacement
diff --git a/src/mem/ruby/system/RubyMemoryControl.cc b/src/mem/ruby/structures/RubyMemoryControl.cc
index a13d3cd3b..bc01c7f94 100644
--- a/src/mem/ruby/system/RubyMemoryControl.cc
+++ b/src/mem/ruby/structures/RubyMemoryControl.cc
@@ -113,7 +113,7 @@
 #include "mem/ruby/profiler/Profiler.hh"
 #include "mem/ruby/slicc_interface/NetworkMessage.hh"
 #include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
-#include "mem/ruby/system/RubyMemoryControl.hh"
+#include "mem/ruby/structures/RubyMemoryControl.hh"
 #include "mem/ruby/system/System.hh"
 
 using namespace std;
diff --git a/src/mem/ruby/system/RubyMemoryControl.hh b/src/mem/ruby/structures/RubyMemoryControl.hh
index 042078db1..f7fb17975 100644
--- a/src/mem/ruby/system/RubyMemoryControl.hh
+++ b/src/mem/ruby/structures/RubyMemoryControl.hh
@@ -40,8 +40,8 @@
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/profiler/MemCntrlProfiler.hh"
 #include "mem/ruby/slicc_interface/Message.hh"
-#include "mem/ruby/system/MemoryControl.hh"
-#include "mem/ruby/system/MemoryNode.hh"
+#include "mem/ruby/structures/MemoryControl.hh"
+#include "mem/ruby/structures/MemoryNode.hh"
 #include "mem/ruby/system/System.hh"
 #include "params/RubyMemoryControl.hh"
 #include "sim/sim_object.hh"
diff --git a/src/mem/ruby/system/RubyMemoryControl.py b/src/mem/ruby/structures/RubyMemoryControl.py
index 118e4f20e..f0828fb19 100644
--- a/src/mem/ruby/system/RubyMemoryControl.py
+++ b/src/mem/ruby/structures/RubyMemoryControl.py
@@ -34,7 +34,7 @@ from MemoryControl import MemoryControl
 class RubyMemoryControl(MemoryControl):
     type = 'RubyMemoryControl'
     cxx_class = 'RubyMemoryControl'
-    cxx_header = "mem/ruby/system/RubyMemoryControl.hh"
+    cxx_header = "mem/ruby/structures/RubyMemoryControl.hh"
     version = Param.Int("");
 
     banks_per_rank = Param.Int(8, "");
diff --git a/src/mem/ruby/structures/SConscript b/src/mem/ruby/structures/SConscript
index 170f61e88..a5abbf449 100644
--- a/src/mem/ruby/structures/SConscript
+++ b/src/mem/ruby/structures/SConscript
@@ -33,5 +33,21 @@ Import('*')
 if env['PROTOCOL'] == 'None':
     Return()
 
+SimObject('Cache.py')
+SimObject('DirectoryMemory.py')
+SimObject('MemoryControl.py')
+SimObject('RubyMemoryControl.py')
 SimObject('RubyPrefetcher.py')
+SimObject('WireBuffer.py')
+
+Source('DirectoryMemory.cc')
+Source('SparseMemory.cc')
+Source('CacheMemory.cc')
+Source('MemoryControl.cc')
+Source('WireBuffer.cc')
+Source('RubyMemoryControl.cc')
+Source('MemoryNode.cc')
+Source('PersistentTable.cc')
 Source('Prefetcher.cc')
+Source('TimerTable.cc')
+Source('BankedArray.cc')
diff --git a/src/mem/ruby/system/SparseMemory.cc b/src/mem/ruby/structures/SparseMemory.cc
index a16e553a3..a63790502 100644
--- a/src/mem/ruby/system/SparseMemory.cc
+++ b/src/mem/ruby/structures/SparseMemory.cc
@@ -30,7 +30,7 @@
 #include <queue>
 
 #include "debug/RubyCache.hh"
-#include "mem/ruby/system/SparseMemory.hh"
+#include "mem/ruby/structures/SparseMemory.hh"
 #include "mem/ruby/system/System.hh"
 
 using namespace std;
@@ -39,7 +39,7 @@ SparseMemory::SparseMemory(int number_of_levels)
 {
     int even_level_bits;
     int extra;
-    m_total_number_of_bits = RubySystem::getMemorySizeBits() 
+    m_total_number_of_bits = RubySystem::getMemorySizeBits()
         - RubySystem::getBlockSizeBits();;
 
     m_number_of_levels = number_of_levels;
diff --git a/src/mem/ruby/system/SparseMemory.hh b/src/mem/ruby/structures/SparseMemory.hh
index 65e0ae8ad..9d3c6a844 100644
--- a/src/mem/ruby/system/SparseMemory.hh
+++ b/src/mem/ruby/structures/SparseMemory.hh
@@ -36,8 +36,8 @@
 #include "base/hashmap.hh"
 #include "base/statistics.hh"
 #include "mem/ruby/common/Address.hh"
-#include "mem/ruby/recorder/CacheRecorder.hh"
 #include "mem/ruby/slicc_interface/AbstractEntry.hh"
+#include "mem/ruby/system/CacheRecorder.hh"
 
 typedef void* SparseMemEntry;
 typedef m5::hash_map<Address, SparseMemEntry> SparseMapType;
diff --git a/src/mem/ruby/system/TBETable.hh b/src/mem/ruby/structures/TBETable.hh
index 018da6cbb..018da6cbb 100644
--- a/src/mem/ruby/system/TBETable.hh
+++ b/src/mem/ruby/structures/TBETable.hh
diff --git a/src/mem/ruby/system/TimerTable.cc b/src/mem/ruby/structures/TimerTable.cc
index 38e26e5e9..84c096b05 100644
--- a/src/mem/ruby/system/TimerTable.cc
+++ b/src/mem/ruby/structures/TimerTable.cc
@@ -27,8 +27,8 @@
  */
 
 #include "mem/ruby/common/Global.hh"
+#include "mem/ruby/structures/TimerTable.hh"
 #include "mem/ruby/system/System.hh"
-#include "mem/ruby/system/TimerTable.hh"
 
 TimerTable::TimerTable()
     : m_next_time(0)
diff --git a/src/mem/ruby/system/TimerTable.hh b/src/mem/ruby/structures/TimerTable.hh
index b271d3e37..b271d3e37 100644
--- a/src/mem/ruby/system/TimerTable.hh
+++ b/src/mem/ruby/structures/TimerTable.hh
diff --git a/src/mem/ruby/system/WireBuffer.cc b/src/mem/ruby/structures/WireBuffer.cc
index f45bd5678..702a53f16 100644
--- a/src/mem/ruby/system/WireBuffer.cc
+++ b/src/mem/ruby/structures/WireBuffer.cc
@@ -35,8 +35,8 @@
 #include "base/cprintf.hh"
 #include "base/stl_helpers.hh"
 #include "mem/ruby/common/Global.hh"
+#include "mem/ruby/structures/WireBuffer.hh"
 #include "mem/ruby/system/System.hh"
-#include "mem/ruby/system/WireBuffer.hh"
 
 using namespace std;
 
diff --git a/src/mem/ruby/system/WireBuffer.hh b/src/mem/ruby/structures/WireBuffer.hh
index 9fb2d87a8..6dee01ae0 100644
--- a/src/mem/ruby/system/WireBuffer.hh
+++ b/src/mem/ruby/structures/WireBuffer.hh
@@ -36,8 +36,8 @@
 #include <string>
 #include <vector>
 
-#include "mem/ruby/buffers/MessageBufferNode.hh"
 #include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/MessageBufferNode.hh"
 #include "params/RubyWireBuffer.hh"
 #include "sim/sim_object.hh"
 
@@ -51,7 +51,7 @@
 // separated by a network in real systems to simplify coherence.
 /////////////////////////////////////////////////////////////////////////////
 
-class Message; 
+class Message;
 
 class WireBuffer : public SimObject
 {
diff --git a/src/mem/ruby/system/WireBuffer.py b/src/mem/ruby/structures/WireBuffer.py
index f48ab1f95..441947adf 100644
--- a/src/mem/ruby/system/WireBuffer.py
+++ b/src/mem/ruby/structures/WireBuffer.py
@@ -32,4 +32,4 @@ from m5.SimObject import SimObject
 class RubyWireBuffer(SimObject):
     type = 'RubyWireBuffer'
     cxx_class = 'WireBuffer'
-    cxx_header = "mem/ruby/system/WireBuffer.hh"
+    cxx_header = "mem/ruby/structures/WireBuffer.hh"
diff --git a/src/mem/ruby/recorder/CacheRecorder.cc b/src/mem/ruby/system/CacheRecorder.cc
index a63dbd48e..3a76a64f7 100644
--- a/src/mem/ruby/recorder/CacheRecorder.cc
+++ b/src/mem/ruby/system/CacheRecorder.cc
@@ -28,7 +28,7 @@
  */
 
 #include "debug/RubyCacheTrace.hh"
-#include "mem/ruby/recorder/CacheRecorder.hh"
+#include "mem/ruby/system/CacheRecorder.hh"
 #include "mem/ruby/system/Sequencer.hh"
 #include "mem/ruby/system/System.hh"
 
diff --git a/src/mem/ruby/recorder/CacheRecorder.hh b/src/mem/ruby/system/CacheRecorder.hh
index 2156b0689..2156b0689 100644
--- a/src/mem/ruby/recorder/CacheRecorder.hh
+++ b/src/mem/ruby/system/CacheRecorder.hh
diff --git a/src/mem/ruby/system/RubyPort.hh b/src/mem/ruby/system/RubyPort.hh
index fffe6bb97..12e97208f 100644
--- a/src/mem/ruby/system/RubyPort.hh
+++ b/src/mem/ruby/system/RubyPort.hh
@@ -46,7 +46,7 @@
 #include <string>
 
 #include "mem/protocol/RequestStatus.hh"
-#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/MessageBuffer.hh"
 #include "mem/ruby/system/System.hh"
 #include "mem/mem_object.hh"
 #include "mem/tport.hh"
diff --git a/src/mem/ruby/system/SConscript b/src/mem/ruby/system/SConscript
index 6bb6d2707..55fe11d39 100644
--- a/src/mem/ruby/system/SConscript
+++ b/src/mem/ruby/system/SConscript
@@ -33,26 +33,12 @@ Import('*')
 if env['PROTOCOL'] == 'None':
     Return()
 
-SimObject('Cache.py')
 SimObject('Sequencer.py')
-SimObject('DirectoryMemory.py')
-SimObject('MemoryControl.py')
-SimObject('WireBuffer.py')
 SimObject('RubySystem.py')
-SimObject('RubyMemoryControl.py')
 
+Source('CacheRecorder.cc')
 Source('DMASequencer.cc')
-Source('DirectoryMemory.cc')
-Source('SparseMemory.cc')
-Source('CacheMemory.cc')
-Source('MemoryControl.cc')
-Source('WireBuffer.cc')
-Source('RubyMemoryControl.cc')
-Source('MemoryNode.cc')
-Source('PersistentTable.cc')
 Source('RubyPort.cc')
 Source('RubyPortProxy.cc')
 Source('Sequencer.cc')
 Source('System.cc')
-Source('TimerTable.cc')
-Source('BankedArray.cc')
diff --git a/src/mem/ruby/system/Sequencer.hh b/src/mem/ruby/system/Sequencer.hh
index 49fd8b7bb..d5cd17f5f 100644
--- a/src/mem/ruby/system/Sequencer.hh
+++ b/src/mem/ruby/system/Sequencer.hh
@@ -36,7 +36,7 @@
 #include "mem/protocol/RubyRequestType.hh"
 #include "mem/protocol/SequencerRequestType.hh"
 #include "mem/ruby/common/Address.hh"
-#include "mem/ruby/system/CacheMemory.hh"
+#include "mem/ruby/structures/CacheMemory.hh"
 #include "mem/ruby/system/RubyPort.hh"
 #include "params/RubySequencer.hh"
 
diff --git a/src/mem/ruby/system/System.hh b/src/mem/ruby/system/System.hh
index 594f7e4f5..c909dc614 100644
--- a/src/mem/ruby/system/System.hh
+++ b/src/mem/ruby/system/System.hh
@@ -37,13 +37,13 @@
 
 #include "base/callback.hh"
 #include "base/output.hh"
-#include "mem/packet.hh"
 #include "mem/ruby/profiler/Profiler.hh"
-#include "mem/ruby/recorder/CacheRecorder.hh"
 #include "mem/ruby/slicc_interface/AbstractController.hh"
-#include "mem/ruby/system/MemoryControl.hh"
-#include "mem/ruby/system/MemoryVector.hh"
-#include "mem/ruby/system/SparseMemory.hh"
+#include "mem/ruby/structures/MemoryControl.hh"
+#include "mem/ruby/structures/MemoryVector.hh"
+#include "mem/ruby/structures/SparseMemory.hh"
+#include "mem/ruby/system/CacheRecorder.hh"
+#include "mem/packet.hh"
 #include "params/RubySystem.hh"
 #include "sim/clocked_object.hh"