diff --git a/lib/slot_machine/instruction/constant_slot.rb b/lib/slot_machine/constant_slot.rb
similarity index 100%
rename from lib/slot_machine/instruction/constant_slot.rb
rename to lib/slot_machine/constant_slot.rb
diff --git a/lib/slot_machine/instruction/slot_load.rb b/lib/slot_machine/instruction/slot_load.rb
index 8734c3ac..f0d5a2eb 100644
--- a/lib/slot_machine/instruction/slot_load.rb
+++ b/lib/slot_machine/instruction/slot_load.rb
@@ -54,7 +54,3 @@ module SlotMachine
   end
 
 end
-require_relative "slot"
-require_relative "message_slot"
-require_relative "constant_slot"
-require_relative "object_slot"
diff --git a/lib/slot_machine/instruction/message_slot.rb b/lib/slot_machine/message_slot.rb
similarity index 100%
rename from lib/slot_machine/instruction/message_slot.rb
rename to lib/slot_machine/message_slot.rb
diff --git a/lib/slot_machine/instruction/object_slot.rb b/lib/slot_machine/object_slot.rb
similarity index 100%
rename from lib/slot_machine/instruction/object_slot.rb
rename to lib/slot_machine/object_slot.rb
diff --git a/lib/slot_machine/instruction/slot.rb b/lib/slot_machine/slot.rb
similarity index 100%
rename from lib/slot_machine/instruction/slot.rb
rename to lib/slot_machine/slot.rb
diff --git a/lib/slot_machine/slot_machine.rb b/lib/slot_machine/slot_machine.rb
index 22bc0223..4464c5aa 100644
--- a/lib/slot_machine/slot_machine.rb
+++ b/lib/slot_machine/slot_machine.rb
@@ -12,7 +12,11 @@
 # Machine capabilities (instructions) for basic operations.
 # Use of macros for higher level.
 
-require_relative "instruction.rb"
+require_relative "slot"
+require_relative "message_slot"
+require_relative "constant_slot"
+require_relative "object_slot"
+require_relative "instruction"
 require_relative "slot_collection"
 require_relative "callable_compiler"
 require_relative "method_compiler"
diff --git a/test/slot_machine/instruction/test_constant_slot.rb b/test/slot_machine/test_constant_slot.rb
similarity index 100%
rename from test/slot_machine/instruction/test_constant_slot.rb
rename to test/slot_machine/test_constant_slot.rb
diff --git a/test/slot_machine/instruction/test_message_slot.rb b/test/slot_machine/test_message_slot.rb
similarity index 100%
rename from test/slot_machine/instruction/test_message_slot.rb
rename to test/slot_machine/test_message_slot.rb
diff --git a/test/slot_machine/instruction/test_slot.rb b/test/slot_machine/test_slot.rb
similarity index 100%
rename from test/slot_machine/instruction/test_slot.rb
rename to test/slot_machine/test_slot.rb
diff --git a/test/slot_machine/instruction/test_slot2.rb b/test/slot_machine/test_slot2.rb
similarity index 100%
rename from test/slot_machine/instruction/test_slot2.rb
rename to test/slot_machine/test_slot2.rb