diff --git a/scripts/build-rpm-from-repo.sh b/scripts/build-rpm-from-repo.sh
index 8c5e6ee..047e131 100755
--- a/scripts/build-rpm-from-repo.sh
+++ b/scripts/build-rpm-from-repo.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
-# Location of sources/ and specs/
-# Sources are in $BASE_DIR/sources/$PACKAGE_NAME
+# Sources are in $BASE_DIR/$PACKAGE_NAME
 BASE_DIR=$1
 
 # Name of spec file without the extension
@@ -26,8 +25,8 @@ if [ -n "$KOJI_VERSION" ]; then
 fi
 
 echo "=====PREPARING SOURCES====="
-cp -f "$BASE_DIR"/specs/"$PACKAGE_NAME".spec /root/rpmbuild/SPECS/
-cp -fr "$BASE_DIR"/sources/"$PACKAGE_NAME"/* /root/rpmbuild/SOURCES
+cp -f "$BASE_DIR"/"$PACKAGE_NAME"/*.spec /root/rpmbuild/SPECS/
+cp -fr "$BASE_DIR"/"$PACKAGE_NAME"/* /root/rpmbuild/SOURCES/
 
 echo "=====INSTALLING DEPENDENCIES====="
 cd  /root/rpmbuild/SPECS/
diff --git a/sources/t2linux-config/firmware.sh b/t2linux-config/firmware.sh
similarity index 100%
rename from sources/t2linux-config/firmware.sh
rename to t2linux-config/firmware.sh
diff --git a/sources/t2linux-config/rmmod_tb.sh b/t2linux-config/rmmod_tb.sh
similarity index 100%
rename from sources/t2linux-config/rmmod_tb.sh
rename to t2linux-config/rmmod_tb.sh
diff --git a/specs/t2linux-config.spec b/t2linux-config/t2linux-config.spec
similarity index 100%
rename from specs/t2linux-config.spec
rename to t2linux-config/t2linux-config.spec
diff --git a/sources/t2linux-config/touchbar.sh b/t2linux-config/touchbar.sh
similarity index 100%
rename from sources/t2linux-config/touchbar.sh
rename to t2linux-config/touchbar.sh
diff --git a/sources/t2linux-repo/t2linux-fedora-new.pub b/t2linux-repo/t2linux-fedora-new.pub
similarity index 100%
rename from sources/t2linux-repo/t2linux-fedora-new.pub
rename to t2linux-repo/t2linux-fedora-new.pub
diff --git a/sources/t2linux-repo/t2linux-fedora.pub b/t2linux-repo/t2linux-fedora.pub
similarity index 100%
rename from sources/t2linux-repo/t2linux-fedora.pub
rename to t2linux-repo/t2linux-fedora.pub
diff --git a/sources/t2linux-repo/t2linux-fedora.repo b/t2linux-repo/t2linux-fedora.repo
similarity index 100%
rename from sources/t2linux-repo/t2linux-fedora.repo
rename to t2linux-repo/t2linux-fedora.repo
diff --git a/specs/t2linux-repo.spec b/t2linux-repo/t2linux-repo.spec
similarity index 100%
rename from specs/t2linux-repo.spec
rename to t2linux-repo/t2linux-repo.spec