diff --git a/lib/risc/instruction.rb b/lib/risc/instruction.rb
index 5befdba2..2b74c367 100644
--- a/lib/risc/instruction.rb
+++ b/lib/risc/instruction.rb
@@ -1,4 +1,4 @@
-require "common/list"
+require "util/list"
 
 module Risc
 
diff --git a/lib/risc/interpreter.rb b/lib/risc/interpreter.rb
index 8147f0e2..411bf417 100644
--- a/lib/risc/interpreter.rb
+++ b/lib/risc/interpreter.rb
@@ -1,5 +1,4 @@
-
-require_relative "eventable"
+require "util/eventable"
 
 module Risc
 
diff --git a/lib/rubyx.rb b/lib/rubyx.rb
index 4995fff9..b85181b1 100644
--- a/lib/rubyx.rb
+++ b/lib/rubyx.rb
@@ -14,6 +14,5 @@ require_relative "elf/object_writer"
 require_relative "risc"
 require_relative "arm/arm_machine"
 require_relative "arm/translator"
-require_relative "common/list"
 require_relative "vool/vool_compiler"
 require_relative "mom/mom"
diff --git a/lib/risc/eventable.rb b/lib/util/eventable.rb
similarity index 100%
rename from lib/risc/eventable.rb
rename to lib/util/eventable.rb
diff --git a/lib/common/list.rb b/lib/util/list.rb
similarity index 100%
rename from lib/common/list.rb
rename to lib/util/list.rb