diff -r ebf2acd02fc5 -r 8816ebf0a103 tests/configs/gpu-randomtest-ruby.py
--- a/tests/configs/gpu-randomtest-ruby.py	Thu Oct 06 21:06:00 2016 -0400
+++ b/tests/configs/gpu-randomtest-ruby.py	Fri Oct 07 18:29:15 2016 +0100
@@ -39,13 +39,8 @@
 from m5.util import addToPath
 import os, optparse, sys
 
-# Get paths we might need.  It's expected this file is in m5/configs/example.
-config_path = os.path.dirname(os.path.abspath(__file__))
-config_root = os.path.dirname(config_path)
-m5_root = os.path.dirname(config_root)
-addToPath(config_root+'/configs/common')
-addToPath(config_root+'/configs/ruby')
-addToPath(config_root+'/configs/topologies')
+m5.util.addToPath('../configs/common')
+m5.util.addToPath('../configs/ruby')
 
 import Ruby
 import Options
diff -r ebf2acd02fc5 -r 8816ebf0a103 tests/configs/gpu-ruby.py
--- a/tests/configs/gpu-ruby.py	Thu Oct 06 21:06:00 2016 -0400
+++ b/tests/configs/gpu-ruby.py	Fri Oct 07 18:29:15 2016 +0100
@@ -39,12 +39,8 @@
 from m5.util import addToPath
 import os, optparse, sys, math, glob
 
-# Get paths we might need
-config_path = os.path.dirname(os.path.abspath(__file__))
-config_root = os.path.dirname(config_path)
-addToPath(config_root+'/configs/common')
-addToPath(config_root+'/configs/ruby')
-addToPath(config_root+'/configs/topologies')
+m5.util.addToPath('../configs/common')
+m5.util.addToPath('../configs/ruby')
 
 import Ruby
 import Options
diff -r ebf2acd02fc5 -r 8816ebf0a103 tests/configs/memtest-ruby.py
--- a/tests/configs/memtest-ruby.py	Thu Oct 06 21:06:00 2016 -0400
+++ b/tests/configs/memtest-ruby.py	Fri Oct 07 18:29:15 2016 +0100
@@ -33,13 +33,8 @@
 from m5.util import addToPath
 import os, optparse, sys
 
-# Get paths we might need
-config_path = os.path.dirname(os.path.abspath(__file__))
-config_root = os.path.dirname(config_path)
-m5_root = os.path.dirname(config_root)
-addToPath(config_root+'/configs/common')
-addToPath(config_root+'/configs/ruby')
-addToPath(config_root+'/configs/topologies')
+m5.util.addToPath('../configs/common')
+m5.util.addToPath('../configs/ruby')
 
 import Ruby
 import Options
diff -r ebf2acd02fc5 -r 8816ebf0a103 tests/configs/o3-timing-mp-ruby.py
--- a/tests/configs/o3-timing-mp-ruby.py	Thu Oct 06 21:06:00 2016 -0400
+++ b/tests/configs/o3-timing-mp-ruby.py	Fri Oct 07 18:29:15 2016 +0100
@@ -29,7 +29,6 @@
 import m5
 from m5.objects import *
 m5.util.addToPath('../configs/common')
-m5.util.addToPath('../configs/topologies')
 
 nb_cores = 4
 cpus = [ DerivO3CPU(cpu_id=i) for i in xrange(nb_cores) ]
diff -r ebf2acd02fc5 -r 8816ebf0a103 tests/configs/o3-timing-ruby.py
--- a/tests/configs/o3-timing-ruby.py	Thu Oct 06 21:06:00 2016 -0400
+++ b/tests/configs/o3-timing-ruby.py	Fri Oct 07 18:29:15 2016 +0100
@@ -29,7 +29,6 @@
 import m5
 from m5.objects import *
 m5.util.addToPath('../configs/common')
-m5.util.addToPath('../configs/topologies')
 
 
 import ruby_config
