diff --git a/setup.cfg b/setup.cfg
index 221763f26..6ddb8753c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,18 +1,19 @@
 [metadata]
 name = tripleo-ansible
-summary = TripleO Ansible - Ansible playbooks for the TripleO project.
+summary = Ansible assets for the TripleO project.
 description-file =
     README.rst
-author = TripleO Team
-author-email = jillr@redhat.com
+
+author = OpenStack
+author-email = openstack-discuss@lists.openstack.org
 home-page = https://opendev.org/openstack/tripleo-ansible
 classifier =
-  License :: OSI Approved :: Apache Software License
-  Development Status :: 4 - Beta
-  Intended Audience :: Developers
-  Intended Audience :: System Administrators
-  Intended Audience :: Information Technology
-  Topic :: Utilities
+    License :: OSI Approved :: Apache Software License
+    Development Status :: 4 - Beta
+    Intended Audience :: Developers
+    Intended Audience :: System Administrators
+    Intended Audience :: Information Technology
+    Topic :: Utilities
 
 [global]
 setup-hooks =
@@ -20,12 +21,13 @@ setup-hooks =
 
 [files]
 data_files =
-    share/ansible/tripleo-ansible/ = tripleo_ansible/*
+    share/ansible/tripleo-ansible/ = tripleo_ansible/playbooks/*
+    share/ansible/plugins/ = tripleo_ansible/ansible_plugins/*
+    share/ansible/roles/ = tripleo_ansible/roles/*
 
 [wheel]
 universal = 1
 
 [pbr]
 skip_authors = True
-skip_changelog = True
-
+skip_changelog = True
\ No newline at end of file
diff --git a/tripleo_ansible/ansible_plugins/action/.gitkeep b/tripleo_ansible/ansible_plugins/action/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/tripleo_ansible/ansible_plugins/callback/.gitkeep b/tripleo_ansible/ansible_plugins/callback/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/tripleo_ansible/ansible_plugins/filter/.gitkeep b/tripleo_ansible/ansible_plugins/filter/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/tripleo_ansible/ansible_plugins/module_utils/.gitkeep b/tripleo_ansible/ansible_plugins/module_utils/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/tripleo_ansible/library/podman_container.py b/tripleo_ansible/ansible_plugins/modules/podman_container.py
similarity index 100%
rename from tripleo_ansible/library/podman_container.py
rename to tripleo_ansible/ansible_plugins/modules/podman_container.py
diff --git a/tripleo_ansible/library/podman_image.py b/tripleo_ansible/ansible_plugins/modules/podman_image.py
similarity index 100%
rename from tripleo_ansible/library/podman_image.py
rename to tripleo_ansible/ansible_plugins/modules/podman_image.py
diff --git a/tripleo_ansible/library/podman_image_facts.py b/tripleo_ansible/ansible_plugins/modules/podman_image_facts.py
similarity index 100%
rename from tripleo_ansible/library/podman_image_facts.py
rename to tripleo_ansible/ansible_plugins/modules/podman_image_facts.py
diff --git a/tripleo_ansible/container-cleanup.yml b/tripleo_ansible/playbooks/container-cleanup.yml
similarity index 100%
rename from tripleo_ansible/container-cleanup.yml
rename to tripleo_ansible/playbooks/container-cleanup.yml
diff --git a/tripleo_ansible/fetch-logs.yml b/tripleo_ansible/playbooks/fetch-logs.yml
similarity index 100%
rename from tripleo_ansible/fetch-logs.yml
rename to tripleo_ansible/playbooks/fetch-logs.yml
diff --git a/tripleo_ansible/playbooks/group_vars/.gitkeep b/tripleo_ansible/playbooks/group_vars/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/tripleo_ansible/playbooks/host_vars/.gitkeep b/tripleo_ansible/playbooks/host_vars/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/tripleo_ansible/restart-service.yml b/tripleo_ansible/playbooks/restart-service.yml
similarity index 100%
rename from tripleo_ansible/restart-service.yml
rename to tripleo_ansible/playbooks/restart-service.yml
diff --git a/tripleo_ansible/roles/.gitkeep b/tripleo_ansible/roles/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index c9857acf4..2b85502a8 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -1,5 +1,4 @@
 ---
-
 - project:
     check:
       jobs: