Add: some checks into the libexec and move macros into the etc/resource.d