diff -r ebf2acd02fc5 -r 8816ebf0a103 tests/configs/pc-simple-timing-ruby.py
--- a/tests/configs/pc-simple-timing-ruby.py	Thu Oct 06 21:06:00 2016 -0400
+++ b/tests/configs/pc-simple-timing-ruby.py	Fri Oct 07 18:29:15 2016 +0100
@@ -33,7 +33,6 @@
 import FSConfig
 
 m5.util.addToPath('../configs/ruby')
-m5.util.addToPath('../configs/topologies')
 import Ruby
 import Options
 
diff -r ebf2acd02fc5 -r 8816ebf0a103 tests/configs/rubytest-ruby.py
--- a/tests/configs/rubytest-ruby.py	Thu Oct 06 21:06:00 2016 -0400
+++ b/tests/configs/rubytest-ruby.py	Fri Oct 07 18:29:15 2016 +0100
@@ -34,13 +34,8 @@
 from m5.util import addToPath
 import os, optparse, sys
 
-# Get paths we might need.  It's expected this file is in m5/configs/example.
-config_path = os.path.dirname(os.path.abspath(__file__))
-config_root = os.path.dirname(config_path)
-m5_root = os.path.dirname(config_root)
-addToPath(config_root+'/configs/common')
-addToPath(config_root+'/configs/ruby')
-addToPath(config_root+'/configs/topologies')
+m5.util.addToPath('../configs/common')
+m5.util.addToPath('../configs/ruby')
 
 import Ruby
 import Options
diff -r ebf2acd02fc5 -r 8816ebf0a103 tests/configs/simple-atomic-mp-ruby.py
--- a/tests/configs/simple-atomic-mp-ruby.py	Thu Oct 06 21:06:00 2016 -0400
+++ b/tests/configs/simple-atomic-mp-ruby.py	Fri Oct 07 18:29:15 2016 +0100
@@ -28,8 +28,6 @@
 
 import m5
 from m5.objects import *
-m5.util.addToPath('../configs/topologies')
-
 
 nb_cores = 4
 cpus = [ AtomicSimpleCPU(cpu_id=i) for i in xrange(nb_cores) ]
diff -r ebf2acd02fc5 -r 8816ebf0a103 tests/configs/simple-timing-mp-ruby.py
--- a/tests/configs/simple-timing-mp-ruby.py	Thu Oct 06 21:06:00 2016 -0400
+++ b/tests/configs/simple-timing-mp-ruby.py	Fri Oct 07 18:29:15 2016 +0100
@@ -32,13 +32,8 @@
 from m5.util import addToPath
 import os, optparse, sys
 
-# Get paths we might need
-config_path = os.path.dirname(os.path.abspath(__file__))
-config_root = os.path.dirname(config_path)
-m5_root = os.path.dirname(config_root)
-addToPath(config_root+'/configs/common')
-addToPath(config_root+'/configs/ruby')
-addToPath(config_root+'/configs/topologies')
+m5.util.addToPath('../configs/common')
+m5.util.addToPath('../configs/ruby')
 
 import Options
 import Ruby
diff -r ebf2acd02fc5 -r 8816ebf0a103 tests/configs/simple-timing-ruby.py
--- a/tests/configs/simple-timing-ruby.py	Thu Oct 06 21:06:00 2016 -0400
+++ b/tests/configs/simple-timing-ruby.py	Fri Oct 07 18:29:15 2016 +0100
@@ -32,12 +32,8 @@
 from m5.util import addToPath
 import os, optparse, sys
 
-# Get paths we might need
-config_path = os.path.dirname(os.path.abspath(__file__))
-config_root = os.path.dirname(config_path)
-addToPath(config_root+'/configs/common')
-addToPath(config_root+'/configs/ruby')
-addToPath(config_root+'/configs/topologies')
+m5.util.addToPath('../configs/common')
+m5.util.addToPath('../configs/ruby')
 
 import Ruby
 import Options
