diff --git a/playbooks/groups/pagure.yml b/playbooks/groups/pagure.yml
index 305e3db68b..b2f31078f6 100644
--- a/playbooks/groups/pagure.yml
+++ b/playbooks/groups/pagure.yml
@@ -42,7 +42,7 @@
    - "{{ vars_path }}/{{ ansible_distribution }}.yml"
 
   roles:
-  - pagure/frontend
+  - pagure
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"
diff --git a/roles/pagure/frontend/files/aliases b/roles/pagure/files/aliases
similarity index 100%
rename from roles/pagure/frontend/files/aliases
rename to roles/pagure/files/aliases
diff --git a/roles/pagure/frontend/files/backup-database b/roles/pagure/files/backup-database
similarity index 100%
rename from roles/pagure/frontend/files/backup-database
rename to roles/pagure/files/backup-database
diff --git a/roles/pagure/frontend/files/hotfix/d3/d3.v3.min.js b/roles/pagure/files/hotfix/d3/d3.v3.min.js
similarity index 100%
rename from roles/pagure/frontend/files/hotfix/d3/d3.v3.min.js
rename to roles/pagure/files/hotfix/d3/d3.v3.min.js
diff --git a/roles/pagure/frontend/files/pagure_ev.service b/roles/pagure/files/pagure_ev.service
similarity index 100%
rename from roles/pagure/frontend/files/pagure_ev.service
rename to roles/pagure/files/pagure_ev.service
diff --git a/roles/pagure/frontend/files/pagure_fast_worker.service b/roles/pagure/files/pagure_fast_worker.service
similarity index 100%
rename from roles/pagure/frontend/files/pagure_fast_worker.service
rename to roles/pagure/files/pagure_fast_worker.service
diff --git a/roles/pagure/frontend/files/pagure_medium_worker.service b/roles/pagure/files/pagure_medium_worker.service
similarity index 100%
rename from roles/pagure/frontend/files/pagure_medium_worker.service
rename to roles/pagure/files/pagure_medium_worker.service
diff --git a/roles/pagure/frontend/files/pagure_mirror.service b/roles/pagure/files/pagure_mirror.service
similarity index 100%
rename from roles/pagure/frontend/files/pagure_mirror.service
rename to roles/pagure/files/pagure_mirror.service
diff --git a/roles/pagure/frontend/files/pagure_sar.py b/roles/pagure/files/pagure_sar.py
similarity index 100%
rename from roles/pagure/frontend/files/pagure_sar.py
rename to roles/pagure/files/pagure_sar.py
diff --git a/roles/pagure/frontend/files/pagure_slow_worker.service b/roles/pagure/files/pagure_slow_worker.service
similarity index 100%
rename from roles/pagure/frontend/files/pagure_slow_worker.service
rename to roles/pagure/files/pagure_slow_worker.service
diff --git a/roles/pagure/frontend/files/pg_hba.conf b/roles/pagure/files/pg_hba.conf
similarity index 100%
rename from roles/pagure/frontend/files/pg_hba.conf
rename to roles/pagure/files/pg_hba.conf
diff --git a/roles/pagure/frontend/files/selinux/pagure.te b/roles/pagure/files/selinux/pagure.te
similarity index 100%
rename from roles/pagure/frontend/files/selinux/pagure.te
rename to roles/pagure/files/selinux/pagure.te
diff --git a/roles/pagure/frontend/files/stunnel.service b/roles/pagure/files/stunnel.service
similarity index 100%
rename from roles/pagure/frontend/files/stunnel.service
rename to roles/pagure/files/stunnel.service
diff --git a/roles/pagure/frontend/files/syslog-logrotate b/roles/pagure/files/syslog-logrotate
similarity index 100%
rename from roles/pagure/frontend/files/syslog-logrotate
rename to roles/pagure/files/syslog-logrotate
diff --git a/roles/pagure/frontend/handlers/main.yml b/roles/pagure/handlers/main.yml
similarity index 100%
rename from roles/pagure/frontend/handlers/main.yml
rename to roles/pagure/handlers/main.yml
diff --git a/roles/pagure/frontend/tasks/main.yml b/roles/pagure/tasks/main.yml
similarity index 100%
rename from roles/pagure/frontend/tasks/main.yml
rename to roles/pagure/tasks/main.yml
diff --git a/roles/pagure/frontend/tasks/selinux.yml b/roles/pagure/tasks/selinux.yml
similarity index 100%
rename from roles/pagure/frontend/tasks/selinux.yml
rename to roles/pagure/tasks/selinux.yml
diff --git a/roles/pagure/frontend/templates/0_pagure.conf b/roles/pagure/templates/0_pagure.conf
similarity index 100%
rename from roles/pagure/frontend/templates/0_pagure.conf
rename to roles/pagure/templates/0_pagure.conf
diff --git a/roles/pagure/frontend/templates/alembic.ini b/roles/pagure/templates/alembic.ini
similarity index 100%
rename from roles/pagure/frontend/templates/alembic.ini
rename to roles/pagure/templates/alembic.ini
diff --git a/roles/pagure/frontend/templates/docs_pagure.wsgi b/roles/pagure/templates/docs_pagure.wsgi
similarity index 100%
rename from roles/pagure/frontend/templates/docs_pagure.wsgi
rename to roles/pagure/templates/docs_pagure.wsgi
diff --git a/roles/pagure/frontend/templates/fedora-messaging.toml b/roles/pagure/templates/fedora-messaging.toml
similarity index 100%
rename from roles/pagure/frontend/templates/fedora-messaging.toml
rename to roles/pagure/templates/fedora-messaging.toml
diff --git a/roles/pagure/frontend/templates/gitolite.rc b/roles/pagure/templates/gitolite.rc
similarity index 100%
rename from roles/pagure/frontend/templates/gitolite.rc
rename to roles/pagure/templates/gitolite.rc
diff --git a/roles/pagure/frontend/templates/pagure.cfg b/roles/pagure/templates/pagure.cfg
similarity index 100%
rename from roles/pagure/frontend/templates/pagure.cfg
rename to roles/pagure/templates/pagure.cfg
diff --git a/roles/pagure/frontend/templates/pagure.wsgi b/roles/pagure/templates/pagure.wsgi
similarity index 100%
rename from roles/pagure/frontend/templates/pagure.wsgi
rename to roles/pagure/templates/pagure.wsgi
diff --git a/roles/pagure/frontend/templates/robots.txt.j2 b/roles/pagure/templates/robots.txt.j2
similarity index 100%
rename from roles/pagure/frontend/templates/robots.txt.j2
rename to roles/pagure/templates/robots.txt.j2
diff --git a/roles/pagure/frontend/templates/securityheaders.conf b/roles/pagure/templates/securityheaders.conf
similarity index 100%
rename from roles/pagure/frontend/templates/securityheaders.conf
rename to roles/pagure/templates/securityheaders.conf
diff --git a/roles/pagure/frontend/templates/stunnel-conf.j2 b/roles/pagure/templates/stunnel-conf.j2
similarity index 100%
rename from roles/pagure/frontend/templates/stunnel-conf.j2
rename to roles/pagure/templates/stunnel-conf.j2