diff --git a/installer/PKGBUILD b/installer/aur/PKGBUILD
similarity index 73%
rename from installer/PKGBUILD
rename to installer/aur/PKGBUILD
index 7189444..77db4a6 100644
--- a/installer/PKGBUILD
+++ b/installer/aur/PKGBUILD
@@ -1,14 +1,13 @@
 # Maintainer: Adel Noureddine <adel.noureddine@univ-pau.fr>
-# Contributor: Axel TERRIER <axelterrier12071999@gmail.com>
 pkgname=powerjoular
 pkgver=0.7.3
 pkgrel=1
 pkgdesc="PowerJoular allows monitoring power consumption of multiple platforms and processes."
 arch=('x86_64' 'aarch64' 'armv7h')
-url="https://github.com/axelterrier/powerjoular"
+url="https://github.com/joular/powerjoular"
 license=('GPL3')
 depends=('gcc-ada' 'gprbuild' 'xmlada' 'libgpr')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/axelterrier/powerjoular/archive/refs/heads/develop.tar.gz")
+source=("$pkgname-$pkgver.tar.gz::https://github.com/joular/powerjoular/archive/refs/heads/main.tar.gz")
 sha256sums=('SKIP')
 
 build() {
diff --git a/installer/create-packages-arch-source.sh b/installer/aur/create-packages-arch-source.sh
old mode 100644
new mode 100755
similarity index 100%
rename from installer/create-packages-arch-source.sh
rename to installer/aur/create-packages-arch-source.sh
diff --git a/installer/build-install.sh b/installer/bash-installer/build-install.sh
similarity index 100%
rename from installer/build-install.sh
rename to installer/bash-installer/build-install.sh
diff --git a/installer/uninstall.sh b/installer/bash-installer/uninstall.sh
similarity index 100%
rename from installer/uninstall.sh
rename to installer/bash-installer/uninstall.sh
diff --git a/installer/create-packages-deb-binary.sh b/installer/deb/create-packages-deb-binary.sh
old mode 100644
new mode 100755
similarity index 92%
rename from installer/create-packages-deb-binary.sh
rename to installer/deb/create-packages-deb-binary.sh
index 2242058..cd74923
--- a/installer/create-packages-deb-binary.sh
+++ b/installer/deb/create-packages-deb-binary.sh
@@ -4,10 +4,10 @@
 ARCHITECTURES=("amd64" "arm64" "armhf")
 
 # Directory of precompiled binaries
-BIN_DIR="../obj"
+BIN_DIR="../binary"
 
 # Systemd service file directory
-SERVICE_DIR="../systemd"
+SERVICE_DIR="../binary/systemd"
 
 # Output directory for packages
 OUTPUT_DIR="deb_binary_packages"
@@ -25,7 +25,7 @@ do
     mkdir -p $ARCH/powerjoular/DEBIAN
 
     # Copy precompiled binaries to bin directory
-    cp $BIN_DIR/powerjoular $ARCH/powerjoular/usr/bin/
+    cp $BIN_DIR/$ARCH/powerjoular $ARCH/powerjoular/usr/bin/
 
     # Copy systemd service files
     cp $SERVICE_DIR/powerjoular.service $ARCH/powerjoular/etc/systemd/system/
diff --git a/installer/debian-control-amd64.txt b/installer/deb/debian-control-amd64.txt
similarity index 100%
rename from installer/debian-control-amd64.txt
rename to installer/deb/debian-control-amd64.txt
diff --git a/installer/debian-control-arm64.txt b/installer/deb/debian-control-arm64.txt
similarity index 100%
rename from installer/debian-control-arm64.txt
rename to installer/deb/debian-control-arm64.txt
diff --git a/installer/debian-control-armhf.txt b/installer/deb/debian-control-armhf.txt
similarity index 100%
rename from installer/debian-control-armhf.txt
rename to installer/deb/debian-control-armhf.txt
diff --git a/installer/create-packages-rpm-binary.sh b/installer/rpm/create-packages-rpm-binary.sh
old mode 100644
new mode 100755
similarity index 76%
rename from installer/create-packages-rpm-binary.sh
rename to installer/rpm/create-packages-rpm-binary.sh
index 4b0b4c3..920ce7c
--- a/installer/create-packages-rpm-binary.sh
+++ b/installer/rpm/create-packages-rpm-binary.sh
@@ -15,8 +15,8 @@ do
     mkdir -p $SCRIPT_DIR/$ARCH
 
     # Copy binary and service files to their respective directories
-    cp $SCRIPT_DIR/../obj/powerjoular $SCRIPT_DIR/$ARCH/
-    cp $SCRIPT_DIR/../systemd/powerjoular.service $SCRIPT_DIR/$ARCH/
+    cp $SCRIPT_DIR/../binary/$ARCH/powerjoular $SCRIPT_DIR/$ARCH/
+    cp $SCRIPT_DIR/../binary/systemd/powerjoular.service $SCRIPT_DIR/$ARCH/
 
     # Prepare the RPM build environment
     mkdir -p $SCRIPT_DIR/$ARCH/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
@@ -35,10 +35,12 @@ do
 done
 
 # Combine all RPM packages into a single directory for convenience
-mkdir -p $SCRIPT_DIR/rpm_binary_packages
+mkdir -p $SCRIPT_DIR/packages
+
 for ARCH in "${ARCHS[@]}"
 do
-    mv $SCRIPT_DIR/$ARCH/*.rpm $SCRIPT_DIR/rpm_binary_packages/
+    mv $SCRIPT_DIR/$ARCH/*.rpm $SCRIPT_DIR/packages/
+    rm -rf $SCRIPT_DIR/$ARCH
 done
 
-echo "All RPM packages have been created and moved to the 'rpm_binary_packages' directory in $SCRIPT_DIR."
+echo "All RPM packages have been created and moved to the 'packages' directory in $SCRIPT_DIR."
diff --git a/installer/powerjoular.spec b/installer/rpm/powerjoular.spec
similarity index 100%
rename from installer/powerjoular.spec
rename to installer/rpm/powerjoular.spec