diff --git a/.reek b/.reek
index 0f1b605f..0e19c9f4 100644
--- a/.reek
+++ b/.reek
@@ -7,20 +7,24 @@ DuplicateMethodCall:
 FeatureEnvy:
   exclude:
     - "Register::Interpreter"
+    - "Register::Assembler"
     - "Arm::Translator"
     - "Vm::ToCode"
 TooManyMethods:
   exclude:
     - "Register::Interpreter"
+    - "Register::Assembler"
     - "Arm::Translator"
     - "Vm::ToCode"
 UtilityFunction:
   exclude:
     - "Register::Interpreter"
+    - "Register::Assembler"
     - "Arm::Translator"
     - "Vm::ToCode"
 UncommunicativeMethodName:
   exclude:
+    - "Register::Assembler"
     - "Register::Interpreter"
     - "Arm::Translator"
     - "Vm::ToCode"
diff --git a/lib/vm/parfait.rb b/lib/parfait.rb
similarity index 100%
rename from lib/vm/parfait.rb
rename to lib/parfait.rb
diff --git a/lib/vm/parfait/README.md b/lib/parfait/README.md
similarity index 100%
rename from lib/vm/parfait/README.md
rename to lib/parfait/README.md
diff --git a/lib/vm/parfait/behaviour.rb b/lib/parfait/behaviour.rb
similarity index 100%
rename from lib/vm/parfait/behaviour.rb
rename to lib/parfait/behaviour.rb
diff --git a/lib/vm/parfait/binary_code.rb b/lib/parfait/binary_code.rb
similarity index 100%
rename from lib/vm/parfait/binary_code.rb
rename to lib/parfait/binary_code.rb
diff --git a/lib/vm/parfait/class.rb b/lib/parfait/class.rb
similarity index 100%
rename from lib/vm/parfait/class.rb
rename to lib/parfait/class.rb
diff --git a/lib/vm/parfait/dictionary.rb b/lib/parfait/dictionary.rb
similarity index 100%
rename from lib/vm/parfait/dictionary.rb
rename to lib/parfait/dictionary.rb
diff --git a/lib/vm/parfait/integer.rb b/lib/parfait/integer.rb
similarity index 100%
rename from lib/vm/parfait/integer.rb
rename to lib/parfait/integer.rb
diff --git a/lib/vm/parfait/list.rb b/lib/parfait/list.rb
similarity index 100%
rename from lib/vm/parfait/list.rb
rename to lib/parfait/list.rb
diff --git a/lib/vm/parfait/message.rb b/lib/parfait/message.rb
similarity index 100%
rename from lib/vm/parfait/message.rb
rename to lib/parfait/message.rb
diff --git a/lib/vm/parfait/named_list.rb b/lib/parfait/named_list.rb
similarity index 100%
rename from lib/vm/parfait/named_list.rb
rename to lib/parfait/named_list.rb
diff --git a/lib/vm/parfait/object.rb b/lib/parfait/object.rb
similarity index 100%
rename from lib/vm/parfait/object.rb
rename to lib/parfait/object.rb
diff --git a/lib/vm/parfait/page.rb b/lib/parfait/page.rb
similarity index 100%
rename from lib/vm/parfait/page.rb
rename to lib/parfait/page.rb
diff --git a/lib/vm/parfait/space.rb b/lib/parfait/space.rb
similarity index 100%
rename from lib/vm/parfait/space.rb
rename to lib/parfait/space.rb
diff --git a/lib/vm/parfait/symbol_adapter.rb b/lib/parfait/symbol_adapter.rb
similarity index 100%
rename from lib/vm/parfait/symbol_adapter.rb
rename to lib/parfait/symbol_adapter.rb
diff --git a/lib/vm/parfait/type.rb b/lib/parfait/type.rb
similarity index 100%
rename from lib/vm/parfait/type.rb
rename to lib/parfait/type.rb
diff --git a/lib/vm/parfait/typed_method.rb b/lib/parfait/typed_method.rb
similarity index 100%
rename from lib/vm/parfait/typed_method.rb
rename to lib/parfait/typed_method.rb
diff --git a/lib/vm/parfait/word.rb b/lib/parfait/word.rb
similarity index 100%
rename from lib/vm/parfait/word.rb
rename to lib/parfait/word.rb
diff --git a/lib/register.rb b/lib/register.rb
index 784660a0..b98c29df 100644
--- a/lib/register.rb
+++ b/lib/register.rb
@@ -9,7 +9,7 @@ require "register/padding"
 require "register/positioned"
 require "vm"
 
-require "vm/parfait"
+require "parfait"
 require "register/machine"
 
 class Fixnum
diff --git a/test/vm/parfait/test_all.rb b/test/parfait/test_all.rb
similarity index 100%
rename from test/vm/parfait/test_all.rb
rename to test/parfait/test_all.rb
diff --git a/test/vm/parfait/test_attributes.rb b/test/parfait/test_attributes.rb
similarity index 100%
rename from test/vm/parfait/test_attributes.rb
rename to test/parfait/test_attributes.rb
diff --git a/test/vm/parfait/test_class.rb b/test/parfait/test_class.rb
similarity index 100%
rename from test/vm/parfait/test_class.rb
rename to test/parfait/test_class.rb
diff --git a/test/vm/parfait/test_dictionary.rb b/test/parfait/test_dictionary.rb
similarity index 100%
rename from test/vm/parfait/test_dictionary.rb
rename to test/parfait/test_dictionary.rb
diff --git a/test/vm/parfait/test_list.rb b/test/parfait/test_list.rb
similarity index 100%
rename from test/vm/parfait/test_list.rb
rename to test/parfait/test_list.rb
diff --git a/test/vm/parfait/test_message.rb b/test/parfait/test_message.rb
similarity index 100%
rename from test/vm/parfait/test_message.rb
rename to test/parfait/test_message.rb
diff --git a/test/vm/parfait/test_named_list.rb b/test/parfait/test_named_list.rb
similarity index 100%
rename from test/vm/parfait/test_named_list.rb
rename to test/parfait/test_named_list.rb
diff --git a/test/vm/parfait/test_object.rb b/test/parfait/test_object.rb
similarity index 100%
rename from test/vm/parfait/test_object.rb
rename to test/parfait/test_object.rb
diff --git a/test/vm/parfait/test_space.rb b/test/parfait/test_space.rb
similarity index 100%
rename from test/vm/parfait/test_space.rb
rename to test/parfait/test_space.rb
diff --git a/test/vm/parfait/test_typed_method.rb b/test/parfait/test_typed_method.rb
similarity index 100%
rename from test/vm/parfait/test_typed_method.rb
rename to test/parfait/test_typed_method.rb
diff --git a/test/vm/parfait/test_word.rb b/test/parfait/test_word.rb
similarity index 100%
rename from test/vm/parfait/test_word.rb
rename to test/parfait/test_word.rb
diff --git a/test/test_all.rb b/test/test_all.rb
index 227f3e92..b2b1f58f 100644
--- a/test/test_all.rb
+++ b/test/test_all.rb
@@ -6,6 +6,8 @@ require_relative "lib/test_all"
 
 require_relative "rubyx/test_all"
 
+require_relative "parfait/test_all"
+
 require_relative "register/test_all"
 
 require_relative "vm/test_all"
diff --git a/test/vm/test_all.rb b/test/vm/test_all.rb
index 2b12b39d..1f7995ac 100644
--- a/test/vm/test_all.rb
+++ b/test/vm/test_all.rb
@@ -1,5 +1,3 @@
-require_relative "parfait/test_all"
-
 require_relative "type/test_all"
 
 require_relative "method_compiler/test_all"