diff --git a/src/Site.js b/src/Site.js
index ba5c40f70b..cd38313c01 100644
--- a/src/Site.js
+++ b/src/Site.js
@@ -911,10 +911,17 @@ class Site {
     if (!fs.existsSync(siteLayoutPath)) {
       return Promise.resolve();
     }
-    return new Promise((resolve, reject) => {
-      fs.copyAsync(siteLayoutPath, layoutsDestPath)
-        .then(resolve)
-        .catch(reject);
+    return new Promise((resolve) => {
+      const files = walkSync(siteLayoutPath);
+      resolve(files);
+    }).then((files) => {
+      if (!files) {
+        return Promise.resolve();
+      }
+      const filteredFiles = files.filter(file => _.includes(file, '.') && !_.includes(file, '.md'));
+      const copyAll = Promise.all(filteredFiles.map(file =>
+        fs.copyAsync(`${siteLayoutPath}/${file}`, `${layoutsDestPath}/${file}`)));
+      return copyAll.then(() => Promise.resolve());
     });
   }
 
diff --git a/test/functional/test_site/expected/markbind/layouts/default/footer.md b/test/functional/test_site/expected/markbind/layouts/default/footer.md
deleted file mode 100644
index 459abad939..0000000000
--- a/test/functional/test_site/expected/markbind/layouts/default/footer.md
+++ /dev/null
@@ -1,5 +0,0 @@
-<footer>
-  <div class="text-center">
-    Default footer
-  </div>
-</footer>
diff --git a/test/functional/test_site/expected/markbind/layouts/default/head.md b/test/functional/test_site/expected/markbind/layouts/default/head.md
deleted file mode 100644
index 931844de2a..0000000000
--- a/test/functional/test_site/expected/markbind/layouts/default/head.md
+++ /dev/null
@@ -1,4 +0,0 @@
-<head-top>
-<meta name="default-head-top">
-</head-top>
-<meta name="default-head-bottom">
diff --git a/test/functional/test_site/expected/markbind/layouts/default/navigation.md b/test/functional/test_site/expected/markbind/layouts/default/navigation.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/functional/test_site/expected/markbind/layouts/testAfterSetup/footer.md b/test/functional/test_site/expected/markbind/layouts/testAfterSetup/footer.md
deleted file mode 100644
index 5145bd26ac..0000000000
--- a/test/functional/test_site/expected/markbind/layouts/testAfterSetup/footer.md
+++ /dev/null
@@ -1,5 +0,0 @@
-<footer>
-  <div class="text-center">
-    testAfterSetup footer
-  </div>
-</footer>
diff --git a/test/functional/test_site/expected/markbind/layouts/testAfterSetup/head.md b/test/functional/test_site/expected/markbind/layouts/testAfterSetup/head.md
deleted file mode 100644
index d503b99f1f..0000000000
--- a/test/functional/test_site/expected/markbind/layouts/testAfterSetup/head.md
+++ /dev/null
@@ -1,4 +0,0 @@
-<head-top>
-<meta name="head-top">
-</head-top>
-<meta name="head-bottom">
diff --git a/test/functional/test_site/expected/markbind/layouts/testAfterSetup/navigation.md b/test/functional/test_site/expected/markbind/layouts/testAfterSetup/navigation.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/functional/test_site/expected/markbind/layouts/testLayout/footer.md b/test/functional/test_site/expected/markbind/layouts/testLayout/footer.md
deleted file mode 100644
index 1742d71366..0000000000
--- a/test/functional/test_site/expected/markbind/layouts/testLayout/footer.md
+++ /dev/null
@@ -1,5 +0,0 @@
-<footer>
-  <div class="text-center">
-    Layout footer
-  </div>
-</footer>
diff --git a/test/functional/test_site/expected/markbind/layouts/testLayout/head.md b/test/functional/test_site/expected/markbind/layouts/testLayout/head.md
deleted file mode 100644
index d503b99f1f..0000000000
--- a/test/functional/test_site/expected/markbind/layouts/testLayout/head.md
+++ /dev/null
@@ -1,4 +0,0 @@
-<head-top>
-<meta name="head-top">
-</head-top>
-<meta name="head-bottom">
diff --git a/test/functional/test_site/expected/markbind/layouts/testLayout/navigation.md b/test/functional/test_site/expected/markbind/layouts/testLayout/navigation.md
deleted file mode 100644
index a21e9fb9d4..0000000000
--- a/test/functional/test_site/expected/markbind/layouts/testLayout/navigation.md
+++ /dev/null
@@ -1,3 +0,0 @@
-<navigation>
-* [Layout Nav]
-</navigation>
diff --git a/test/functional/test_site_algolia_plugin/expected/markbind/layouts/default/footer.md b/test/functional/test_site_algolia_plugin/expected/markbind/layouts/default/footer.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/functional/test_site_algolia_plugin/expected/markbind/layouts/default/head.md b/test/functional/test_site_algolia_plugin/expected/markbind/layouts/default/head.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/functional/test_site_algolia_plugin/expected/markbind/layouts/default/navigation.md b/test/functional/test_site_algolia_plugin/expected/markbind/layouts/default/navigation.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/functional/test_site_convert/expected/markbind/layouts/default/footer.md b/test/functional/test_site_convert/expected/markbind/layouts/default/footer.md
deleted file mode 100644
index c505f7bf21..0000000000
--- a/test/functional/test_site_convert/expected/markbind/layouts/default/footer.md
+++ /dev/null
@@ -1,3 +0,0 @@
-<footer>
-	Custom footer.
-</footer>
\ No newline at end of file
diff --git a/test/functional/test_site_convert/expected/markbind/layouts/default/head.md b/test/functional/test_site_convert/expected/markbind/layouts/default/head.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/functional/test_site_convert/expected/markbind/layouts/default/header.md b/test/functional/test_site_convert/expected/markbind/layouts/default/header.md
deleted file mode 100644
index 52eef355ff..0000000000
--- a/test/functional/test_site_convert/expected/markbind/layouts/default/header.md
+++ /dev/null
@@ -1,10 +0,0 @@
-<header><navbar placement="top" type="inverse">
-  <a slot="brand" href="{{baseUrl}}/index.html" title="Home" class="navbar-brand"><i class="far fa-file-image"></i></a>
-  <li><a href="{{baseUrl}}/index.html" class="nav-link">HOME</a></li>
-  <li><a href="{{baseUrl}}/about.html" class="nav-link">ABOUT</a></li>
-  <li slot="right">
-    <form class="navbar-form">
-      <searchbar :data="searchData" placeholder="Search" :on-hit="searchCallback" menu-align-right></searchbar>
-    </form>
-  </li>
-</navbar></header>
\ No newline at end of file
diff --git a/test/functional/test_site_convert/expected/markbind/layouts/default/navigation.md b/test/functional/test_site_convert/expected/markbind/layouts/default/navigation.md
deleted file mode 100644
index a6eb89aed3..0000000000
--- a/test/functional/test_site_convert/expected/markbind/layouts/default/navigation.md
+++ /dev/null
@@ -1,4 +0,0 @@
-<navigation>
-* [[Home]]
-* [[Page-1]]
-</navigation>
\ No newline at end of file
diff --git a/test/functional/test_site_convert/expected/markbind/layouts/default/page.md b/test/functional/test_site_convert/expected/markbind/layouts/default/page.md
deleted file mode 100644
index 166ad06d84..0000000000
--- a/test/functional/test_site_convert/expected/markbind/layouts/default/page.md
+++ /dev/null
@@ -1 +0,0 @@
-{{ MAIN_CONTENT_BODY }}
\ No newline at end of file
diff --git a/test/functional/test_site_expressive_layout/expected/markbind/layouts/default/footer.md b/test/functional/test_site_expressive_layout/expected/markbind/layouts/default/footer.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/functional/test_site_expressive_layout/expected/markbind/layouts/default/head.md b/test/functional/test_site_expressive_layout/expected/markbind/layouts/default/head.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/functional/test_site_expressive_layout/expected/markbind/layouts/default/header.md b/test/functional/test_site_expressive_layout/expected/markbind/layouts/default/header.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/functional/test_site_expressive_layout/expected/markbind/layouts/default/imported.md b/test/functional/test_site_expressive_layout/expected/markbind/layouts/default/imported.md
deleted file mode 100644
index ae7e15600a..0000000000
--- a/test/functional/test_site_expressive_layout/expected/markbind/layouts/default/imported.md
+++ /dev/null
@@ -1,3 +0,0 @@
-<variable name="importedVar">This is an importedVar</variable>
-
-This content can be imported to the bottom of the page
\ No newline at end of file
diff --git a/test/functional/test_site_expressive_layout/expected/markbind/layouts/default/navigation.md b/test/functional/test_site_expressive_layout/expected/markbind/layouts/default/navigation.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/functional/test_site_expressive_layout/expected/markbind/layouts/default/page.md b/test/functional/test_site_expressive_layout/expected/markbind/layouts/default/page.md
deleted file mode 100644
index d724db0c83..0000000000
--- a/test/functional/test_site_expressive_layout/expected/markbind/layouts/default/page.md
+++ /dev/null
@@ -1,16 +0,0 @@
-<variable name="layoutVar">Variable from layout</variable>
-<import importedVar from="imported.md" as="imported" />
-
-{{ layoutVar }}
-
-{{ importedVar }}
-
-<panel header="Expanded panel" alt="Minimized panel" type="success" minimized>
-  Math formulas
-</panel>
-
-{{ MAIN_CONTENT_BODY }}
-
-Bottom Content
-
-<include src="imported.md" />
\ No newline at end of file
diff --git a/test/functional/test_site_templates/test_default/expected/markbind/layouts/default/footer.md b/test/functional/test_site_templates/test_default/expected/markbind/layouts/default/footer.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/functional/test_site_templates/test_default/expected/markbind/layouts/default/head.md b/test/functional/test_site_templates/test_default/expected/markbind/layouts/default/head.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/functional/test_site_templates/test_default/expected/markbind/layouts/default/header.md b/test/functional/test_site_templates/test_default/expected/markbind/layouts/default/header.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/functional/test_site_templates/test_default/expected/markbind/layouts/default/navigation.md b/test/functional/test_site_templates/test_default/expected/markbind/layouts/default/navigation.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/functional/test_site_templates/test_default/expected/markbind/layouts/default/page.md b/test/functional/test_site_templates/test_default/expected/markbind/layouts/default/page.md
deleted file mode 100644
index 166ad06d84..0000000000
--- a/test/functional/test_site_templates/test_default/expected/markbind/layouts/default/page.md
+++ /dev/null
@@ -1 +0,0 @@
-{{ MAIN_CONTENT_BODY }}
\ No newline at end of file
diff --git a/test/functional/test_site_templates/test_minimal/expected/markbind/layouts/default/footer.md b/test/functional/test_site_templates/test_minimal/expected/markbind/layouts/default/footer.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/functional/test_site_templates/test_minimal/expected/markbind/layouts/default/head.md b/test/functional/test_site_templates/test_minimal/expected/markbind/layouts/default/head.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/functional/test_site_templates/test_minimal/expected/markbind/layouts/default/header.md b/test/functional/test_site_templates/test_minimal/expected/markbind/layouts/default/header.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/functional/test_site_templates/test_minimal/expected/markbind/layouts/default/navigation.md b/test/functional/test_site_templates/test_minimal/expected/markbind/layouts/default/navigation.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/functional/test_site_templates/test_minimal/expected/markbind/layouts/default/page.md b/test/functional/test_site_templates/test_minimal/expected/markbind/layouts/default/page.md
deleted file mode 100644
index 166ad06d84..0000000000
--- a/test/functional/test_site_templates/test_minimal/expected/markbind/layouts/default/page.md
+++ /dev/null
@@ -1 +0,0 @@
-{{ MAIN_CONTENT_BODY }}
\ No newline at end of file
diff --git a/test/unit/Site.test.js b/test/unit/Site.test.js
index aee93bc29a..545e8caeef 100644
--- a/test/unit/Site.test.js
+++ b/test/unit/Site.test.js
@@ -49,10 +49,6 @@ test('Site Generate builds the correct amount of assets', async () => {
     'node_modules/@fortawesome/fontawesome-free/webfonts/font2.ttf': '',
     'node_modules/@primer/octicons/build/build.css': '',
 
-    'inner/_markbind/layouts/default/footer.md': '',
-    'inner/_markbind/layouts/default/head.md': '',
-    'inner/_markbind/layouts/default/header.md': '',
-    'inner/_markbind/layouts/default/navigation.md': '',
     'inner/_markbind/layouts/default/scripts.js': '',
     'inner/_markbind/layouts/default/styles.css': '',
   };
@@ -61,7 +57,8 @@ test('Site Generate builds the correct amount of assets', async () => {
   await site.generate();
   const paths = Object.keys(fs.vol.toJSON());
   const originalNumFiles = Object.keys(json).length;
-  const expectedNumBuilt = 21;
+
+  const expectedNumBuilt = 17;
   expect(paths.length).toEqual(originalNumFiles + expectedNumBuilt);
 
   // site
@@ -93,10 +90,6 @@ test('Site Generate builds the correct amount of assets', async () => {
   expect(fs.existsSync(path.resolve('inner/_site/markbind/fontawesome/webfonts/font2.ttf'))).toEqual(true);
 
   // layouts
-  expect(fs.existsSync(path.resolve('inner/_site/markbind/layouts/default/footer.md'))).toEqual(true);
-  expect(fs.existsSync(path.resolve('inner/_site/markbind/layouts/default/head.md'))).toEqual(true);
-  expect(fs.existsSync(path.resolve('inner/_site/markbind/layouts/default/header.md'))).toEqual(true);
-  expect(fs.existsSync(path.resolve('inner/_site/markbind/layouts/default/navigation.md'))).toEqual(true);
   expect(fs.existsSync(path.resolve('inner/_site/markbind/layouts/default/scripts.js'))).toEqual(true);
   expect(fs.existsSync(path.resolve('inner/_site/markbind/layouts/default/styles.css'))).toEqual(true);
 });