diff --git a/job-submit.spec b/job-submit.spec
index b943b46..bebfe2d 100644
--- a/job-submit.spec
+++ b/job-submit.spec
@@ -1,66 +1,64 @@
 %define fxdir /usr/share/lua/5.1/job_submit_fx
 %define name scitas-job-submit
 %define version 1.0.0 
 %define release 1%{?dist}
 
 Name:	%{name}
 Version:	%{version}
 Release:	%{release}
 License:	GPLv3
 Summary:	Suite of utilities for booting Scibian HPC clusters
 URL:		https://c4science.ch/source/scitas-job-submit
 Source0:	%{name}-%{version}.tar.gz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
 Collection of functions developed in LUA, integrated into the slurm 
 job_submit.lua script.
 
 %prep
 %setup -q
 
 %build
 
 %install
 
 install -m 755 -d %{buildroot}%{fxdir}
 install -m 755 -d %{buildroot}/etc/slurm/job_submit
 %define fxtarget billing_cost_estimate
 install -m 755 -d %{buildroot}%{fxdir}/%{fxtarget}/lua
-install -m 644 job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/init.lua 
-install -m 644 job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/lua/init.lua 
+install -m 644 %{name}-%{version}/job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/init.lua 
+install -m 644 %{name}-%{version}/job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/lua/init.lua 
 
 %define fxtarget partition_setting
 install -m 755 -d %{buildroot}%{fxdir}/%{fxtarget}/lua
-install -m 644 job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/init.lua
-install -m 644 job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/lua/init.lua
+install -m 644 %{name}-%{version}/job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/init.lua
+install -m 644 %{name}-%{version}/job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/lua/init.lua
 
 %define fxtarget scitas_cost
 install -m 755 -d %{buildroot}%{fxdir}/%{fxtarget}/lua
-install -m 644 job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/init.lua
-install -m 644 job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/lua/init.lua
+install -m 644 %{name}-%{version}/job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/init.lua
+install -m 644 %{name}-%{version}/job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/lua/init.lua
 
 %define fxtarget scitas_debug
 install -m 755 -d %{buildroot}%{fxdir}/%{fxtarget}/lua
-install -m 644 job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/init.lua
-install -m 644 job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/lua/init.lua
+install -m 644 %{name}-%{version}/job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/init.lua
+install -m 644 %{name}-%{version}/job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/lua/init.lua
 
 %define fxtarget track_gres
 install -m 755 -d %{buildroot}%{fxdir}/%{fxtarget}/lua
-install -m 644 job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/init.lua
-install -m 644 job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/lua/init.lua
+install -m 644 %{name}-%{version}/job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/init.lua
+install -m 644 %{name}-%{version}/job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/lua/init.lua
 
 %define fxtarget verbose_mode
 install -m 755 -d %{buildroot}%{fxdir}/%{fxtarget}/lua
-install -m 644 job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/init.lua
-install -m 644 job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/lua/init.lua
-
+install -m 644 %{name}-%{version}/job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/init.lua
+install -m 644 %{name}-%{version}/job_submit_fx/%{fxtarget} %{buildroot}%{fxdir}/%{fxtarget}/lua/init.lua
 
 %clean
 rm -rf %{buildroot}
 
-
 %changelog
 
 * Mon Jul 26 2021 Antonio J. RUSSO <antonio.russo@epfl.ch> - 1.0
 - Initial RPM release