diff --git a/run.sh b/run.sh
index d4d89656dd77ca300ed231ecfa42af056084c19c..ad90700905430687eccd42e919b4e1fc8ff31f88 100755
--- a/run.sh
+++ b/run.sh
@@ -16,12 +16,16 @@ root_dir=/shared
 xml_dir=xml_files
 report_dir=reports
 
-report_file=report_$current_time.$report_extension
 xml_subdir=$xml_dir/$current_time
+report_subdir=$report_dir/$current_time
+
+report_file=report_$current_time.$report_extension
 
 if [[ ! -z $project ]]
 then
     xml_subdir=$xml_dir/$project/$current_time
+    report_subdir=$report_dir/$project/$current_time
+
     report_file=report_$project\_$current_time.$report_extension
 fi
 
@@ -54,6 +58,7 @@ rm -rf $root_dir/$xml_dir/*
 rm -rf $root_dir/$report_dir/*
 
 mkdir -p $root_dir/$xml_subdir
+mkdir -p $root_dir/$report_subdir
 
 while IFS= read -r line
 do
@@ -71,7 +76,7 @@ do
   upload $xml_subdir/$filename
 done < $root_dir/ips.txt
 
-python /output_report.py $root_dir/$xml_subdir $root_dir/$report_dir/$report_file $root_dir/ips.txt
+python /output_report.py $root_dir/$xml_subdir $root_dir/$report_subdir/$report_file $root_dir/ips.txt
 if [[ $report_extension = "tex" ]]
 then
     sed -i 's/_/\\_/g' $root_dir/$report_dir/$report_file
@@ -79,4 +84,4 @@ then
     sed -i 's/#/\\#/g' $root_dir/$report_dir/$report_file
     sed -i 's/%/\\%/g' $root_dir/$report_dir/$report_file
 fi
-upload $report_dir/$report_file
+upload $report_subdir/$report_file