diff --git a/spec/classes/foreman_plugin_abrt_spec.rb b/spec/classes/plugin/abrt_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_abrt_spec.rb
rename to spec/classes/plugin/abrt_spec.rb
diff --git a/spec/classes/foreman_plugin_ansible_spec.rb b/spec/classes/plugin/ansible_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_ansible_spec.rb
rename to spec/classes/plugin/ansible_spec.rb
diff --git a/spec/classes/foreman_plugin_azure_spec.rb b/spec/classes/plugin/azure_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_azure_spec.rb
rename to spec/classes/plugin/azure_spec.rb
diff --git a/spec/classes/foreman_plugin_bootdisk_spec.rb b/spec/classes/plugin/bootdisk_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_bootdisk_spec.rb
rename to spec/classes/plugin/bootdisk_spec.rb
diff --git a/spec/classes/foreman_plugin_chef_spec.rb b/spec/classes/plugin/chef_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_chef_spec.rb
rename to spec/classes/plugin/chef_spec.rb
diff --git a/spec/classes/foreman_plugin_cockpit_spec.rb b/spec/classes/plugin/cockpit_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_cockpit_spec.rb
rename to spec/classes/plugin/cockpit_spec.rb
diff --git a/spec/classes/foreman_plugin_default_hostgroup_spec.rb b/spec/classes/plugin/default_hostgroup_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_default_hostgroup_spec.rb
rename to spec/classes/plugin/default_hostgroup_spec.rb
diff --git a/spec/classes/foreman_plugin_dhcp_browser_spec.rb b/spec/classes/plugin/dhcp_browser_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_dhcp_browser_spec.rb
rename to spec/classes/plugin/dhcp_browser_spec.rb
diff --git a/spec/classes/foreman_plugin_digitalocean_spec.rb b/spec/classes/plugin/digitalocean_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_digitalocean_spec.rb
rename to spec/classes/plugin/digitalocean_spec.rb
diff --git a/spec/classes/foreman_plugin_discovery_spec.rb b/spec/classes/plugin/discovery_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_discovery_spec.rb
rename to spec/classes/plugin/discovery_spec.rb
diff --git a/spec/classes/foreman_plugin_docker_spec.rb b/spec/classes/plugin/docker_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_docker_spec.rb
rename to spec/classes/plugin/docker_spec.rb
diff --git a/spec/classes/foreman_plugin_expire_hosts_spec.rb b/spec/classes/plugin/expire_hosts_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_expire_hosts_spec.rb
rename to spec/classes/plugin/expire_hosts_spec.rb
diff --git a/spec/classes/foreman_plugin_hooks_spec.rb b/spec/classes/plugin/hooks_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_hooks_spec.rb
rename to spec/classes/plugin/hooks_spec.rb
diff --git a/spec/classes/foreman_plugin_host_extra_validator_spec.rb b/spec/classes/plugin/host_extra_validator_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_host_extra_validator_spec.rb
rename to spec/classes/plugin/host_extra_validator_spec.rb
diff --git a/spec/classes/foreman_plugin_memcache_spec.rb b/spec/classes/plugin/memcache_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_memcache_spec.rb
rename to spec/classes/plugin/memcache_spec.rb
diff --git a/spec/classes/foreman_plugin_monitoring_spec.rb b/spec/classes/plugin/monitoring_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_monitoring_spec.rb
rename to spec/classes/plugin/monitoring_spec.rb
diff --git a/spec/classes/foreman_plugin_omaha_spec.rb b/spec/classes/plugin/omaha_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_omaha_spec.rb
rename to spec/classes/plugin/omaha_spec.rb
diff --git a/spec/classes/foreman_plugin_openscap_spec.rb b/spec/classes/plugin/openscap_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_openscap_spec.rb
rename to spec/classes/plugin/openscap_spec.rb
diff --git a/spec/classes/foreman_plugin_ovirt_provision_spec.rb b/spec/classes/plugin/ovirt_provision_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_ovirt_provision_spec.rb
rename to spec/classes/plugin/ovirt_provision_spec.rb
diff --git a/spec/classes/foreman_plugin_puppetdb_spec.rb b/spec/classes/plugin/puppetdb_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_puppetdb_spec.rb
rename to spec/classes/plugin/puppetdb_spec.rb
diff --git a/spec/classes/foreman_plugin_remote_execution_spec.rb b/spec/classes/plugin/remote_execution_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_remote_execution_spec.rb
rename to spec/classes/plugin/remote_execution_spec.rb
diff --git a/spec/classes/foreman_plugin_salt_spec.rb b/spec/classes/plugin/salt_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_salt_spec.rb
rename to spec/classes/plugin/salt_spec.rb
diff --git a/spec/classes/foreman_plugin_setup_spec.rb b/spec/classes/plugin/setup_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_setup_spec.rb
rename to spec/classes/plugin/setup_spec.rb
diff --git a/spec/classes/foreman_plugin_tasks_spec.rb b/spec/classes/plugin/tasks_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_tasks_spec.rb
rename to spec/classes/plugin/tasks_spec.rb
diff --git a/spec/classes/foreman_plugin_templates_spec.rb b/spec/classes/plugin/templates_spec.rb
similarity index 100%
rename from spec/classes/foreman_plugin_templates_spec.rb
rename to spec/classes/plugin/templates_spec.rb