diff --git a/server/index.js b/server/index.js
index c42faa80..c82ccb99 100644
--- a/server/index.js
+++ b/server/index.js
@@ -62,6 +62,11 @@ function Server () {
     // Support per-request http-context
     app.use(httpContext.middleware);
 
+    // 'express.static' to serve static files from site/public directory
+    const sitePublicPath = Path.resolve(process.cwd(), 'site/public');
+    app.use(express.static(sitePublicPath));
+    logger.info(`serving static files from site static path at ${sitePublicPath}.`);
+
     // 'express.static' to serve static files from public directory
     const publicPath = Path.resolve(process.cwd(), 'public');
     app.use(express.static(publicPath));
diff --git a/site/custom/scss/.gitkeep b/site/client_custom/scss/.gitkeep
similarity index 100%
rename from site/custom/scss/.gitkeep
rename to site/client_custom/scss/.gitkeep
diff --git a/site/custom/src/components/.gitkeep b/site/client_custom/src/components/.gitkeep
similarity index 100%
rename from site/custom/src/components/.gitkeep
rename to site/client_custom/src/components/.gitkeep
diff --git a/site/custom/src/containers/.gitkeep b/site/client_custom/src/containers/.gitkeep
similarity index 100%
rename from site/custom/src/containers/.gitkeep
rename to site/client_custom/src/containers/.gitkeep
diff --git a/site/custom/src/pages/.gitkeep b/site/client_custom/src/pages/.gitkeep
similarity index 100%
rename from site/custom/src/pages/.gitkeep
rename to site/client_custom/src/pages/.gitkeep
diff --git a/site/public/.gitkeep b/site/public/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/site/public/assets/img/.gitkeep b/site/public/assets/img/.gitkeep
new file mode 100644
index 00000000..e69de29b