diff --git a/admc-git/lure.sh b/admc-git/lure.sh
index 01eede4..871645b 100755
--- a/admc-git/lure.sh
+++ b/admc-git/lure.sh
@@ -1,5 +1,5 @@
 name='admc-git'
-version='6dbb92e'
+version='3568.6dbb92e'
 release='1'
 desc='user-friendly инструмент для Linux для работы с доменом Active Directory и групповыми политиками.'
 homepage='https://github.com/altlinux/admc.git'
@@ -15,6 +15,11 @@ build_deps_debian=('cmake' 'debhelper' 'qtbase5-dev' 'qttools5-dev' 'libldap2-de
 sources=("git+https://github.com/altlinux/${provides}.git")
 checksums=('SKIP')
 
+version() {
+	cd "$srcdir/${provides}"
+	git-version
+}
+
 prepare() {
 	cd "${srcdir}/${provides}"
 	mkdir build
diff --git a/discord/lure.sh b/discord-bin/lure.sh
similarity index 98%
rename from discord/lure.sh
rename to discord-bin/lure.sh
index 15f259f..6871f17 100755
--- a/discord/lure.sh
+++ b/discord-bin/lure.sh
@@ -1,4 +1,4 @@
-name='discord'
+name='discord-bin'
 version='0.0.22'
 release='1'
 desc='Discord (popular voice + video app) using the system provided electron for increased security and performance'
diff --git a/jetbrains-toolbox/LICENSE b/jetbrains-toolbox-bin/LICENSE
similarity index 100%
rename from jetbrains-toolbox/LICENSE
rename to jetbrains-toolbox-bin/LICENSE
diff --git a/jetbrains-toolbox/icon.svg b/jetbrains-toolbox-bin/icon.svg
similarity index 100%
rename from jetbrains-toolbox/icon.svg
rename to jetbrains-toolbox-bin/icon.svg
diff --git a/jetbrains-toolbox/jetbrains-toolbox.desktop b/jetbrains-toolbox-bin/jetbrains-toolbox.desktop
similarity index 100%
rename from jetbrains-toolbox/jetbrains-toolbox.desktop
rename to jetbrains-toolbox-bin/jetbrains-toolbox.desktop
diff --git a/jetbrains-toolbox/lure.sh b/jetbrains-toolbox-bin/lure.sh
similarity index 100%
rename from jetbrains-toolbox/lure.sh
rename to jetbrains-toolbox-bin/lure.sh
diff --git a/neofetch/lure.sh b/neofetch-bin/lure.sh
similarity index 57%
rename from neofetch/lure.sh
rename to neofetch-bin/lure.sh
index e970890..c6ac862 100755
--- a/neofetch/lure.sh
+++ b/neofetch-bin/lure.sh
@@ -1,4 +1,4 @@
-name='neofetch'
+name='neofetch-bin'
 version='7.1.0'
 release='1'
 desc='Neofetch displays information about your operating system, software and hardware in an aesthetic and visually pleasing way.'
@@ -10,10 +10,10 @@ provides=('neofetch')
 conflicts=('neofetch')
 deps=('bash')
 
-sources=("https://github.com/dylanaraps/${name}/archive/refs/tags/${version}.tar.gz")
+sources=("https://github.com/dylanaraps/${provides}/archive/refs/tags/${version}.tar.gz")
 checksums=('SKIP')
 
 package() {
-	install -Dm755 "${srcdir}/${name}-${version}/neofetch" "${pkgdir}/usr/bin/neofetch"
-	install -Dm755 "${srcdir}/${name}-${version}/neofetch.1" "${pkgdir}/usr/man1/neofetch.1"
+	install -Dm755 "${srcdir}/${provides}-${version}/neofetch" "${pkgdir}/usr/bin/neofetch"
+	install -Dm755 "${srcdir}/${provides}-${version}/neofetch.1" "${pkgdir}/usr/man1/neofetch.1"
 }
diff --git a/noisetorch/lure.sh b/noisetorch-bin/lure.sh
similarity index 82%
rename from noisetorch/lure.sh
rename to noisetorch-bin/lure.sh
index 505fcb4..a4b03b1 100755
--- a/noisetorch/lure.sh
+++ b/noisetorch-bin/lure.sh
@@ -1,11 +1,11 @@
-name='noisetorch'
+name='noisetorch-bin'
 version='0.12.2'
 release='1'
 desc='NoiseTorch-ng is an easy to use open source application for Linux with PulseAudio or PipeWire. It creates a virtual microphone that suppresses noise, in any application.'
 homepage='https://github.com/noisetorch/NoiseTorch'
 maintainer="Евгений Храмов <xpamych@yandex.ru>"
 architectures=('amd64')
-license=('GPLv3')
+license=('GPL-3.0-or-later')
 provides=('noisetorch')
 conflicts=('noisetorch')
 
@@ -14,8 +14,8 @@ deps_amd64_debian=('git' 'golang')
 build_deps=('git' 'go')
 build_deps_debian=('git' 'golang')
 
-sources_amd64=("git+https://github.com/noisetorch/NoiseTorch.git#tag=v${version}")
-checksums_amd64=('4a30650314a6f83d979f3303d49618847ba58e39e3e26482dfe58b5e261c5611')
+sources=("git+https://github.com/noisetorch/NoiseTorch.git#tag=v${version}")
+checksums=('SKIP')
 
 prepare() {
 	cd "${srcdir}/NoiseTorch"
diff --git a/obsidian/lure.sh b/obsidian-bin/lure.sh
similarity index 70%
rename from obsidian/lure.sh
rename to obsidian-bin/lure.sh
index 149762e..f710f40 100755
--- a/obsidian/lure.sh
+++ b/obsidian-bin/lure.sh
@@ -1,4 +1,4 @@
-name='obsidian'
+name='obsidian-bin'
 version='1.1.9'
 release='1'
 desc='A powerful knowledge base that works on top of a local folder of plain text Markdown files'
@@ -13,7 +13,7 @@ deps=('zlib' 'hicolor-icon-theme' 'fuse3')
 deps_debian=('zlib1g' 'hicolor-icon-theme' 'fuse3')
 build_deps=('npm')
 
-sources_amd64=("https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${name}-${version}.tar.gz")
+sources_amd64=("https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${provides}-${version}.tar.gz")
 checksums_amd64=('SKIP')
 
 prepare() {
@@ -23,14 +23,14 @@ prepare() {
 	npm install electron --save-dev
 
 	cd "${srcdir}"
-	~/.npm/node_modules/asar/bin/asar.js ef "${name}-${version}/resources/obsidian.asar" icon.png
+	~/.npm/node_modules/asar/bin/asar.js ef "${provides}-${version}/resources/obsidian.asar" icon.png
 }
 
 package() {
-	install -Dm755 "${scriptdir}/${name}" "${pkgdir}/usr/bin/obsidian"
-	install -Dm644 "${scriptdir}/${name}.desktop" -t "${pkgdir}/usr/share/applications/"
+	install -Dm755 "${scriptdir}/${provides}" "${pkgdir}/usr/bin/obsidian"
+	install -Dm644 "${scriptdir}/${provides}.desktop" -t "${pkgdir}/usr/share/applications/"
 	install -Dm644 ./icon.png "${pkgdir}/usr/share/pixmaps/obsidian.png"
-	cd "${srcdir}/${name}-${version}/resources/"
+	cd "${srcdir}/${provides}-${version}/resources/"
 	install -dm0755 "$pkgdir/usr/lib/obsidian"
 	find . -type d -exec install -d {,"${pkgdir}/usr/lib/obsidian/"}{} \;
 	find . -type f -exec install -D {,"${pkgdir}/usr/lib/obsidian/"}{} \;
diff --git a/obsidian/obsidian b/obsidian-bin/obsidian
similarity index 100%
rename from obsidian/obsidian
rename to obsidian-bin/obsidian
diff --git a/obsidian/obsidian.desktop b/obsidian-bin/obsidian.desktop
similarity index 100%
rename from obsidian/obsidian.desktop
rename to obsidian-bin/obsidian.desktop
diff --git a/shfmt-git/lure.sh b/shfmt-git/lure.sh
index b63717e..862e85d 100644
--- a/shfmt-git/lure.sh
+++ b/shfmt-git/lure.sh
@@ -1,5 +1,5 @@
 name='shfmt-git'
-version='1.0.0'
+version='3241.08049c8'
 release='1'
 desc='A shell formatter. Supports POSIX Shell, Bash, and mksh.'
 homepage='https://'
@@ -12,6 +12,11 @@ conflicts=('shtmt')
 sources=("git+https://github.com/patrickvane/shfmt.git")
 checksums=('SKIP')
 
+version() {
+	cd "$srcdir/${provides}"
+	git-version
+}
+
 build() {
 	cd "$srcdir/shfmt/cmd/shfmt"
 	go build
diff --git a/strelaysrv/lure.sh b/strelaysrv-bin/lure.sh
similarity index 86%
rename from strelaysrv/lure.sh
rename to strelaysrv-bin/lure.sh
index 2182ad2..83f403a 100755
--- a/strelaysrv/lure.sh
+++ b/strelaysrv-bin/lure.sh
@@ -1,4 +1,4 @@
-name='strelaysrv'
+name='strelaysrv-bin'
 version='1.22.1'
 release='1'
 desc='This is the relay server for the syncthing project.'
@@ -13,7 +13,7 @@ deps_amd64_debian=('libc6')
 build_deps=('git' 'go')
 build_deps_debian=('git' 'golang')
 
-sources_amd64=("https://github.com/syncthing/relaysrv/releases/download/v${version}/${name}-linux-amd64-v${version}.tar.gz"
+sources_amd64=("https://github.com/syncthing/relaysrv/releases/download/v${version}/${provides}-linux-amd64-v${version}.tar.gz"
 	"https://raw.githubusercontent.com/archlinux/svntogit-community/packages/syncthing/trunk/syncthing-relaysrv.service"
 	"https://raw.githubusercontent.com/archlinux/svntogit-community/packages/syncthing/trunk/syncthing-relaysrv.tmpfiles"
 	"https://raw.githubusercontent.com/archlinux/svntogit-community/packages/syncthing/trunk/syncthing-relaysrv.sysusers")
@@ -27,7 +27,7 @@ prepare() {
 }
 
 package() {
-	install -Dm755 ./${name}-linux-amd64-v${version}/strelaysrv "${pkgdir}/usr/bin/syncthing-relaysrv"
+	install -Dm755 ./${provides}-linux-amd64-v${version}/strelaysrv "${pkgdir}/usr/bin/syncthing-relaysrv"
 	install -Dm644 "${srcdir}/syncthing-relaysrv.service" "${pkgdir}/usr/lib/systemd/system/syncthing-relaysrv.service"
 	install -Dm644 "${srcdir}/syncthing-relaysrv.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/syncthing-relaysrv.conf"
 	install -Dm644 "${srcdir}/syncthing-relaysrv.sysusers" "${pkgdir}/usr/lib/sysusers.d/syncthing-relaysrv.conf"
diff --git a/syncthing-bin/lure.sh b/syncthing-bin/lure.sh
new file mode 100755
index 0000000..e36db06
--- /dev/null
+++ b/syncthing-bin/lure.sh
@@ -0,0 +1,30 @@
+name='syncthing-bin'
+version='1.23.0'
+release='1'
+desc='Syncthing is a continuous file synchronization program. It synchronizes files between two or more computers.'
+homepage='https://syncthing.net/'
+maintainer="Евгений Храмов <xpamych@yandex.ru>"
+architectures=('amd64')
+license=('MPL-2.0')
+provides=('syncthing')
+conflicts=('syncthing')
+deps_amd64=('glibc' 'strelaysrv')
+deps_amd64_debian=('libc6')
+build_deps=('git' 'go')
+build_deps_debian=('git' 'golang')
+
+sources_amd64=("https://github.com/${provides}/${provides}/releases/download/v${version}/${provides}-linux-amd64-v${version}.tar.gz")
+checksums_amd64=('SKIP')
+
+prepare() {
+	cd "${srcdir}"
+}
+
+package() {
+	install -Dm755 ./${provides}-linux-amd64-v${version}/syncthing "${pkgdir}/usr/bin/syncthing"
+	#install -Dm644 man/strelaysrv.1 "${pkgdir}/usr/share/man/man1/${provides}.1"
+	install -Dm644 ./${provides}-linux-amd64-v${version}/README.txt "${pkgdir}/usr/share/doc/syncthing/README.md"
+	install -Dm644 "./${provides}-linux-amd64-v${version}/etc/linux-systemd/system/syncthing-resume.service" "${pkgdir}/usr/lib/systemd/system/syncthing-resume.service"
+	install -Dm644 "./${provides}-linux-amd64-v${version}/etc/linux-systemd/system/syncthing@.service" "${pkgdir}/usr/lib/systemd/system/syncthing@.service"
+	install -Dm644 "./${provides}-linux-amd64-v${version}/etc/linux-systemd/user/syncthing.service" "${pkgdir}/usr/lib/systemd/user/syncthing.service"
+}
diff --git a/syncthing/lure.sh b/syncthing/lure.sh
deleted file mode 100755
index 047c21c..0000000
--- a/syncthing/lure.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-name='syncthing'
-version='1.23.0'
-release='1'
-desc='Syncthing is a continuous file synchronization program. It synchronizes files between two or more computers.'
-homepage='https://syncthing.net/'
-maintainer="Евгений Храмов <xpamych@yandex.ru>"
-architectures=('amd64')
-license=('MPL-2.0')
-provides=('syncthing')
-conflicts=('syncthing')
-deps_amd64=('glibc' 'strelaysrv')
-deps_amd64_debian=('libc6')
-build_deps=('git' 'go')
-build_deps_debian=('git' 'golang')
-
-sources_amd64=("https://github.com/${name}/${name}/releases/download/v${version}/${name}-linux-amd64-v${version}.tar.gz")
-checksums_amd64=('SKIP')
-
-prepare() {
-	cd "${srcdir}"
-}
-
-package() {
-	install -Dm755 ./${name}-linux-amd64-v${version}/syncthing "${pkgdir}/usr/bin/syncthing"
-	#install -Dm644 man/strelaysrv.1 "${pkgdir}/usr/share/man/man1/${name}.1"
-	install -Dm644 ./${name}-linux-amd64-v${version}/README.txt "${pkgdir}/usr/share/doc/syncthing/README.md"
-	install -Dm644 "./${name}-linux-amd64-v${version}/etc/linux-systemd/system/syncthing-resume.service" "${pkgdir}/usr/lib/systemd/system/syncthing-resume.service"
-	install -Dm644 "./${name}-linux-amd64-v${version}/etc/linux-systemd/system/syncthing@.service" "${pkgdir}/usr/lib/systemd/system/syncthing@.service"
-	install -Dm644 "./${name}-linux-amd64-v${version}/etc/linux-systemd/user/syncthing.service" "${pkgdir}/usr/lib/systemd/user/syncthing.service"
-}
diff --git a/telegram-desktop-bin/lure.sh b/telegram-desktop-bin/lure.sh
index 666937e..fd6e8e9 100755
--- a/telegram-desktop-bin/lure.sh
+++ b/telegram-desktop-bin/lure.sh
@@ -47,7 +47,7 @@ package() {
 
 	# Desktop launcher
 	install -Dm644 "${srcdir}/icon256.png" "${pkgdir}/usr/share/pixmaps/telegram.png"
-	install -Dm644 "${scriptdir}/${name}.desktop" "${pkgdir}/usr/share/applications/telegramdesktop.desktop"
+	install -Dm644 "${scriptdir}/${provides}.desktop" "${pkgdir}/usr/share/applications/telegramdesktop.desktop"
 
     # KDE5 & KDE4 protocol file
 	install -d "${pkgdir}/usr/share/kservices5"