diff --git a/plugins/ca.backup2.plg b/ca.backup2.plg
similarity index 98%
rename from plugins/ca.backup2.plg
rename to ca.backup2.plg
index b6d7008..bd3ae03 100644
--- a/plugins/ca.backup2.plg
+++ b/ca.backup2.plg
@@ -6,8 +6,8 @@
 <!ENTITY md5       "5a0d167433ea9e0331f92c03418d5f0a">
 <!ENTITY launch    "Settings/BackupMainV2">
 <!ENTITY plugdir   "/usr/local/emhttp/plugins/&name;">
-<!ENTITY github    "Squidly271/ca.backup2">
-<!ENTITY pluginURL "https://raw.githubusercontent.com/&github;/master/plugins/&name;.plg">
+<!ENTITY github    "Commifreak/ca.backup2">
+<!ENTITY pluginURL "https://raw.githubusercontent.com/&github;/master/&name;.plg">
 ]>
 
 <PLUGIN name="&name;" author="&author;" version="&version;" launch="&launch;" pluginURL="&pluginURL;" icon="shield">
diff --git a/plugins/securityIcon-WithShadow.png b/securityIcon-WithShadow.png
similarity index 100%
rename from plugins/securityIcon-WithShadow.png
rename to securityIcon-WithShadow.png
diff --git a/source/ca.backup2/pkg_build.sh b/source/ca.backup2/pkg_build.sh
index 579ab10..604ce48 100644
--- a/source/ca.backup2/pkg_build.sh
+++ b/source/ca.backup2/pkg_build.sh
@@ -7,10 +7,10 @@ version=$(date +"%Y.%m.%d")$1
 
 mkdir -p $tmpdir
 
-cp --parents -f $(find . -type f ! \( -iname "pkg_build.sh" -o -iname "sftp-config.json"  \) ) $tmpdir/
+cp --parents -f $(find . -type f ! \( -iname "pkg-build.sh" -o -iname "sftp-config.json"  \) ) $tmpdir/
 cd $tmpdir
-makepkg -l y -c y ${archive}/${plugin}-${version}-x86_64-1.txz
+makepkg -l y -c y /tmp/${plugin}-${version}-x86_64-1.txz
 rm -rf $tmpdir
 echo "MD5:"
-md5sum ${archive}/${plugin}-${version}-x86_64-1.txz
+md5sum /tmp/${plugin}-${version}-x86_64-1.txz