diff -r ebf2acd02fc5 -r 8816ebf0a103 configs/example/apu_se.py
--- a/configs/example/apu_se.py	Thu Oct 06 21:06:00 2016 -0400
+++ b/configs/example/apu_se.py	Fri Oct 07 18:29:15 2016 +0100
@@ -43,13 +43,10 @@
 from m5.util import addToPath
 
 addToPath('../ruby')
-addToPath('../network')
 addToPath('../common')
-addToPath('../topologies')
 
 import Options
 import Ruby
-import Network
 import Simulation
 import GPUTLBOptions, GPUTLBConfig
 
@@ -159,7 +156,6 @@
 
 
 Ruby.define_options(parser)
-Network.define_options(parser)
 
 #add TLB options to the parser
 GPUTLBOptions.tlb_options(parser)
diff -r ebf2acd02fc5 -r 8816ebf0a103 configs/example/fs.py
--- a/configs/example/fs.py	Thu Oct 06 21:06:00 2016 -0400
+++ b/configs/example/fs.py	Fri Oct 07 18:29:15 2016 +0100
@@ -51,10 +51,8 @@
 
 addToPath('../common')
 addToPath('../ruby')
-addToPath('../network')
 
 import Ruby
-import Network
 
 from FSConfig import *
 from SysPaths import *
@@ -308,7 +306,6 @@
 # Add the ruby specific and protocol specific options
 if '--ruby' in sys.argv:
     Ruby.define_options(parser)
-    Network.define_options(parser)
 
 (options, args) = parser.parse_args()
 
diff -r ebf2acd02fc5 -r 8816ebf0a103 configs/example/garnet_synth_traffic.py
--- a/configs/example/garnet_synth_traffic.py	Thu Oct 06 21:06:00 2016 -0400
+++ b/configs/example/garnet_synth_traffic.py	Fri Oct 07 18:29:15 2016 +0100
@@ -33,12 +33,9 @@
 import os, optparse, sys
 addToPath('../common')
 addToPath('../ruby')
-addToPath('../network')
-addToPath('../topologies')
 
 import Options
 import Ruby
-import Network
 
 # Get paths we might need.  It's expected this file is in m5/configs/example.
 config_path = os.path.dirname(os.path.abspath(__file__))
@@ -87,7 +84,6 @@
 # Add the ruby specific and protocol specific options
 #
 Ruby.define_options(parser)
-Network.define_options(parser)
 
 execfile(os.path.join(config_root, "common", "Options.py"))
 
diff -r ebf2acd02fc5 -r 8816ebf0a103 configs/example/ruby_direct_test.py
--- a/configs/example/ruby_direct_test.py	Thu Oct 06 21:06:00 2016 -0400
+++ b/configs/example/ruby_direct_test.py	Fri Oct 07 18:29:15 2016 +0100
@@ -35,12 +35,9 @@
 import os, optparse, sys
 addToPath('../common')
 addToPath('../ruby')
-addToPath('../network')
-addToPath('../topologies')
 
 import Options
 import Ruby
-import Network
 
 # Get paths we might need.  It's expected this file is in m5/configs/example.
 config_path = os.path.dirname(os.path.abspath(__file__))
@@ -65,7 +62,6 @@
 # Add the ruby specific and protocol specific options
 #
 Ruby.define_options(parser)
-Network.define_options(parser)
 (options, args) = parser.parse_args()
 
 if args:
diff -r ebf2acd02fc5 -r 8816ebf0a103 configs/example/ruby_gpu_random_test.py
--- a/configs/example/ruby_gpu_random_test.py	Thu Oct 06 21:06:00 2016 -0400
+++ b/configs/example/ruby_gpu_random_test.py	Fri Oct 07 18:29:15 2016 +0100
@@ -40,12 +40,9 @@
 import os, optparse, sys
 addToPath('../common')
 addToPath('../ruby')
