diff --git a/arbiter/NthLsbDetector.vhdl b/router/NthLsbDetector.vhdl
similarity index 100%
rename from arbiter/NthLsbDetector.vhdl
rename to router/NthLsbDetector.vhdl
diff --git a/arbiter/arbiter.vhdl b/router/arbiter.vhdl
similarity index 99%
rename from arbiter/arbiter.vhdl
rename to router/arbiter.vhdl
index 7e6049a..8e36a9b 100644
--- a/arbiter/arbiter.vhdl
+++ b/router/arbiter.vhdl
@@ -2,7 +2,7 @@ library ieee;
 use ieee.std_logic_1164.all;
 use ieee.numeric_std.all;
 use work.router_types.all;
-use work.arbiter_functions.all;
+use work.routing_functions.all;
 
 entity arbiter is
 generic(
diff --git a/arbiter/arbiter_unit.vhdl b/router/arbiter_unit.vhdl
similarity index 100%
rename from arbiter/arbiter_unit.vhdl
rename to router/arbiter_unit.vhdl
diff --git a/arbiter/parent_arbiter.vhdl b/router/parent_arbiter.vhdl
similarity index 99%
rename from arbiter/parent_arbiter.vhdl
rename to router/parent_arbiter.vhdl
index 2a337fd..f09d077 100644
--- a/arbiter/parent_arbiter.vhdl
+++ b/router/parent_arbiter.vhdl
@@ -2,7 +2,7 @@ library ieee;
 use ieee.std_logic_1164.all;
 use ieee.numeric_std.all;
 use work.router_types.all;
-use work.arbiter_functions.all;
+use work.routing_functions.all;
 
 entity parent_arbiter is
 generic(
diff --git a/arbiter/arbiter_functions.vhdl b/router/routing_functions.vhdl
similarity index 98%
rename from arbiter/arbiter_functions.vhdl
rename to router/routing_functions.vhdl
index 29d4293..9cf0379 100644
--- a/arbiter/arbiter_functions.vhdl
+++ b/router/routing_functions.vhdl
@@ -4,7 +4,7 @@ use ieee.numeric_std.all;
 
 use work.router_types.all;
 
-package arbiter_functions is
+package routing_functions is
     function single_packet_rout_dir_det (
         level         :   in integer; 
         pack_dest     :   in t_pos_addr; 
@@ -21,7 +21,7 @@ package arbiter_functions is
     ) return std_logic_vector;
 end package;
 
-package body arbiter_functions is
+package body routing_functions is
     function single_packet_parent_rout_dir_det(
         level         :   in integer; 
         pack_dest     :   in t_pos_addr;