diff --git a/security/sssd2.wtf/Makefile b/security/sssd2/Makefile
similarity index 100%
rename from security/sssd2.wtf/Makefile
rename to security/sssd2/Makefile
diff --git a/security/sssd2.wtf/distinfo b/security/sssd2/distinfo
similarity index 100%
rename from security/sssd2.wtf/distinfo
rename to security/sssd2/distinfo
diff --git a/security/sssd2.wtf/files/bsdnss.c b/security/sssd2/files/bsdnss.c
similarity index 100%
rename from security/sssd2.wtf/files/bsdnss.c
rename to security/sssd2/files/bsdnss.c
diff --git a/security/sssd2.wtf/files/patch-Makefile.am b/security/sssd2/files/patch-Makefile.am
similarity index 100%
rename from security/sssd2.wtf/files/patch-Makefile.am
rename to security/sssd2/files/patch-Makefile.am
diff --git a/security/sssd2.wtf/files/patch-configure.ac b/security/sssd2/files/patch-configure.ac
similarity index 100%
rename from security/sssd2.wtf/files/patch-configure.ac
rename to security/sssd2/files/patch-configure.ac
diff --git a/security/sssd2.wtf/files/patch-src__confdb__confdb.c b/security/sssd2/files/patch-src__confdb__confdb.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__confdb__confdb.c
rename to security/sssd2/files/patch-src__confdb__confdb.c
diff --git a/security/sssd2.wtf/files/patch-src__external__crypto.m4 b/security/sssd2/files/patch-src__external__crypto.m4
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__external__crypto.m4
rename to security/sssd2/files/patch-src__external__crypto.m4
diff --git a/security/sssd2.wtf/files/patch-src__external__inotify.m4 b/security/sssd2/files/patch-src__external__inotify.m4
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__external__inotify.m4
rename to security/sssd2/files/patch-src__external__inotify.m4
diff --git a/security/sssd2.wtf/files/patch-src__external__krb5.m4 b/security/sssd2/files/patch-src__external__krb5.m4
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__external__krb5.m4
rename to security/sssd2/files/patch-src__external__krb5.m4
diff --git a/security/sssd2.wtf/files/patch-src__external__nsupdate.m4 b/security/sssd2/files/patch-src__external__nsupdate.m4
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__external__nsupdate.m4
rename to security/sssd2/files/patch-src__external__nsupdate.m4
diff --git a/security/sssd2.wtf/files/patch-src__external__pac_responder.m4 b/security/sssd2/files/patch-src__external__pac_responder.m4
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__external__pac_responder.m4
rename to security/sssd2/files/patch-src__external__pac_responder.m4
diff --git a/security/sssd2.wtf/files/patch-src__external__platform.m4 b/security/sssd2/files/patch-src__external__platform.m4
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__external__platform.m4
rename to security/sssd2/files/patch-src__external__platform.m4
diff --git a/security/sssd2.wtf/files/patch-src__external__samba.m4 b/security/sssd2/files/patch-src__external__samba.m4
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__external__samba.m4
rename to security/sssd2/files/patch-src__external__samba.m4
diff --git a/security/sssd2.wtf/files/patch-src__krb5_plugin__common__radius_kdcpreauth.c b/security/sssd2/files/patch-src__krb5_plugin__common__radius_kdcpreauth.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__krb5_plugin__common__radius_kdcpreauth.c
rename to security/sssd2/files/patch-src__krb5_plugin__common__radius_kdcpreauth.c
diff --git a/security/sssd2.wtf/files/patch-src__lib__certmap__sss_certmap.exports b/security/sssd2/files/patch-src__lib__certmap__sss_certmap.exports
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__lib__certmap__sss_certmap.exports
rename to security/sssd2/files/patch-src__lib__certmap__sss_certmap.exports
diff --git a/security/sssd2.wtf/files/patch-src__lib__winbind_idmap_sss__winbind_idmap_sss.c b/security/sssd2/files/patch-src__lib__winbind_idmap_sss__winbind_idmap_sss.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__lib__winbind_idmap_sss__winbind_idmap_sss.c
rename to security/sssd2/files/patch-src__lib__winbind_idmap_sss__winbind_idmap_sss.c
diff --git a/security/sssd2.wtf/files/patch-src__lib__winbind_idmap_sss__winbind_idmap_sss.h b/security/sssd2/files/patch-src__lib__winbind_idmap_sss__winbind_idmap_sss.h
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__lib__winbind_idmap_sss__winbind_idmap_sss.h
rename to security/sssd2/files/patch-src__lib__winbind_idmap_sss__winbind_idmap_sss.h
diff --git a/security/sssd2.wtf/files/patch-src__p11_child__p11_child_common.c b/security/sssd2/files/patch-src__p11_child__p11_child_common.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__p11_child__p11_child_common.c
rename to security/sssd2/files/patch-src__p11_child__p11_child_common.c
diff --git a/security/sssd2.wtf/files/patch-src__passkey_child__passkey_child_common.c b/security/sssd2/files/patch-src__passkey_child__passkey_child_common.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__passkey_child__passkey_child_common.c
rename to security/sssd2/files/patch-src__passkey_child__passkey_child_common.c
diff --git a/security/sssd2.wtf/files/patch-src__providers__ad__ad_common.c b/security/sssd2/files/patch-src__providers__ad__ad_common.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__providers__ad__ad_common.c
rename to security/sssd2/files/patch-src__providers__ad__ad_common.c
diff --git a/security/sssd2.wtf/files/patch-src__providers__ad__ad_gpo_child.c b/security/sssd2/files/patch-src__providers__ad__ad_gpo_child.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__providers__ad__ad_gpo_child.c
rename to security/sssd2/files/patch-src__providers__ad__ad_gpo_child.c
diff --git a/security/sssd2.wtf/files/patch-src__providers__ad__ad_pac.h b/security/sssd2/files/patch-src__providers__ad__ad_pac.h
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__providers__ad__ad_pac.h
rename to security/sssd2/files/patch-src__providers__ad__ad_pac.h
diff --git a/security/sssd2.wtf/files/patch-src__providers__ad__ad_pac_common.c b/security/sssd2/files/patch-src__providers__ad__ad_pac_common.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__providers__ad__ad_pac_common.c
rename to security/sssd2/files/patch-src__providers__ad__ad_pac_common.c
diff --git a/security/sssd2.wtf/files/patch-src__providers__data_provider__dp_modules.c b/security/sssd2/files/patch-src__providers__data_provider__dp_modules.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__providers__data_provider__dp_modules.c
rename to security/sssd2/files/patch-src__providers__data_provider__dp_modules.c
diff --git a/security/sssd2.wtf/files/patch-src__providers__data_provider__dp_targets.c b/security/sssd2/files/patch-src__providers__data_provider__dp_targets.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__providers__data_provider__dp_targets.c
rename to security/sssd2/files/patch-src__providers__data_provider__dp_targets.c
diff --git a/security/sssd2.wtf/files/patch-src__providers__data_provider_be.c b/security/sssd2/files/patch-src__providers__data_provider_be.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__providers__data_provider_be.c
rename to security/sssd2/files/patch-src__providers__data_provider_be.c
diff --git a/security/sssd2.wtf/files/patch-src__providers__data_provider_fo.c b/security/sssd2/files/patch-src__providers__data_provider_fo.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__providers__data_provider_fo.c
rename to security/sssd2/files/patch-src__providers__data_provider_fo.c
diff --git a/security/sssd2.wtf/files/patch-src__providers__files__files_ops.c b/security/sssd2/files/patch-src__providers__files__files_ops.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__providers__files__files_ops.c
rename to security/sssd2/files/patch-src__providers__files__files_ops.c
diff --git a/security/sssd2.wtf/files/patch-src__providers__ipa__ipa_common.c b/security/sssd2/files/patch-src__providers__ipa__ipa_common.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__providers__ipa__ipa_common.c
rename to security/sssd2/files/patch-src__providers__ipa__ipa_common.c
diff --git a/security/sssd2.wtf/files/patch-src__providers__ipa__ipa_deskprofile_rules_util.c b/security/sssd2/files/patch-src__providers__ipa__ipa_deskprofile_rules_util.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__providers__ipa__ipa_deskprofile_rules_util.c
rename to security/sssd2/files/patch-src__providers__ipa__ipa_deskprofile_rules_util.c
diff --git a/security/sssd2.wtf/files/patch-src__providers__krb5__krb5_child.c b/security/sssd2/files/patch-src__providers__krb5__krb5_child.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__providers__krb5__krb5_child.c
rename to security/sssd2/files/patch-src__providers__krb5__krb5_child.c
diff --git a/security/sssd2.wtf/files/patch-src__providers__ldap__ldap_auth.c b/security/sssd2/files/patch-src__providers__ldap__ldap_auth.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__providers__ldap__ldap_auth.c
rename to security/sssd2/files/patch-src__providers__ldap__ldap_auth.c
diff --git a/security/sssd2.wtf/files/patch-src__providers__ldap__ldap_child.c b/security/sssd2/files/patch-src__providers__ldap__ldap_child.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__providers__ldap__ldap_child.c
rename to security/sssd2/files/patch-src__providers__ldap__ldap_child.c
diff --git a/security/sssd2.wtf/files/patch-src__providers__ldap__sdap_access.c b/security/sssd2/files/patch-src__providers__ldap__sdap_access.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__providers__ldap__sdap_access.c
rename to security/sssd2/files/patch-src__providers__ldap__sdap_access.c
diff --git a/security/sssd2.wtf/files/patch-src__providers__ldap__sdap_async_sudo_hostinfo.c b/security/sssd2/files/patch-src__providers__ldap__sdap_async_sudo_hostinfo.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__providers__ldap__sdap_async_sudo_hostinfo.c
rename to security/sssd2/files/patch-src__providers__ldap__sdap_async_sudo_hostinfo.c
diff --git a/security/sssd2.wtf/files/patch-src__providers__proxy__proxy_child.c b/security/sssd2/files/patch-src__providers__proxy__proxy_child.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__providers__proxy__proxy_child.c
rename to security/sssd2/files/patch-src__providers__proxy__proxy_child.c
diff --git a/security/sssd2.wtf/files/patch-src__resolv__async_resolv_utils.c b/security/sssd2/files/patch-src__resolv__async_resolv_utils.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__resolv__async_resolv_utils.c
rename to security/sssd2/files/patch-src__resolv__async_resolv_utils.c
diff --git a/security/sssd2.wtf/files/patch-src__responder__common__cache_req__plugins__cache_req_ip_host_by_addr.c b/security/sssd2/files/patch-src__responder__common__cache_req__plugins__cache_req_ip_host_by_addr.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__responder__common__cache_req__plugins__cache_req_ip_host_by_addr.c
rename to security/sssd2/files/patch-src__responder__common__cache_req__plugins__cache_req_ip_host_by_addr.c
diff --git a/security/sssd2.wtf/files/patch-src__responder__common__cache_req__plugins__cache_req_ip_network_by_addr.c b/security/sssd2/files/patch-src__responder__common__cache_req__plugins__cache_req_ip_network_by_addr.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__responder__common__cache_req__plugins__cache_req_ip_network_by_addr.c
rename to security/sssd2/files/patch-src__responder__common__cache_req__plugins__cache_req_ip_network_by_addr.c
diff --git a/security/sssd2.wtf/files/patch-src__responder__common__responder_common.c b/security/sssd2/files/patch-src__responder__common__responder_common.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__responder__common__responder_common.c
rename to security/sssd2/files/patch-src__responder__common__responder_common.c
diff --git a/security/sssd2.wtf/files/patch-src__responder__common__responder_packet.c b/security/sssd2/files/patch-src__responder__common__responder_packet.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__responder__common__responder_packet.c
rename to security/sssd2/files/patch-src__responder__common__responder_packet.c
diff --git a/security/sssd2.wtf/files/patch-src__responder__kcm__kcmsrv_ccache_secdb.c b/security/sssd2/files/patch-src__responder__kcm__kcmsrv_ccache_secdb.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__responder__kcm__kcmsrv_ccache_secdb.c
rename to security/sssd2/files/patch-src__responder__kcm__kcmsrv_ccache_secdb.c
diff --git a/security/sssd2.wtf/files/patch-src__responder__kcm__kcmsrv_cmd.c b/security/sssd2/files/patch-src__responder__kcm__kcmsrv_cmd.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__responder__kcm__kcmsrv_cmd.c
rename to security/sssd2/files/patch-src__responder__kcm__kcmsrv_cmd.c
diff --git a/security/sssd2.wtf/files/patch-src__responder__kcm__kcmsrv_ops.c b/security/sssd2/files/patch-src__responder__kcm__kcmsrv_ops.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__responder__kcm__kcmsrv_ops.c
rename to security/sssd2/files/patch-src__responder__kcm__kcmsrv_ops.c
diff --git a/security/sssd2.wtf/files/patch-src__responder__nss__nsssrv_mmap_cache.c b/security/sssd2/files/patch-src__responder__nss__nsssrv_mmap_cache.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__responder__nss__nsssrv_mmap_cache.c
rename to security/sssd2/files/patch-src__responder__nss__nsssrv_mmap_cache.c
diff --git a/security/sssd2.wtf/files/patch-src__sbus__sbus_errors.c b/security/sssd2/files/patch-src__sbus__sbus_errors.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__sbus__sbus_errors.c
rename to security/sssd2/files/patch-src__sbus__sbus_errors.c
diff --git a/security/sssd2.wtf/files/patch-src__sss_client__common.c b/security/sssd2/files/patch-src__sss_client__common.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__sss_client__common.c
rename to security/sssd2/files/patch-src__sss_client__common.c
diff --git a/security/sssd2.wtf/files/patch-src__sss_client__nss_group.c b/security/sssd2/files/patch-src__sss_client__nss_group.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__sss_client__nss_group.c
rename to security/sssd2/files/patch-src__sss_client__nss_group.c
diff --git a/security/sssd2.wtf/files/patch-src__sss_client__nss_hosts.c b/security/sssd2/files/patch-src__sss_client__nss_hosts.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__sss_client__nss_hosts.c
rename to security/sssd2/files/patch-src__sss_client__nss_hosts.c
diff --git a/security/sssd2.wtf/files/patch-src__sss_client__nss_ipnetworks.c b/security/sssd2/files/patch-src__sss_client__nss_ipnetworks.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__sss_client__nss_ipnetworks.c
rename to security/sssd2/files/patch-src__sss_client__nss_ipnetworks.c
diff --git a/security/sssd2.wtf/files/patch-src__sss_client__pam_sss.c b/security/sssd2/files/patch-src__sss_client__pam_sss.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__sss_client__pam_sss.c
rename to security/sssd2/files/patch-src__sss_client__pam_sss.c
diff --git a/security/sssd2.wtf/files/patch-src__sss_client__pam_sss_gss.c b/security/sssd2/files/patch-src__sss_client__pam_sss_gss.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__sss_client__pam_sss_gss.c
rename to security/sssd2/files/patch-src__sss_client__pam_sss_gss.c
diff --git a/security/sssd2.wtf/files/patch-src__sss_client__sss_nss.exports b/security/sssd2/files/patch-src__sss_client__sss_nss.exports
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__sss_client__sss_nss.exports
rename to security/sssd2/files/patch-src__sss_client__sss_nss.exports
diff --git a/security/sssd2.wtf/files/patch-src__sss_client__sss_pac_responder_client.c b/security/sssd2/files/patch-src__sss_client__sss_pac_responder_client.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__sss_client__sss_pac_responder_client.c
rename to security/sssd2/files/patch-src__sss_client__sss_pac_responder_client.c
diff --git a/security/sssd2.wtf/files/patch-src__util__child_common.c b/security/sssd2/files/patch-src__util__child_common.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__util__child_common.c
rename to security/sssd2/files/patch-src__util__child_common.c
diff --git a/security/sssd2.wtf/files/patch-src__util__nss_dl_load.c b/security/sssd2/files/patch-src__util__nss_dl_load.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__util__nss_dl_load.c
rename to security/sssd2/files/patch-src__util__nss_dl_load.c
diff --git a/security/sssd2.wtf/files/patch-src__util__server.c b/security/sssd2/files/patch-src__util__server.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__util__server.c
rename to security/sssd2/files/patch-src__util__server.c
diff --git a/security/sssd2.wtf/files/patch-src__util__sss_krb5.c b/security/sssd2/files/patch-src__util__sss_krb5.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__util__sss_krb5.c
rename to security/sssd2/files/patch-src__util__sss_krb5.c
diff --git a/security/sssd2.wtf/files/patch-src__util__sss_pam_data.h b/security/sssd2/files/patch-src__util__sss_pam_data.h
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__util__sss_pam_data.h
rename to security/sssd2/files/patch-src__util__sss_pam_data.h
diff --git a/security/sssd2.wtf/files/patch-src__util__sss_sockets.c b/security/sssd2/files/patch-src__util__sss_sockets.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__util__sss_sockets.c
rename to security/sssd2/files/patch-src__util__sss_sockets.c
diff --git a/security/sssd2.wtf/files/patch-src__util__util.c b/security/sssd2/files/patch-src__util__util.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__util__util.c
rename to security/sssd2/files/patch-src__util__util.c
diff --git a/security/sssd2.wtf/files/patch-src__util__util_creds.h b/security/sssd2/files/patch-src__util__util_creds.h
similarity index 100%
rename from security/sssd2.wtf/files/patch-src__util__util_creds.h
rename to security/sssd2/files/patch-src__util__util_creds.h
diff --git a/security/sssd2.wtf/files/patch-src_tests_cmocka_test__authtok.c b/security/sssd2/files/patch-src_tests_cmocka_test__authtok.c
similarity index 100%
rename from security/sssd2.wtf/files/patch-src_tests_cmocka_test__authtok.c
rename to security/sssd2/files/patch-src_tests_cmocka_test__authtok.c
diff --git a/security/sssd2.wtf/files/pkg-message.in b/security/sssd2/files/pkg-message.in
similarity index 100%
rename from security/sssd2.wtf/files/pkg-message.in
rename to security/sssd2/files/pkg-message.in
diff --git a/security/sssd2.wtf/files/sss_bsd_errno.h b/security/sssd2/files/sss_bsd_errno.h
similarity index 100%
rename from security/sssd2.wtf/files/sss_bsd_errno.h
rename to security/sssd2/files/sss_bsd_errno.h
diff --git a/security/sssd2.wtf/files/sssd.in b/security/sssd2/files/sssd.in
similarity index 100%
rename from security/sssd2.wtf/files/sssd.in
rename to security/sssd2/files/sssd.in
diff --git a/security/sssd2.wtf/pkg-descr b/security/sssd2/pkg-descr
similarity index 100%
rename from security/sssd2.wtf/pkg-descr
rename to security/sssd2/pkg-descr
diff --git a/security/sssd2.wtf/pkg-plist b/security/sssd2/pkg-plist
similarity index 100%
rename from security/sssd2.wtf/pkg-plist
rename to security/sssd2/pkg-plist