diff --git a/routes/templates/templates-name-route/templates-name-route.js b/routes/templates/templates-name-route/templates-name-route.js
index b9b1343..47e9d6c 100644
--- a/routes/templates/templates-name-route/templates-name-route.js
+++ b/routes/templates/templates-name-route/templates-name-route.js
@@ -166,18 +166,27 @@ const setTemplate = async(req, res) => {
         if (!filePath) {
             // first check if the orgId path exists:
             filePath = `${__dirname}/template-files/${templateDir}/${orgId}`;
+            const orgPaths = [`${__dirname}/template-files/contract-signing-drafts/${orgId}`, `${__dirname}/template-files/contract-signing-templates/${orgId}`];
             try {
-                if (!fs.existsSync(filePath)) {
-                    logger.info(`Org directory doesn\'t exist! Creating the directory ${filePath}`);
-                    fs.mkdirSync(filePath, { recursive: true });
+                if (!fs.existsSync(orgPaths[0])) {
+                    logger.info(`Org directory doesn\'t exist! Creating the directory ${orgPaths[0]}`);
+                    fs.mkdirSync(orgPaths[0], { recursive: true });
+
+                    // check if published folder exists
+                    if (!fs.existsSync(orgPaths[1])) {
+                        logger.info(`Org directory doesn\'t exist! Creating the directory ${orgPaths[1]}`);
+                        fs.mkdirSync(orgPaths[1], { recursive: true });
+                    } else {
+                        logger.info(`directory ${orgPaths[1]} already exists, no need to create it`);
+                    }
                 } else {
-                    logger.info(`directory ${filePath} already exists, no need to create it`);
+                    logger.info(`directory ${orgPaths[0]} already exists, no need to create it`);
                 }
             } catch(err) {
                 console.error(err);
             }
             logger.info(`sleeping ... `);
-            await sleep(1000);
+            await sleep(2000);
 
             filePath = `${__dirname}/template-files/${templateDir}/${orgId}/${templateName}`;
             try {
@@ -187,7 +196,7 @@ const setTemplate = async(req, res) => {
                 } else {
                     logger.info(`directory ${filePath} already exists, no need to create it`);
                 }
-                logger.info(`creating schema for ${templateName}.schema.json`);
+                logger.info(`creating schema for ${templateName}.schema.json. File path: ${filePath}/${templateName}.schema.json`);
                 fs.writeFileSync(`${filePath}/${templateName}.schema.json`, contentForSchema, {flag:'w'}); 
                 // logger.info(`creating output template for ${templateName}.html`);
                 // fs.writeFileSync(`${filePath}/${templateName}.html`, contentForHtml, {flag:'w'});
@@ -206,7 +215,7 @@ const setTemplate = async(req, res) => {
                     fs.writeFileSync(`${filePath}/${output.slug}.html`, output.data, {flag:'w'});    
                 });
                 logger.info(`sleeping ... `);
-                await sleep(1000);
+                await sleep(2000);
                 logger.info(`updating full templates cache ... `);
                 await cacheContractSigningFullUpdate();
                 logger.info(`returning new list of org templates and drafts`);