diff --git a/config-main.toml b/config-main.toml
deleted file mode 100644
index adba1f2c..00000000
--- a/config-main.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-baseurl = "https://www.gopheracademy.com"
-languageCode = "en-us"
-title = "Gopher Academy | Home"
-contentdir = "content"
-layoutdir = "layouts-main"
-publishdir = "public-main"
-disqusShortname = "gopheracademy"
-[taxonomies]
-   author = "authors"
-   series = "series"
-   tag = "tags"
-   category = "categories"
diff --git a/config.toml b/config.toml
index bbd0d6f5..1b5c54c0 100644
--- a/config.toml
+++ b/config.toml
@@ -1,6 +1,9 @@
-baseurl = "https://blog.gopheracademy.com"
+baseurl = "https://www.gopheracademy.com"
 languageCode = "en-us"
-title = "Gopher Academy Blog"
+title = "Gopher Academy | Home"
+contentdir = "content"
+layoutdir = "layouts"
+publishdir = "public"
 disqusShortname = "gopheracademy"
 [taxonomies]
    author = "authors"
diff --git a/layouts-main/_default/list.html b/layouts/_default/list.html
similarity index 100%
rename from layouts-main/_default/list.html
rename to layouts/_default/list.html
diff --git a/layouts-main/_default/single.html b/layouts/_default/single.html
similarity index 100%
rename from layouts-main/_default/single.html
rename to layouts/_default/single.html
diff --git a/layouts-main/_default/summary.html b/layouts/_default/summary.html
similarity index 100%
rename from layouts-main/_default/summary.html
rename to layouts/_default/summary.html
diff --git a/layouts-main/index.html b/layouts/index.html
similarity index 100%
rename from layouts-main/index.html
rename to layouts/index.html
diff --git a/layouts-main/partials/footer.html b/layouts/partials/footer.html
similarity index 100%
rename from layouts-main/partials/footer.html
rename to layouts/partials/footer.html
diff --git a/layouts-main/partials/header.html b/layouts/partials/header.html
similarity index 100%
rename from layouts-main/partials/header.html
rename to layouts/partials/header.html