diff --git a/WebminCore.pm b/WebminCore.pm
index b66a6c7f0..f00abda3b 100644
--- a/WebminCore.pm
+++ b/WebminCore.pm
@@ -12,6 +12,8 @@ Full function documentation is in web-lib-funcs.pl.
 
 =cut
 
+use lib ("$ENV{'PERLLIB'}/vendor_perl");
+
 $main::export_to_caller = 1;
 package WebminCore;
 require Exporter;
diff --git a/filemin/filemin-lib.pl b/filemin/filemin-lib.pl
index 5d0b55be4..563356347 100644
--- a/filemin/filemin-lib.pl
+++ b/filemin/filemin-lib.pl
@@ -4,7 +4,6 @@ BEGIN { push(@INC, ".."); };
 use WebminCore;
 &init_config();
 
-use lib './lib';
 use POSIX;
 use Encode qw(decode encode);
 use File::Basename;
diff --git a/Authen/OATH.pm b/vendor_perl/Authen/OATH.pm
similarity index 100%
rename from Authen/OATH.pm
rename to vendor_perl/Authen/OATH.pm
diff --git a/filemin/lib/File/BaseDir.pm b/vendor_perl/File/BaseDir.pm
similarity index 100%
rename from filemin/lib/File/BaseDir.pm
rename to vendor_perl/File/BaseDir.pm
diff --git a/filemin/lib/File/Basename.pm b/vendor_perl/File/Basename.pm
similarity index 100%
rename from filemin/lib/File/Basename.pm
rename to vendor_perl/File/Basename.pm
diff --git a/filemin/lib/File/MimeInfo.pm b/vendor_perl/File/MimeInfo.pm
similarity index 100%
rename from filemin/lib/File/MimeInfo.pm
rename to vendor_perl/File/MimeInfo.pm
diff --git a/JSON/PP.pm b/vendor_perl/JSON/PP.pm
similarity index 100%
rename from JSON/PP.pm
rename to vendor_perl/JSON/PP.pm
diff --git a/JSON/PP/Boolean.pm b/vendor_perl/JSON/PP/Boolean.pm
similarity index 100%
rename from JSON/PP/Boolean.pm
rename to vendor_perl/JSON/PP/Boolean.pm
diff --git a/xterm/lib/Net/WebSocket/Server.pm b/vendor_perl/Net/WebSocket/Server.pm
similarity index 100%
rename from xterm/lib/Net/WebSocket/Server.pm
rename to vendor_perl/Net/WebSocket/Server.pm
diff --git a/xterm/lib/Net/WebSocket/Server/Connection.pm b/vendor_perl/Net/WebSocket/Server/Connection.pm
similarity index 100%
rename from xterm/lib/Net/WebSocket/Server/Connection.pm
rename to vendor_perl/Net/WebSocket/Server/Connection.pm
diff --git a/xterm/lib/Protocol/WebSocket.pm b/vendor_perl/Protocol/WebSocket.pm
similarity index 100%
rename from xterm/lib/Protocol/WebSocket.pm
rename to vendor_perl/Protocol/WebSocket.pm
diff --git a/xterm/lib/Protocol/WebSocket/Client.pm b/vendor_perl/Protocol/WebSocket/Client.pm
similarity index 100%
rename from xterm/lib/Protocol/WebSocket/Client.pm
rename to vendor_perl/Protocol/WebSocket/Client.pm
diff --git a/xterm/lib/Protocol/WebSocket/Cookie.pm b/vendor_perl/Protocol/WebSocket/Cookie.pm
similarity index 100%
rename from xterm/lib/Protocol/WebSocket/Cookie.pm
rename to vendor_perl/Protocol/WebSocket/Cookie.pm
diff --git a/xterm/lib/Protocol/WebSocket/Cookie/Request.pm b/vendor_perl/Protocol/WebSocket/Cookie/Request.pm
similarity index 100%
rename from xterm/lib/Protocol/WebSocket/Cookie/Request.pm
rename to vendor_perl/Protocol/WebSocket/Cookie/Request.pm
diff --git a/xterm/lib/Protocol/WebSocket/Cookie/Response.pm b/vendor_perl/Protocol/WebSocket/Cookie/Response.pm
similarity index 100%
rename from xterm/lib/Protocol/WebSocket/Cookie/Response.pm
rename to vendor_perl/Protocol/WebSocket/Cookie/Response.pm
diff --git a/xterm/lib/Protocol/WebSocket/Frame.pm b/vendor_perl/Protocol/WebSocket/Frame.pm
similarity index 100%
rename from xterm/lib/Protocol/WebSocket/Frame.pm
rename to vendor_perl/Protocol/WebSocket/Frame.pm
diff --git a/xterm/lib/Protocol/WebSocket/Handshake.pm b/vendor_perl/Protocol/WebSocket/Handshake.pm
similarity index 100%
rename from xterm/lib/Protocol/WebSocket/Handshake.pm
rename to vendor_perl/Protocol/WebSocket/Handshake.pm
diff --git a/xterm/lib/Protocol/WebSocket/Handshake/Client.pm b/vendor_perl/Protocol/WebSocket/Handshake/Client.pm
similarity index 100%
rename from xterm/lib/Protocol/WebSocket/Handshake/Client.pm
rename to vendor_perl/Protocol/WebSocket/Handshake/Client.pm
diff --git a/xterm/lib/Protocol/WebSocket/Handshake/Server.pm b/vendor_perl/Protocol/WebSocket/Handshake/Server.pm
similarity index 100%
rename from xterm/lib/Protocol/WebSocket/Handshake/Server.pm
rename to vendor_perl/Protocol/WebSocket/Handshake/Server.pm
diff --git a/xterm/lib/Protocol/WebSocket/Message.pm b/vendor_perl/Protocol/WebSocket/Message.pm
similarity index 100%
rename from xterm/lib/Protocol/WebSocket/Message.pm
rename to vendor_perl/Protocol/WebSocket/Message.pm
diff --git a/xterm/lib/Protocol/WebSocket/Request.pm b/vendor_perl/Protocol/WebSocket/Request.pm
similarity index 100%
rename from xterm/lib/Protocol/WebSocket/Request.pm
rename to vendor_perl/Protocol/WebSocket/Request.pm
diff --git a/xterm/lib/Protocol/WebSocket/Response.pm b/vendor_perl/Protocol/WebSocket/Response.pm
similarity index 100%
rename from xterm/lib/Protocol/WebSocket/Response.pm
rename to vendor_perl/Protocol/WebSocket/Response.pm
diff --git a/xterm/lib/Protocol/WebSocket/Stateful.pm b/vendor_perl/Protocol/WebSocket/Stateful.pm
similarity index 100%
rename from xterm/lib/Protocol/WebSocket/Stateful.pm
rename to vendor_perl/Protocol/WebSocket/Stateful.pm
diff --git a/xterm/lib/Protocol/WebSocket/URL.pm b/vendor_perl/Protocol/WebSocket/URL.pm
similarity index 100%
rename from xterm/lib/Protocol/WebSocket/URL.pm
rename to vendor_perl/Protocol/WebSocket/URL.pm
diff --git a/xterm/index.cgi b/xterm/index.cgi
index 3d99593e2..4005bdf30 100644
--- a/xterm/index.cgi
+++ b/xterm/index.cgi
@@ -1,8 +1,5 @@
 #!/usr/local/bin/perl
 # Show a terminal that is connected to a Websockets server via Webmin proxying
-
-use lib ("$ENV{'DOCUMENT_ROOT'}/xterm/lib");
-
 require './xterm-lib.pl';
 &ReadParse();
 
diff --git a/xterm/shellserver.pl b/xterm/shellserver.pl
index ea8758a5d..06d92f4f7 100755
--- a/xterm/shellserver.pl
+++ b/xterm/shellserver.pl
@@ -1,7 +1,7 @@
 #!/usr/local/bin/perl
 # Start a websocket server connected to a shell
 
-use lib ("$ENV{'PERLLIB'}/xterm/lib");
+use lib ("$ENV{'PERLLIB'}/vendor_perl");
 use Net::WebSocket::Server;
 use utf8;