diff --git a/avahi/plugins/puppet/parser/functions/avahi_service_port.rb b/avahi/lib/puppet/parser/functions/avahi_service_port.rb
similarity index 100%
rename from avahi/plugins/puppet/parser/functions/avahi_service_port.rb
rename to avahi/lib/puppet/parser/functions/avahi_service_port.rb
diff --git a/backuppc/plugins/facter/backuppc_sshkey.rb b/backuppc/lib/facter/backuppc_sshkey.rb
similarity index 100%
rename from backuppc/plugins/facter/backuppc_sshkey.rb
rename to backuppc/lib/facter/backuppc_sshkey.rb
diff --git a/custom/plugins/facter/console_type.rb b/custom/lib/facter/console_type.rb
similarity index 100%
rename from custom/plugins/facter/console_type.rb
rename to custom/lib/facter/console_type.rb
diff --git a/custom/plugins/facter/puppet_ssldir.rb b/custom/lib/facter/puppet_ssldir.rb
similarity index 100%
rename from custom/plugins/facter/puppet_ssldir.rb
rename to custom/lib/facter/puppet_ssldir.rb
diff --git a/custom/plugins/puppet/provider/service/openbsd.rb b/custom/lib/puppet/provider/service/openbsd.rb
similarity index 100%
rename from custom/plugins/puppet/provider/service/openbsd.rb
rename to custom/lib/puppet/provider/service/openbsd.rb
diff --git a/vmware/plugins/puppet/type/vmware_config.rb b/vmware/lib/puppet/type/vmware_config.rb
similarity index 100%
rename from vmware/plugins/puppet/type/vmware_config.rb
rename to vmware/lib/puppet/type/vmware_config.rb