diff --git a/plugins/mysql_schema_size_/mysql-schema-size b/plugins/mysql/mysql-schema-size
similarity index 100%
rename from plugins/mysql_schema_size_/mysql-schema-size
rename to plugins/mysql/mysql-schema-size
diff --git a/plugins/mysql_table_size_/mysql-table-size b/plugins/mysql/mysql-table-size
similarity index 100%
rename from plugins/mysql_table_size_/mysql-table-size
rename to plugins/mysql/mysql-table-size
diff --git a/plugins/print/printer-ink-levels-by-percent b/plugins/printer/printer-ink-levels-by-percent
similarity index 100%
rename from plugins/print/printer-ink-levels-by-percent
rename to plugins/printer/printer-ink-levels-by-percent
diff --git a/plugins/printers/xerox-wc3220 b/plugins/printer/xerox-wc3220
similarity index 100%
rename from plugins/printers/xerox-wc3220
rename to plugins/printer/xerox-wc3220
diff --git a/plugins/printers/xerox-wc7232-consumables b/plugins/printer/xerox-wc7232-consumables
similarity index 100%
rename from plugins/printers/xerox-wc7232-consumables
rename to plugins/printer/xerox-wc7232-consumables