-addToPath('../network')
-addToPath('../topologies')
 
 import Options
 import Ruby
-import Network
 
 # Get paths we might need.
 config_path = os.path.dirname(os.path.abspath(__file__))
@@ -78,7 +75,6 @@
 # Add the ruby specific and protocol specific options
 #
 Ruby.define_options(parser)
-Network.define_options(parser)
 
 execfile(os.path.join(config_root, "common", "Options.py"))
 
diff -r ebf2acd02fc5 -r 8816ebf0a103 configs/example/ruby_mem_test.py
--- a/configs/example/ruby_mem_test.py	Thu Oct 06 21:06:00 2016 -0400
+++ b/configs/example/ruby_mem_test.py	Fri Oct 07 18:29:15 2016 +0100
@@ -35,12 +35,9 @@
 import os, optparse, sys
 addToPath('../common')
 addToPath('../ruby')
-addToPath('../network')
-addToPath('../topologies')
 
 import Options
 import Ruby
-import Network
 
 # Get paths we might need.  It's expected this file is in m5/configs/example.
 config_path = os.path.dirname(os.path.abspath(__file__))
@@ -65,7 +62,6 @@
 # Add the ruby specific and protocol specific options
 #
 Ruby.define_options(parser)
-Network.define_options(parser)
 
 execfile(os.path.join(config_root, "common", "Options.py"))
 
diff -r ebf2acd02fc5 -r 8816ebf0a103 configs/example/ruby_random_test.py
--- a/configs/example/ruby_random_test.py	Thu Oct 06 21:06:00 2016 -0400
+++ b/configs/example/ruby_random_test.py	Fri Oct 07 18:29:15 2016 +0100
@@ -35,12 +35,9 @@
 import os, optparse, sys
 addToPath('../common')
 addToPath('../ruby')
-addToPath('../network')
-addToPath('../topologies')
 
 import Options
 import Ruby
-import Network
 
 # Get paths we might need.  It's expected this file is in m5/configs/example.
 config_path = os.path.dirname(os.path.abspath(__file__))
@@ -59,7 +56,6 @@
 # Add the ruby specific and protocol specific options
 #
 Ruby.define_options(parser)
-Network.define_options(parser)
 
 execfile(os.path.join(config_root, "common", "Options.py"))
 
diff -r ebf2acd02fc5 -r 8816ebf0a103 configs/example/se.py
--- a/configs/example/se.py	Thu Oct 06 21:06:00 2016 -0400
+++ b/configs/example/se.py	Fri Oct 07 18:29:15 2016 +0100
@@ -53,11 +53,9 @@
 
 addToPath('../common')
 addToPath('../ruby')
-addToPath('../network')
 
 import Options
 import Ruby
-import Network
 import Simulation
 import CacheConfig
 import CpuConfig
@@ -129,7 +127,6 @@
 
 if '--ruby' in sys.argv:
     Ruby.define_options(parser)
-    Network.define_options(parser)
 
 (options, args) = parser.parse_args()
 
diff -r ebf2acd02fc5 -r 8816ebf0a103 configs/ruby/Ruby.py
--- a/configs/ruby/Ruby.py	Thu Oct 06 21:06:00 2016 -0400
+++ b/configs/ruby/Ruby.py	Fri Oct 07 18:29:15 2016 +0100
@@ -46,8 +46,8 @@
 from m5.util import addToPath, fatal
 
 import MemConfig
-addToPath('../topologies')
-addToPath('../network')
+addToPath('../configs/topologies')
+addToPath('../configs/network')
 
 import Network
 
@@ -80,6 +80,7 @@
     protocol = buildEnv['PROTOCOL']
     exec "import %s" % protocol
     eval("%s.define_options(parser)" % protocol)
+    Network.define_options(parser)
 
 def setup_memory_controllers(system, ruby, dir_cntrls, options):
     ruby.block_size_bytes = options.cacheline_size