diff --git a/msfdb_helpers/db_interface.rb b/lib/msfdb_helpers/db_interface.rb
similarity index 100%
rename from msfdb_helpers/db_interface.rb
rename to lib/msfdb_helpers/db_interface.rb
diff --git a/msfdb_helpers/pg_ctl.rb b/lib/msfdb_helpers/pg_ctl.rb
similarity index 98%
rename from msfdb_helpers/pg_ctl.rb
rename to lib/msfdb_helpers/pg_ctl.rb
index 7479e1ea25..3531a848bd 100644
--- a/msfdb_helpers/pg_ctl.rb
+++ b/lib/msfdb_helpers/pg_ctl.rb
@@ -1,4 +1,4 @@
-require_relative 'db_interface'
+require 'msfdb_helpers/db_interface'
 
 class PgCtl < DbInterface
 
diff --git a/msfdb_helpers/pg_ctlcluster.rb b/lib/msfdb_helpers/pg_ctlcluster.rb
similarity index 99%
rename from msfdb_helpers/pg_ctlcluster.rb
rename to lib/msfdb_helpers/pg_ctlcluster.rb
index e26c4e3955..54de3f63d6 100644
--- a/msfdb_helpers/pg_ctlcluster.rb
+++ b/lib/msfdb_helpers/pg_ctlcluster.rb
@@ -1,4 +1,4 @@
-require_relative 'db_interface'
+require 'msfdb_helpers/db_interface'
 
 class PgCtlcluster < DbInterface
 
diff --git a/msfdb b/msfdb
index 2fdd4823f6..036b433975 100755
--- a/msfdb
+++ b/msfdb
@@ -13,8 +13,6 @@ require 'securerandom'
 require 'uri'
 require 'yaml'
 require 'pg'
-require_relative 'msfdb_helpers/pg_ctlcluster'
-require_relative 'msfdb_helpers/pg_ctl'
 
 
 include Rex::Text::Color
@@ -27,6 +25,9 @@ end
 $:.unshift(File.expand_path(File.join(File.dirname(msfbase), 'lib')))
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
+require 'msfdb_helpers/pg_ctlcluster'
+require 'msfdb_helpers/pg_ctl'
+
 require 'msfenv'
 
 @script_name = File.basename(__FILE__)