ruby: Make ruby #includes use full paths to the files they're including.

This basically means changing all #include statements and changing
autogenerated code so that it generates the correct paths.  Because
slicc generates #includes, I had to hard code the include paths to
mem/protocol.

74 files changed, 299 insertions, 299 deletions

diff --git a/src/mem/ruby/network/Network.hh b/src/mem/ruby/network/Network.hh
index 662e54e93..f97ecce29 100644
--- a/src/mem/ruby/network/Network.hh
+++ b/src/mem/ruby/network/Network.hh
@@ -46,9 +46,9 @@
 #ifndef NETWORK_H
 #define NETWORK_H
 
-#include "Global.hh"
-#include "NodeID.hh"
-#include "MessageSizeType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/protocol/MessageSizeType.hh"
 
 class NetDest;
 class MessageBuffer;
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh
index e3a9b7d2d..28da0ac73 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh
@@ -7,7 +7,7 @@
 #ifndef CREDIT_LINK_D_H
 #define CREDIT_LINK_D_H
 
-#include "NetworkLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
 
 class CreditLink_d : public NetworkLink_d {
 public:
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.cc b/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.cc
index 43f9a31bd..28d22c89d 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.cc
@@ -33,15 +33,15 @@
  *
  * */
 
-#include "GarnetNetwork_d.hh"
-#include "MachineType.hh"
-#include "NetworkInterface_d.hh"
-#include "MessageBuffer.hh"
-#include "Router_d.hh"
-#include "Topology.hh"
-#include "NetworkLink_d.hh"
-#include "CreditLink_d.hh"
-#include "NetDest.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/simple/Topology.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh"
+#include "mem/ruby/common/NetDest.hh"
 
 GarnetNetwork_d::GarnetNetwork_d(int nodes)
 {
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh
index 34486eab8..f1dd5d2c7 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh
@@ -36,10 +36,10 @@
 #ifndef GARNETNETWORK_D_H
 #define GARNETNETWORK_D_H
 
-#include "NetworkHeader.hh"
-#include "Vector.hh"
-#include "NetworkConfig.hh"
-#include "Network.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
+#include "mem/ruby/network/Network.hh"
 
 class NetworkInterface_d;
 class MessageBuffer;
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.cc b/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.cc
index bedd801d5..0ae32de13 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.cc
@@ -33,8 +33,8 @@
  *
  * */
 
-#include "InputUnit_d.hh"
-#include "Router_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
 
 InputUnit_d::InputUnit_d(int id, Router_d *router)
 {
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh
index c22363fb1..fafa29135 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh
@@ -36,13 +36,13 @@
 #ifndef INPUT_UNIT_D_H
 #define INPUT_UNIT_D_H
 
-#include "NetworkHeader.hh"
-#include "flitBuffer_d.hh"
-#include "Consumer.hh"
-#include "Vector.hh"
-#include "VirtualChannel_d.hh"
-#include "NetworkLink_d.hh"
-#include "CreditLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh"
 
 class Router_d;
 
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh
index 6a212ce99..4cc73a3d4 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh
@@ -36,8 +36,8 @@
 #ifndef NETWORK_HEADER_H
 #define NETWORK_HEADER_H
 
-#include "Global.hh"
-#include "NodeID.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
 
 using namespace std;
 using namespace __gnu_cxx;
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 edf2d4b95..e36504356 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.cc
@@ -33,10 +33,10 @@
  *
  * */
 
-#include "NetworkInterface_d.hh"
-#include "MessageBuffer.hh"
-#include "flitBuffer_d.hh"
-#include "NetworkMessage.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
+#include "mem/ruby/slicc_interface/NetworkMessage.hh"
 
 NetworkInterface_d::NetworkInterface_d(int id, int virtual_networks, GarnetNetwork_d *network_ptr)
 {
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh
index c776d343c..00aaff8d3 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh
@@ -36,14 +36,14 @@
 #ifndef NET_INTERFACE_D_H
 #define NET_INTERFACE_D_H
 
-#include "NetworkHeader.hh"
-#include "GarnetNetwork_d.hh"
-#include "Vector.hh"
-#include "Consumer.hh"
-#include "Message.hh"
-#include "NetworkLink_d.hh"
-#include "CreditLink_d.hh"
-#include "OutVcState_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh"
 
 class NetworkMessage;
 class MessageBuffer;
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.cc b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.cc
index 26794ebf2..931f0f3a7 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.cc
@@ -33,9 +33,9 @@
  *
  * */
 
-#include "NetworkLink_d.hh"
-#include "NetworkConfig.hh"
-#include "GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
 
 NetworkLink_d::NetworkLink_d(int id)
 {
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh
index 40695331e..28b613faa 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh
@@ -36,11 +36,11 @@
 #ifndef NETWORK_LINK_D_H
 #define NETWORK_LINK_D_H
 
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
-#include "flitBuffer_d.hh"
-#include "PrioHeap.hh"
-#include "power_bus.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/ruby/network/orion/power_bus.hh"
 
 class GarnetNetwork_d;
 
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.cc b/src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.cc
index c85abfd3a..4fd040099 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.cc
@@ -33,9 +33,9 @@
  *
  * */
 
-#include "OutVcState_d.hh"
-#include "NetworkConfig.hh"
-#include "RubyEventQueue.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
 
 OutVcState_d::OutVcState_d(int id)
 {
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh
index 8c07ec796..0bb3d8ced 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh
@@ -36,7 +36,7 @@
 #ifndef OUT_VC_STATE_D_H
 #define OUT_VC_STATE_D_H
 
-#include "NetworkHeader.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
 
 class OutVcState_d {
 public:
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.cc b/src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.cc
index 43096c314..1b8b8097b 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.cc
@@ -33,9 +33,9 @@
  *
  * */
 
-#include "OutputUnit_d.hh"
-#include "Router_d.hh"
-#include "NetworkConfig.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
 
 OutputUnit_d::OutputUnit_d(int id, Router_d *router)
 {
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh
index f23c06559..62de62a4f 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh
@@ -36,12 +36,12 @@
 #ifndef OUTPUT_UNIT_D_H
 #define OUTPUT_UNIT_D_H
 
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
-#include "flitBuffer_d.hh"
-#include "OutVcState_d.hh"
-#include "NetworkLink_d.hh"
-#include "CreditLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh"
 
 class Router_d;
 
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/Router_d.cc b/src/mem/ruby/network/garnet-fixed-pipeline/Router_d.cc
index 4f61487c7..60c9d36a9 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/Router_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/Router_d.cc
@@ -33,16 +33,16 @@
  *
  * */
 
-#include "Router_d.hh"
-#include "GarnetNetwork_d.hh"
-#include "NetworkLink_d.hh"
-#include "CreditLink_d.hh"
-#include "InputUnit_d.hh"
-#include "OutputUnit_d.hh"
-#include "RoutingUnit_d.hh"
-#include "VCallocator_d.hh"
-#include "SWallocator_d.hh"
-#include "Switch_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh"
 
 Router_d::Router_d(int id, GarnetNetwork_d *network_ptr)
 {
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/Router_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/Router_d.hh
index 215055ea6..87b3f38e2 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/Router_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/Router_d.hh
@@ -35,11 +35,11 @@
 #ifndef ROUTER_D_H
 #define ROUTER_D_H
 
-#include "NetworkHeader.hh"
-#include "Vector.hh"
-#include "flit_d.hh"
-#include "NetDest.hh"
-#include "power_router_init.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flit_d.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/orion/power_router_init.hh"
 
 class GarnetNetwork_d;
 class NetworkLink_d;
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.cc b/src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.cc
index ccced1d05..488741055 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.cc
@@ -33,10 +33,10 @@
  *
  * */
 
-#include "RoutingUnit_d.hh"
-#include "Router_d.hh"
-#include "InputUnit_d.hh"
-#include "NetworkMessage.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh"
+#include "mem/ruby/slicc_interface/NetworkMessage.hh"
 
 RoutingUnit_d::RoutingUnit_d(Router_d *router)
 {
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh
index f6eb9f906..093fd7abe 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh
@@ -36,10 +36,10 @@
 #ifndef ROUTING_UNIT_D_H
 #define ROUTING_UNIT_D_H
 
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
-#include "flit_d.hh"
-#include "NetDest.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flit_d.hh"
+#include "mem/ruby/common/NetDest.hh"
 
 class InputUnit_d;
 class Router_d;
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.cc b/src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.cc
index 7f6507047..02dee31a4 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.cc
@@ -33,11 +33,11 @@
  *
  * */
 
-#include "SWallocator_d.hh"
-#include "Router_d.hh"
-#include "InputUnit_d.hh"
-#include "OutputUnit_d.hh"
-#include "GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
 
 SWallocator_d::SWallocator_d(Router_d *router)
 {
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh
index ed8389650..16485c539 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh
@@ -36,8 +36,8 @@
 #ifndef SW_ALLOCATOR_D_H
 #define SW_ALLOCATOR_D_H
 
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/Consumer.hh"
 
 class Router_d;
 class InputUnit_d;
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.cc b/src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.cc
index be5469696..e1ca64864 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.cc
@@ -33,9 +33,9 @@
  *
  * */
 
-#include "Switch_d.hh"
-#include "Router_d.hh"
-#include "OutputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh"
 
 Switch_d::Switch_d(Router_d *router)
 {
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh
index 63f3995f5..0b45172b5 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh
@@ -36,9 +36,9 @@
 #ifndef SWITCH_D_H
 #define SWITCH_D_H
 
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
-#include "flitBuffer_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
 
 class Router_d;
 class OutputUnit_d;
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.cc b/src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.cc
index b444ebc02..dc6d170e5 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.cc
@@ -33,12 +33,12 @@
  *
  * */
 
-#include "NetworkConfig.hh"
-#include "VCallocator_d.hh"
-#include "Router_d.hh"
-#include "InputUnit_d.hh"
-#include "OutputUnit_d.hh"
-#include "GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
 
 VCallocator_d::VCallocator_d(Router_d *router)
 {
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh
index fc1bf1340..8b40d602d 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh
@@ -36,8 +36,8 @@
 #ifndef VC_ALLOCATOR_D_H
 #define VC_ALLOCATOR_D_H
 
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/Consumer.hh"
 
 class Router_d;
 class InputUnit_d;
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.cc b/src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.cc
index 60c6bef2a..2e4473a29 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.cc
@@ -33,7 +33,7 @@
  *
  * */
 
-#include "VirtualChannel_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh"
 
 VirtualChannel_d::VirtualChannel_d(int id)
 {
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh
index 111837122..8c32482ea 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh
@@ -36,8 +36,8 @@
 #ifndef VIRTUAL_CHANNEL_D_H
 #define VIRTUAL_CHANNEL_D_H
 
-#include "NetworkHeader.hh"
-#include "flitBuffer_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
 
 class VirtualChannel_d {
 public:
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.cc b/src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.cc
index e5e7226a2..f3ddca0f2 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.cc
@@ -33,7 +33,7 @@
  *
  * */
 
-#include "flitBuffer_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
 
 flitBuffer_d::flitBuffer_d()
 {
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh
index 7e7d07a5a..5ac69b22e 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh
@@ -36,9 +36,9 @@
 #ifndef FLIT_BUFFER_D_H
 #define FLIT_BUFFER_D_H
 
-#include "NetworkHeader.hh"
-#include "PrioHeap.hh"
-#include "flit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flit_d.hh"
 
 class flitBuffer_d {
 public:
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/flit_d.cc b/src/mem/ruby/network/garnet-fixed-pipeline/flit_d.cc
index e049c5537..3defb8029 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/flit_d.cc
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/flit_d.cc
@@ -33,7 +33,7 @@
  *
  * */
 
-#include "flit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flit_d.hh"
 
 flit_d::flit_d(int id, int  vc, int vnet, int size, MsgPtr msg_ptr)
 {
diff --git a/src/mem/ruby/network/garnet-fixed-pipeline/flit_d.hh b/src/mem/ruby/network/garnet-fixed-pipeline/flit_d.hh
index 9a47e964f..4d69984d2 100644
--- a/src/mem/ruby/network/garnet-fixed-pipeline/flit_d.hh
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/flit_d.hh
@@ -37,8 +37,8 @@
 #ifndef FLIT_D_H
 #define FLIT_D_H
 
-#include "NetworkHeader.hh"
-#include "Message.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
 
 class flit_d {
 public:
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh b/src/mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh
index 773d00323..e66858356 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh
@@ -35,9 +35,9 @@
 #ifndef FLEXIBLE_CONSUMER_H
 #define FLEXIBLE_CONSUMER_H
 
-#include "Consumer.hh"
-#include "NetworkHeader.hh"
-#include "NetDest.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/NetDest.hh"
 
 class FlexibleConsumer : public Consumer {
 public:
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc b/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc
index 3d7c555b5..a2482c330 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc
@@ -33,16 +33,16 @@
  *
  * */
 
-#include "GarnetNetwork.hh"
-#include "MachineType.hh"
-#include "NetworkInterface.hh"
-#include "MessageBuffer.hh"
-#include "Router.hh"
-#include "Topology.hh"
-#include "SimpleNetwork.hh"
-#include "GarnetNetwork_d.hh"
-#include "NetworkLink.hh"
-#include "NetDest.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/Router.hh"
+#include "mem/ruby/network/simple/Topology.hh"
+#include "mem/ruby/network/simple/SimpleNetwork.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh"
+#include "mem/ruby/common/NetDest.hh"
 
 // calls new to abstract away from the network
 Network* Network::createNetwork(int nodes)
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh b/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh
index cb9a8908a..52cdaa5d6 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh
@@ -36,10 +36,10 @@
 #ifndef GARNET_NETWORK_H
 #define GARNET_NETWORK_H
 
-#include "NetworkHeader.hh"
-#include "Vector.hh"
-#include "NetworkConfig.hh"
-#include "Network.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
+#include "mem/ruby/network/Network.hh"
 
 class NetworkInterface;
 class MessageBuffer;
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/InVcState.cc b/src/mem/ruby/network/garnet-flexible-pipeline/InVcState.cc
index 52090cb2b..cecaf867e 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/InVcState.cc
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/InVcState.cc
@@ -33,7 +33,7 @@
  *
  * */
 
-#include "InVcState.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/InVcState.hh"
 
 InVcState::InVcState(int id)
 {
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/InVcState.hh b/src/mem/ruby/network/garnet-flexible-pipeline/InVcState.hh
index efbd0d513..af48674e9 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/InVcState.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/InVcState.hh
@@ -37,7 +37,7 @@
 #ifndef IN_VC_STATE_H
 #define IN_VC_STATE_H
 
-#include "NetworkHeader.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
 
 class InVcState {
 public:
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh
index b35dfba67..433e2f686 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh
@@ -38,9 +38,9 @@
 #ifndef NETWORKCONFIG_H
 #define NETWORKCONFIG_H
 
-#include "NetworkHeader.hh"
-#include "util.hh"
-#include "RubyConfig.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/ruby/config/RubyConfig.hh"
 
 class NetworkConfig {
         public:
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.cc b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.cc
index 3dfb5b4b9..b7bd2393c 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.cc
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.cc
@@ -33,10 +33,10 @@
  *
  * */
 
-#include "NetworkInterface.hh"
-#include "MessageBuffer.hh"
-#include "flitBuffer.hh"
-#include "NetworkMessage.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh"
+#include "mem/ruby/slicc_interface/NetworkMessage.hh"
 
 NetworkInterface::NetworkInterface(int id, int virtual_networks, GarnetNetwork *network_ptr)
 {
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh
index d7932432b..3b98226c8 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh
@@ -35,13 +35,13 @@
 #ifndef NET_INTERFACE_H
 #define NET_INTERFACE_H
 
-#include "NetworkHeader.hh"
-#include "GarnetNetwork.hh"
-#include "Vector.hh"
-#include "FlexibleConsumer.hh"
-#include "Message.hh"
-#include "NetworkLink.hh"
-#include "OutVcState.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh"
 
 class NetworkMessage;
 class MessageBuffer;
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.cc b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.cc
index e586ece9e..a170047ac 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.cc
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.cc
@@ -33,9 +33,9 @@
  *
  * */
 
-#include "NetworkLink.hh"
-#include "NetworkConfig.hh"
-#include "GarnetNetwork.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh"
 
 NetworkLink::NetworkLink(int id, int latency, GarnetNetwork *net_ptr)
 {
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh
index cdea89d79..a8278ae4c 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh
@@ -35,11 +35,11 @@
 #ifndef NETWORK_LINK_H
 #define NETWORK_LINK_H
 
-#include "NetworkHeader.hh"
-#include "FlexibleConsumer.hh"
-#include "flitBuffer.hh"
-#include "PrioHeap.hh"
-#include "NetDest.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/ruby/common/NetDest.hh"
 
 class GarnetNetwork;
 
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.cc b/src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.cc
index 5d43a7821..9a95971eb 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.cc
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.cc
@@ -33,7 +33,7 @@
  *
  * */
 
-#include "OutVcState.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh"
 
 OutVcState::OutVcState(int id)
 {
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh b/src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh
index 81120ee8c..074d97d2e 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh
@@ -36,7 +36,7 @@
 #ifndef OUT_VC_STATE_H
 #define OUT_VC_STATE_H
 
-#include "NetworkHeader.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
 
 class OutVcState {
 public:
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/Router.cc b/src/mem/ruby/network/garnet-flexible-pipeline/Router.cc
index 4809d43ed..2ee8fc5aa 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/Router.cc
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/Router.cc
@@ -33,11 +33,11 @@
  *
  * */
 
-#include "Router.hh"
-#include "NetworkMessage.hh"
-#include "InVcState.hh"
-#include "OutVcState.hh"
-#include "VCarbiter.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/Router.hh"
+#include "mem/ruby/slicc_interface/NetworkMessage.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/InVcState.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh"
 
 Router::Router(int id, GarnetNetwork *network_ptr)
 {
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/Router.hh b/src/mem/ruby/network/garnet-flexible-pipeline/Router.hh
index c0d91e0dd..ce7dd4a8f 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/Router.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/Router.hh
@@ -36,15 +36,15 @@
 #ifndef ROUTER_H
 #define ROUTER_H
 
-#include "NetworkHeader.hh"
-#include "GarnetNetwork.hh"
-#include "FlexibleConsumer.hh"
-#include "PrioHeap.hh"
-#include "NetworkLink.hh"
-#include "NetDest.hh"
-#include "flitBuffer.hh"
-#include "InVcState.hh"
-#include "OutVcState.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/InVcState.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh"
 
 class VCarbiter;
 
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.cc b/src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.cc
index 7ebd83de3..271d6dd38 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.cc
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.cc
@@ -33,8 +33,8 @@
  *
  * */
 
-#include "VCarbiter.hh"
-#include "Router.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/Router.hh"
 
 VCarbiter::VCarbiter(Router *router)
 {
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh b/src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh
index 10368f2b4..6dcb80873 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh
@@ -36,8 +36,8 @@
 #ifndef VC_ARBITER_H
 #define VC_ARBITER_H
 
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/Consumer.hh"
 
 class Router;
 
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/flit.cc b/src/mem/ruby/network/garnet-flexible-pipeline/flit.cc
index f3cba2035..51b8af6c6 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/flit.cc
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/flit.cc
@@ -33,7 +33,7 @@
  *
  * */
 
-#include "flit.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/flit.hh"
 
 flit::flit(int id, int  vc, int vnet, int size, MsgPtr msg_ptr)
 {
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/flit.hh b/src/mem/ruby/network/garnet-flexible-pipeline/flit.hh
index fc8042cfc..b9ee9a807 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/flit.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/flit.hh
@@ -33,8 +33,8 @@
  *
  * */
 
-#include "NetworkHeader.hh"
-#include "Message.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
 
 #ifndef FLIT_H
 #define FLIT_H
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.cc b/src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.cc
index e0fb26e0a..a0bb71c9d 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.cc
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.cc
@@ -33,7 +33,7 @@
  *
  * */
 
-#include "flitBuffer.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh"
 
 flitBuffer::flitBuffer()
 {
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh b/src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh
index 1eb122a51..fa011ecaf 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh
@@ -36,9 +36,9 @@
 #ifndef FLIT_BUFFER_H
 #define FLIT_BUFFER_H
 
-#include "NetworkHeader.hh"
-#include "PrioHeap.hh"
-#include "flit.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/flit.hh"
 
 class flitBuffer {
 public:
diff --git a/src/mem/ruby/network/orion/NetworkPower.cc b/src/mem/ruby/network/orion/NetworkPower.cc
index 6e5994071..9d10d5136 100644
--- a/src/mem/ruby/network/orion/NetworkPower.cc
+++ b/src/mem/ruby/network/orion/NetworkPower.cc
@@ -29,17 +29,17 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "power_router_init.hh"
-#include "power_array.hh"
-#include "power_crossbar.hh"
-#include "power_arbiter.hh"
-#include "power_bus.hh"
-#include "NetworkPower.hh"
-#include "Router_d.hh"
-#include "NetworkLink_d.hh"
-#include "GarnetNetwork_d.hh"
-#include "SIM_port.hh"
-#include "parm_technology.hh"
+#include "mem/ruby/network/orion/power_router_init.hh"
+#include "mem/ruby/network/orion/power_array.hh"
+#include "mem/ruby/network/orion/power_crossbar.hh"
+#include "mem/ruby/network/orion/power_arbiter.hh"
+#include "mem/ruby/network/orion/power_bus.hh"
+#include "mem/ruby/network/orion/NetworkPower.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
 
 /* --------- Static energy calculation functions ------------ */
 
diff --git a/src/mem/ruby/network/orion/SIM_power.hh b/src/mem/ruby/network/orion/SIM_power.hh
index 1f0ddd36c..250e710e3 100644
--- a/src/mem/ruby/network/orion/SIM_power.hh
+++ b/src/mem/ruby/network/orion/SIM_power.hh
@@ -30,7 +30,7 @@
 #define _SIM_POWER_H
 
 #include <sys/types.h>
-#include "SIM_power_test.hh"
+#include "mem/ruby/network/orion/SIM_power_test.hh"
 
 #define SIM_NO_MODEL    0
 
diff --git a/src/mem/ruby/network/orion/power_arbiter.cc b/src/mem/ruby/network/orion/power_arbiter.cc
index ba68fbe1c..d382ebfb2 100644
--- a/src/mem/ruby/network/orion/power_arbiter.cc
+++ b/src/mem/ruby/network/orion/power_arbiter.cc
@@ -28,13 +28,13 @@
 
 #include <stdio.h>
 
-#include "power_arbiter.hh"
-#include "power_array.hh"
-#include "power_ll.hh"
-#include "parm_technology.hh"
-#include "SIM_port.hh"
-#include "power_static.hh"
-#include "power_utils.hh"
+#include "mem/ruby/network/orion/power_arbiter.hh"
+#include "mem/ruby/network/orion/power_array.hh"
+#include "mem/ruby/network/orion/power_ll.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/power_static.hh"
+#include "mem/ruby/network/orion/power_utils.hh"
 
 
 
diff --git a/src/mem/ruby/network/orion/power_arbiter.hh b/src/mem/ruby/network/orion/power_arbiter.hh
index 671608c2f..f2c3a9eab 100644
--- a/src/mem/ruby/network/orion/power_arbiter.hh
+++ b/src/mem/ruby/network/orion/power_arbiter.hh
@@ -32,7 +32,7 @@
 #ifndef _POWER_ARBITER_H
 #define _POWER_ARBITER_H
 
-#include "power_array.hh"
+#include "mem/ruby/network/orion/power_array.hh"
 
 typedef enum {
         RR_ARBITER =1,
diff --git a/src/mem/ruby/network/orion/power_array.cc b/src/mem/ruby/network/orion/power_array.cc
index 225f45377..9ac08ffb0 100644
--- a/src/mem/ruby/network/orion/power_array.cc
+++ b/src/mem/ruby/network/orion/power_array.cc
@@ -29,12 +29,12 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "power_array.hh"
-#include "power_ll.hh"
-#include "parm_technology.hh"
-#include "SIM_port.hh"
-#include "power_static.hh"
-#include "power_utils.hh"
+#include "mem/ruby/network/orion/power_array.hh"
+#include "mem/ruby/network/orion/power_ll.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/power_static.hh"
+#include "mem/ruby/network/orion/power_utils.hh"
 
 /* local macros */
 
diff --git a/src/mem/ruby/network/orion/power_bus.cc b/src/mem/ruby/network/orion/power_bus.cc
index 032c3c519..7060752a5 100644
--- a/src/mem/ruby/network/orion/power_bus.cc
+++ b/src/mem/ruby/network/orion/power_bus.cc
@@ -28,12 +28,12 @@
 
 #include <stdio.h>
 
-#include "power_bus.hh"
-#include "power_ll.hh"
-#include "parm_technology.hh"
-#include "SIM_port.hh"
-#include "power_static.hh"
-#include "power_utils.hh"
+#include "mem/ruby/network/orion/power_bus.hh"
+#include "mem/ruby/network/orion/power_ll.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/power_static.hh"
+#include "mem/ruby/network/orion/power_utils.hh"
 
 /* ------- bus(link) model ---------- */
 
diff --git a/src/mem/ruby/network/orion/power_crossbar.cc b/src/mem/ruby/network/orion/power_crossbar.cc
index d3e2232ae..a9f3e2e39 100644
--- a/src/mem/ruby/network/orion/power_crossbar.cc
+++ b/src/mem/ruby/network/orion/power_crossbar.cc
@@ -29,12 +29,12 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "power_ll.hh"
-#include "power_crossbar.hh"
-#include "parm_technology.hh"
-#include "SIM_port.hh"
-#include "power_static.hh"
-#include "power_utils.hh"
+#include "mem/ruby/network/orion/power_ll.hh"
+#include "mem/ruby/network/orion/power_crossbar.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/power_static.hh"
+#include "mem/ruby/network/orion/power_utils.hh"
 
 /*-------------------- CROSSBAR power model -------------------*/
 
diff --git a/src/mem/ruby/network/orion/power_ll.cc b/src/mem/ruby/network/orion/power_ll.cc
index 3628989d0..aab98cc8c 100644
--- a/src/mem/ruby/network/orion/power_ll.cc
+++ b/src/mem/ruby/network/orion/power_ll.cc
@@ -70,10 +70,10 @@
 #include <math.h>
 #include <assert.h>
 
-#include "parm_technology.hh"
-#include "SIM_port.hh"
-#include "power_static.hh"
-#include "power_ll.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/power_static.hh"
+#include "mem/ruby/network/orion/power_ll.hh"
 
 /*----------------------------------------------------------------------*/
 
diff --git a/src/mem/ruby/network/orion/power_router_init.cc b/src/mem/ruby/network/orion/power_router_init.cc
index be58fbdbf..9a8bc7f28 100644
--- a/src/mem/ruby/network/orion/power_router_init.cc
+++ b/src/mem/ruby/network/orion/power_router_init.cc
@@ -28,15 +28,15 @@
 
 #include <stdio.h>
 
-#include "power_router_init.hh"
-#include "power_array.hh"
-#include "power_arbiter.hh"
-#include "power_crossbar.hh"
-#include "power_ll.hh"
-#include "parm_technology.hh"
-#include "SIM_port.hh"
-#include "power_static.hh"
-#include "power_utils.hh"
+#include "mem/ruby/network/orion/power_router_init.hh"
+#include "mem/ruby/network/orion/power_array.hh"
+#include "mem/ruby/network/orion/power_arbiter.hh"
+#include "mem/ruby/network/orion/power_crossbar.hh"
+#include "mem/ruby/network/orion/power_ll.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/power_static.hh"
+#include "mem/ruby/network/orion/power_utils.hh"
 
 /* -------------------------------------------------------------------------------------------- */
 // Set buffer parameters
diff --git a/src/mem/ruby/network/orion/power_router_init.hh b/src/mem/ruby/network/orion/power_router_init.hh
index 2d95cea0b..df0b8fb18 100644
--- a/src/mem/ruby/network/orion/power_router_init.hh
+++ b/src/mem/ruby/network/orion/power_router_init.hh
@@ -29,9 +29,9 @@
 #ifndef _POWER_ROUTER_INIT_H
 #define _POWER_ROUTER_INIT_H
 
-#include "power_array.hh"
-#include "power_arbiter.hh"
-#include "power_crossbar.hh"
+#include "mem/ruby/network/orion/power_array.hh"
+#include "mem/ruby/network/orion/power_arbiter.hh"
+#include "mem/ruby/network/orion/power_crossbar.hh"
 
 /* ------------ Models ------------------------ */
 /*typedef enum {
diff --git a/src/mem/ruby/network/orion/power_static.cc b/src/mem/ruby/network/orion/power_static.cc
index c0ae394a6..ded399000 100644
--- a/src/mem/ruby/network/orion/power_static.cc
+++ b/src/mem/ruby/network/orion/power_static.cc
@@ -26,7 +26,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "power_static.hh"
+#include "mem/ruby/network/orion/power_static.hh"
 
 #if (PARM_TECH_POINT == 18)
 double NMOS_TAB[1] = {20.5e-9};
diff --git a/src/mem/ruby/network/orion/power_static.hh b/src/mem/ruby/network/orion/power_static.hh
index 6bc58ca01..09f989aa2 100644
--- a/src/mem/ruby/network/orion/power_static.hh
+++ b/src/mem/ruby/network/orion/power_static.hh
@@ -29,7 +29,7 @@
 #ifndef _POWER_STATIC_H
 #define _POWER_STATIC_H
 
-#include "parm_technology.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
 
 extern double NMOS_TAB[1];
 extern double PMOS_TAB[1];
diff --git a/src/mem/ruby/network/orion/power_utils.cc b/src/mem/ruby/network/orion/power_utils.cc
index 1f592fff0..be308be88 100644
--- a/src/mem/ruby/network/orion/power_utils.cc
+++ b/src/mem/ruby/network/orion/power_utils.cc
@@ -27,8 +27,8 @@
  */
 
 #include <stdio.h>
-#include "parm_technology.hh"
-#include "power_utils.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/power_utils.hh"
 #include <assert.h>
 #include <math.h>
 
diff --git a/src/mem/ruby/network/simple/PerfectSwitch.cc b/src/mem/ruby/network/simple/PerfectSwitch.cc
index a88a29e83..02725148f 100644
--- a/src/mem/ruby/network/simple/PerfectSwitch.cc
+++ b/src/mem/ruby/network/simple/PerfectSwitch.cc
@@ -37,14 +37,14 @@
  */
 
 
-#include "PerfectSwitch.hh"
-#include "NetworkMessage.hh"
-#include "Profiler.hh"
-#include "System.hh"
-#include "SimpleNetwork.hh"
-#include "util.hh"
-#include "MessageBuffer.hh"
-#include "Protocol.hh"
+#include "mem/ruby/network/simple/PerfectSwitch.hh"
+#include "mem/ruby/slicc_interface/NetworkMessage.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/network/simple/SimpleNetwork.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/protocol/Protocol.hh"
 
 const int PRIORITY_SWITCH_LIMIT = 128;
 
diff --git a/src/mem/ruby/network/simple/PerfectSwitch.hh b/src/mem/ruby/network/simple/PerfectSwitch.hh
index 4d381ccc9..9cc28fff8 100644
--- a/src/mem/ruby/network/simple/PerfectSwitch.hh
+++ b/src/mem/ruby/network/simple/PerfectSwitch.hh
@@ -41,10 +41,10 @@
 #ifndef PerfectSwitch_H
 #define PerfectSwitch_H
 
-#include "Global.hh"
-#include "Vector.hh"
-#include "Consumer.hh"
-#include "NodeID.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/system/NodeID.hh"
 
 class MessageBuffer;
 class NetDest;
diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc
index 549503e47..1258edb60 100644
--- a/src/mem/ruby/network/simple/SimpleNetwork.cc
+++ b/src/mem/ruby/network/simple/SimpleNetwork.cc
@@ -36,17 +36,17 @@
  *
  */
 
-#include "SimpleNetwork.hh"
-#include "Profiler.hh"
-#include "System.hh"
-#include "Switch.hh"
-#include "NetDest.hh"
-#include "Topology.hh"
-#include "TopologyType.hh"
-#include "MachineType.hh"
-#include "MessageBuffer.hh"
-#include "Protocol.hh"
-#include "Map.hh"
+#include "mem/ruby/network/simple/SimpleNetwork.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/network/simple/Switch.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/simple/Topology.hh"
+#include "mem/protocol/TopologyType.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/protocol/Protocol.hh"
+#include "mem/gems_common/Map.hh"
 
 // ***BIG HACK*** - This is actually code that _should_ be in Network.C
 
diff --git a/src/mem/ruby/network/simple/SimpleNetwork.hh b/src/mem/ruby/network/simple/SimpleNetwork.hh
index a28904227..8d2f64b7a 100644
--- a/src/mem/ruby/network/simple/SimpleNetwork.hh
+++ b/src/mem/ruby/network/simple/SimpleNetwork.hh
@@ -69,10 +69,10 @@
 #ifndef SIMPLENETWORK_H
 #define SIMPLENETWORK_H
 
-#include "Global.hh"
-#include "Vector.hh"
-#include "Network.hh"
-#include "NodeID.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/ruby/system/NodeID.hh"
 
 class NetDest;
 class MessageBuffer;
diff --git a/src/mem/ruby/network/simple/Switch.cc b/src/mem/ruby/network/simple/Switch.cc
index 3b55d156f..648b6ca01 100644
--- a/src/mem/ruby/network/simple/Switch.cc
+++ b/src/mem/ruby/network/simple/Switch.cc
@@ -37,13 +37,13 @@
  */
 
 
-#include "Switch.hh"
-#include "PerfectSwitch.hh"
-#include "MessageBuffer.hh"
-#include "Throttle.hh"
-#include "MessageSizeType.hh"
-#include "Network.hh"
-#include "Protocol.hh"
+#include "mem/ruby/network/simple/Switch.hh"
+#include "mem/ruby/network/simple/PerfectSwitch.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/simple/Throttle.hh"
+#include "mem/protocol/MessageSizeType.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/protocol/Protocol.hh"
 
 Switch::Switch(SwitchID sid, SimpleNetwork* network_ptr)
 {
diff --git a/src/mem/ruby/network/simple/Switch.hh b/src/mem/ruby/network/simple/Switch.hh
index a408155c0..58bde05ea 100644
--- a/src/mem/ruby/network/simple/Switch.hh
+++ b/src/mem/ruby/network/simple/Switch.hh
@@ -44,8 +44,8 @@
 #ifndef Switch_H
 #define Switch_H
 
-#include "Global.hh"
-#include "Vector.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
 
 class MessageBuffer;
 class PerfectSwitch;
diff --git a/src/mem/ruby/network/simple/Throttle.cc b/src/mem/ruby/network/simple/Throttle.cc
index 2f6e68afd..1d9ec0dc6 100644
--- a/src/mem/ruby/network/simple/Throttle.cc
+++ b/src/mem/ruby/network/simple/Throttle.cc
@@ -34,12 +34,12 @@
  *
  */
 
-#include "Throttle.hh"
-#include "MessageBuffer.hh"
-#include "Network.hh"
-#include "System.hh"
-#include "NetworkMessage.hh"
-#include "Protocol.hh"
+#include "mem/ruby/network/simple/Throttle.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/slicc_interface/NetworkMessage.hh"
+#include "mem/protocol/Protocol.hh"
 
 const int HIGH_RANGE = 256;
 const int ADJUST_INTERVAL = 50000;
diff --git a/src/mem/ruby/network/simple/Throttle.hh b/src/mem/ruby/network/simple/Throttle.hh
index 67cfabcdc..067c7af5f 100644
--- a/src/mem/ruby/network/simple/Throttle.hh
+++ b/src/mem/ruby/network/simple/Throttle.hh
@@ -42,11 +42,11 @@
 #ifndef THROTTLE_H
 #define THROTTLE_H
 
-#include "Global.hh"
-#include "Vector.hh"
-#include "Consumer.hh"
-#include "NodeID.hh"
-#include "RubyConfig.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/config/RubyConfig.hh"
 
 class MessageBuffer;
 
diff --git a/src/mem/ruby/network/simple/Topology.cc b/src/mem/ruby/network/simple/Topology.cc
index a7454a5af..7c52af1ce 100644
--- a/src/mem/ruby/network/simple/Topology.cc
+++ b/src/mem/ruby/network/simple/Topology.cc
@@ -36,14 +36,14 @@
  *
  * */
 
-#include "Topology.hh"
-#include "NetDest.hh"
-#include "Network.hh"
-#include "TopologyType.hh"
-#include "RubyConfig.hh"
-#include "util.hh"
-#include "MachineType.hh"
-#include "Protocol.hh"
+#include "mem/ruby/network/simple/Topology.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/protocol/TopologyType.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/protocol/Protocol.hh"
 #include <string>
 
 static const int INFINITE_LATENCY = 10000; // Yes, this is a big hack
diff --git a/src/mem/ruby/network/simple/Topology.hh b/src/mem/ruby/network/simple/Topology.hh
index bfc503087..ee6be1ebf 100644
--- a/src/mem/ruby/network/simple/Topology.hh
+++ b/src/mem/ruby/network/simple/Topology.hh
@@ -47,9 +47,9 @@
 #ifndef TOPOLOGY_H
 #define TOPOLOGY_H
 
-#include "Global.hh"
-#include "Vector.hh"
-#include "NodeID.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/system/NodeID.hh"
 
 class Network;
 class NetDest;