diff --git a/lib/server/job_server.py b/lib/server/job_server.py
index 846aceb..5b0832c 100755
--- a/lib/server/job_server.py
+++ b/lib/server/job_server.py
@@ -251,10 +251,15 @@ def add_job_handler():
         job_dir = None
         if uploaded_file and uploaded_file.filename:
             logger.info(f"Receiving uploaded file {uploaded_file.filename}")
-            job_dir = os.path.join(server.config['UPLOAD_FOLDER'], (uploaded_file.filename + "_" +
-                                                                    datetime.now().strftime("%Y.%m.%d_%H.%M.%S")))
+            job_dir = os.path.join(server.config['UPLOAD_FOLDER'], '_'.join(
+                [datetime.now().strftime("%Y.%m.%d_%H.%M.%S"),
+                 jobs_list[0]['renderer'],
+                 uploaded_file.filename]))
             os.makedirs(job_dir, exist_ok=True)
-            uploaded_file_local_path = os.path.join(job_dir, secure_filename(uploaded_file.filename))
+
+            upload_dir = os.path.join(job_dir, 'source')
+            os.makedirs(upload_dir, exist_ok=True)
+            uploaded_file_local_path = os.path.join(upload_dir, secure_filename(uploaded_file.filename))
             uploaded_file.save(uploaded_file_local_path)
 
         # convert job input paths for uploaded files and add jobs