diff --git a/tool/checksum.rb b/tool/checksum.rb
index 3b41aedcfc..bcc60ee14a 100755
--- a/tool/checksum.rb
+++ b/tool/checksum.rb
@@ -1,6 +1,6 @@
 #!ruby
 
-require_relative 'vpath'
+require_relative 'lib/vpath'
 
 class Checksum
   def initialize(vpath)
diff --git a/tool/generic_erb.rb b/tool/generic_erb.rb
index 3184cbb9f8..eaafe0c7a5 100644
--- a/tool/generic_erb.rb
+++ b/tool/generic_erb.rb
@@ -6,7 +6,7 @@
 require 'erb'
 require 'optparse'
 $:.unshift(File.dirname(__FILE__))
-require 'vpath'
+require_relative 'lib/vpath'
 require_relative 'lib/colorize'
 
 vpath = VPath.new
diff --git a/tool/id2token.rb b/tool/id2token.rb
index 706154ecfb..9267126e8f 100755
--- a/tool/id2token.rb
+++ b/tool/id2token.rb
@@ -6,7 +6,7 @@
 BEGIN {
   require 'optparse'
   $:.unshift(File.dirname(__FILE__))
-  require 'vpath'
+  require_relative 'lib/vpath'
   vpath = VPath.new
   header = nil
 
diff --git a/tool/vpath.rb b/tool/lib/vpath.rb
similarity index 100%
rename from tool/vpath.rb
rename to tool/lib/vpath.rb