diff --git a/makedist.pl b/makedist.pl
index 38de92381..44c4e7314 100755
--- a/makedist.pl
+++ b/makedist.pl
@@ -64,7 +64,7 @@ else {
 	close($fh);
 	@mlist = split(/\s+/, $mod_def_list);
 	}
-@dirlist = ( "WebminUI", "vendor_perl" );
+@dirlist = ( "vendor_perl" );
 
 $dir = "webmin-$vers";
 if (!$release || !-d "$tardir/$dir") {
diff --git a/WebminUI/All.pm b/zones/lib/WebminUI/All.pm
similarity index 100%
rename from WebminUI/All.pm
rename to zones/lib/WebminUI/All.pm
diff --git a/WebminUI/Button.pm b/zones/lib/WebminUI/Button.pm
similarity index 100%
rename from WebminUI/Button.pm
rename to zones/lib/WebminUI/Button.pm
diff --git a/WebminUI/Checkbox.pm b/zones/lib/WebminUI/Checkbox.pm
similarity index 100%
rename from WebminUI/Checkbox.pm
rename to zones/lib/WebminUI/Checkbox.pm
diff --git a/WebminUI/Checkboxes.pm b/zones/lib/WebminUI/Checkboxes.pm
similarity index 100%
rename from WebminUI/Checkboxes.pm
rename to zones/lib/WebminUI/Checkboxes.pm
diff --git a/WebminUI/Columns.pm b/zones/lib/WebminUI/Columns.pm
similarity index 100%
rename from WebminUI/Columns.pm
rename to zones/lib/WebminUI/Columns.pm
diff --git a/WebminUI/ConfirmPage.pm b/zones/lib/WebminUI/ConfirmPage.pm
similarity index 100%
rename from WebminUI/ConfirmPage.pm
rename to zones/lib/WebminUI/ConfirmPage.pm
diff --git a/WebminUI/Date.pm b/zones/lib/WebminUI/Date.pm
similarity index 100%
rename from WebminUI/Date.pm
rename to zones/lib/WebminUI/Date.pm
diff --git a/WebminUI/DynamicBar.pm b/zones/lib/WebminUI/DynamicBar.pm
similarity index 100%
rename from WebminUI/DynamicBar.pm
rename to zones/lib/WebminUI/DynamicBar.pm
diff --git a/WebminUI/DynamicHTML.pm b/zones/lib/WebminUI/DynamicHTML.pm
similarity index 100%
rename from WebminUI/DynamicHTML.pm
rename to zones/lib/WebminUI/DynamicHTML.pm
diff --git a/WebminUI/DynamicText.pm b/zones/lib/WebminUI/DynamicText.pm
similarity index 100%
rename from WebminUI/DynamicText.pm
rename to zones/lib/WebminUI/DynamicText.pm
diff --git a/WebminUI/DynamicWait.pm b/zones/lib/WebminUI/DynamicWait.pm
similarity index 100%
rename from WebminUI/DynamicWait.pm
rename to zones/lib/WebminUI/DynamicWait.pm
diff --git a/WebminUI/ErrorPage.pm b/zones/lib/WebminUI/ErrorPage.pm
similarity index 100%
rename from WebminUI/ErrorPage.pm
rename to zones/lib/WebminUI/ErrorPage.pm
diff --git a/WebminUI/File.pm b/zones/lib/WebminUI/File.pm
similarity index 100%
rename from WebminUI/File.pm
rename to zones/lib/WebminUI/File.pm
diff --git a/WebminUI/Form.pm b/zones/lib/WebminUI/Form.pm
similarity index 100%
rename from WebminUI/Form.pm
rename to zones/lib/WebminUI/Form.pm
diff --git a/WebminUI/Group.pm b/zones/lib/WebminUI/Group.pm
similarity index 100%
rename from WebminUI/Group.pm
rename to zones/lib/WebminUI/Group.pm
diff --git a/WebminUI/Icon.pm b/zones/lib/WebminUI/Icon.pm
similarity index 100%
rename from WebminUI/Icon.pm
rename to zones/lib/WebminUI/Icon.pm
diff --git a/WebminUI/Input.pm b/zones/lib/WebminUI/Input.pm
similarity index 100%
rename from WebminUI/Input.pm
rename to zones/lib/WebminUI/Input.pm
diff --git a/WebminUI/InputTable.pm b/zones/lib/WebminUI/InputTable.pm
similarity index 100%
rename from WebminUI/InputTable.pm
rename to zones/lib/WebminUI/InputTable.pm
diff --git a/WebminUI/JavascriptButton.pm b/zones/lib/WebminUI/JavascriptButton.pm
similarity index 100%
rename from WebminUI/JavascriptButton.pm
rename to zones/lib/WebminUI/JavascriptButton.pm
diff --git a/WebminUI/LinkTable.pm b/zones/lib/WebminUI/LinkTable.pm
similarity index 100%
rename from WebminUI/LinkTable.pm
rename to zones/lib/WebminUI/LinkTable.pm
diff --git a/WebminUI/Menu.pm b/zones/lib/WebminUI/Menu.pm
similarity index 100%
rename from WebminUI/Menu.pm
rename to zones/lib/WebminUI/Menu.pm
diff --git a/WebminUI/Multiline.pm b/zones/lib/WebminUI/Multiline.pm
similarity index 100%
rename from WebminUI/Multiline.pm
rename to zones/lib/WebminUI/Multiline.pm
diff --git a/WebminUI/OptTextarea.pm b/zones/lib/WebminUI/OptTextarea.pm
similarity index 100%
rename from WebminUI/OptTextarea.pm
rename to zones/lib/WebminUI/OptTextarea.pm
diff --git a/WebminUI/OptTextbox.pm b/zones/lib/WebminUI/OptTextbox.pm
similarity index 100%
rename from WebminUI/OptTextbox.pm
rename to zones/lib/WebminUI/OptTextbox.pm
diff --git a/WebminUI/Page.pm b/zones/lib/WebminUI/Page.pm
similarity index 100%
rename from WebminUI/Page.pm
rename to zones/lib/WebminUI/Page.pm
diff --git a/WebminUI/Password.pm b/zones/lib/WebminUI/Password.pm
similarity index 100%
rename from WebminUI/Password.pm
rename to zones/lib/WebminUI/Password.pm
diff --git a/WebminUI/PlainText.pm b/zones/lib/WebminUI/PlainText.pm
similarity index 100%
rename from WebminUI/PlainText.pm
rename to zones/lib/WebminUI/PlainText.pm
diff --git a/WebminUI/Properties.pm b/zones/lib/WebminUI/Properties.pm
similarity index 100%
rename from WebminUI/Properties.pm
rename to zones/lib/WebminUI/Properties.pm
diff --git a/WebminUI/Radios.pm b/zones/lib/WebminUI/Radios.pm
similarity index 100%
rename from WebminUI/Radios.pm
rename to zones/lib/WebminUI/Radios.pm
diff --git a/WebminUI/ResultPage.pm b/zones/lib/WebminUI/ResultPage.pm
similarity index 100%
rename from WebminUI/ResultPage.pm
rename to zones/lib/WebminUI/ResultPage.pm
diff --git a/WebminUI/Section.pm b/zones/lib/WebminUI/Section.pm
similarity index 100%
rename from WebminUI/Section.pm
rename to zones/lib/WebminUI/Section.pm
diff --git a/WebminUI/Select.pm b/zones/lib/WebminUI/Select.pm
similarity index 100%
rename from WebminUI/Select.pm
rename to zones/lib/WebminUI/Select.pm
diff --git a/WebminUI/Submit.pm b/zones/lib/WebminUI/Submit.pm
similarity index 100%
rename from WebminUI/Submit.pm
rename to zones/lib/WebminUI/Submit.pm
diff --git a/WebminUI/Table.pm b/zones/lib/WebminUI/Table.pm
similarity index 100%
rename from WebminUI/Table.pm
rename to zones/lib/WebminUI/Table.pm
diff --git a/WebminUI/TableAction.pm b/zones/lib/WebminUI/TableAction.pm
similarity index 100%
rename from WebminUI/TableAction.pm
rename to zones/lib/WebminUI/TableAction.pm
diff --git a/WebminUI/Tabs.pm b/zones/lib/WebminUI/Tabs.pm
similarity index 100%
rename from WebminUI/Tabs.pm
rename to zones/lib/WebminUI/Tabs.pm
diff --git a/WebminUI/Textarea.pm b/zones/lib/WebminUI/Textarea.pm
similarity index 100%
rename from WebminUI/Textarea.pm
rename to zones/lib/WebminUI/Textarea.pm
diff --git a/WebminUI/Textbox.pm b/zones/lib/WebminUI/Textbox.pm
similarity index 100%
rename from WebminUI/Textbox.pm
rename to zones/lib/WebminUI/Textbox.pm
diff --git a/WebminUI/Time.pm b/zones/lib/WebminUI/Time.pm
similarity index 100%
rename from WebminUI/Time.pm
rename to zones/lib/WebminUI/Time.pm
diff --git a/WebminUI/TitleList.pm b/zones/lib/WebminUI/TitleList.pm
similarity index 100%
rename from WebminUI/TitleList.pm
rename to zones/lib/WebminUI/TitleList.pm
diff --git a/WebminUI/Upload.pm b/zones/lib/WebminUI/Upload.pm
similarity index 100%
rename from WebminUI/Upload.pm
rename to zones/lib/WebminUI/Upload.pm
diff --git a/WebminUI/User.pm b/zones/lib/WebminUI/User.pm
similarity index 100%
rename from WebminUI/User.pm
rename to zones/lib/WebminUI/User.pm
diff --git a/zones/zones-lib.pl b/zones/zones-lib.pl
index 89bbbb0f7..740018b82 100755
--- a/zones/zones-lib.pl
+++ b/zones/zones-lib.pl
@@ -3,6 +3,7 @@
 
 BEGIN { push(@INC, ".."); };
 use WebminCore;
+use lib ("lib");
 &init_config();
 &foreign_require("net", "net-lib.pl");
 &foreign_require("mount", "mount-lib.pl");