diff --git a/README.md b/README.md
index 3aa9ab4d60201e80d66c1859c1e7b80f2abd1d0f..e1a1ec045c41f6c89f527dc62d15916e7eb5101b 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,6 @@ A unique, online mentorship programme conceptualized and organized by Free Softw
 Free Software Camp is a mentorship programme for bringing more people to Free Software with strong focus on philosophy. We connect learners with experienced Free Software community members to work on some tasks together - this could be either technical or non technical.
 
 This repo contains the website and resources related to Free Software Camp.
-- *website* : This folder consists the source code of the camp.fsf.org.in website. Instructions to develop and build the website is given in the README.md file in the website folder.
-- *Poster* : Consists of Promotional for Free Software Camp
-- *Scripts* : Consist of some useful Scripts
+- **website** : This folder consists the source code of the camp.fsf.org.in website. Instructions to develop and build the website is given in the README.md file in the website folder.
+- **poster** : Consists of Promotional for Free Software Camp
+- **scripts** : Consist of some useful Scripts
diff --git a/content/welcome-mentors.md b/content/welcome-mentors.md
deleted file mode 100644
index 5e7fb7d5f5541b972417cad90a22787bcc65705e..0000000000000000000000000000000000000000
--- a/content/welcome-mentors.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-title: "Welcome Mentor"
-date: 2020-09-29T00:38:53+05:30
-slug: welcome-mentors
----
-Dear Mentor,
-
-\
-\
-
-We have received your application to join Free Software Camp 2020 organized by Free Software Foundation of India and Free Software Community of India. Please read this email and take necessary steps to complete your application.
-
-1) Make sure you have read the [code of conduct](https://camp.fsf.org.in/coc.html)
-2) Add your project ideas to this [wiki page](https://git.fosscommunity.in/fsfi/camp/-/wikis/ideas-list) (contact us with your git.fosscommunity.in username for getting access to edit the wiki page)
-3) Consider subscribing to our low volume announcement [mailing list](https://lists.fsci.in/postorius/lists/camp-announce.mm.gnu.org.in/) or following us on [mastodon/fediverse](https://social.masto.host/@fscamp) for updates regarding the camp and join in the conversation on [matrix](https://matrix.to/#/#fscamp:poddery.com) using any of the matrix powered apps like Element. If new to using matrix, you can sign up for accounts by following instructions at [chat.feneas.org](https://chat.feneas.org), [chat.tchncs.de](https://chat.tchncs.de) or [chat.privacytools.io](https://chat.privacytools.io), instead of using matrix.org which will help to reduce their server load.
-
-You can reach out to us on camp at mm.gnu.org.in for any queries or concerns.
-
-
-Regards,
-
-\
-\
-
-Free Software Camp Organizing Team
diff --git a/content/welcome.md b/content/welcome.md
deleted file mode 100644
index b30f02f327110c4fa08702f83e9ce1b8c6394f9c..0000000000000000000000000000000000000000
--- a/content/welcome.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-title: "Welcome Learner"
-date: 2020-09-29T00:38:53+05:30
-slug: welcome
----
-Dear Learner,  
-
-\
-\
-
-We have received your application to join Free Software Camp 2020 organized by Free Software Foundation of India and Free Software Community of India. Please read this email and take necessary steps to complete your application.
-
-1.  Make sure you have read the [code of conduct](https://camp.fsf.org.in/coc.html).
-2.  Make sure you take the learners' [survey](https://ee.kobotoolbox.org/single/nxw4UE3B) that indicates to us your preferred language for sessions.
-3.  Consider subscribing to our low volume announcement [mailing list](https://lists.fsci.in/postorius/lists/camp-announce.mm.gnu.org.in/) or following us on [mastodon/fediverse](https://social.masto.host/@fscamp) for updates regarding the camp and join in the conversation on [matrix](https://matrix.to/#/#fscamp:poddery.com) using any of the matrix powered apps like Element.
-4.  If your age is below 15, please contact us at camp at mm.gnu.org.in
-
-If you are new to these terms, here is an explanation:
-
-## Mailing list:
-
-A mail send to a mailing list is distributed to all members, so when we send an email to camp-announce mailing list, all of you will get a copy of the mail.
-
-We have sent you an invitation to join the camp-announce mailing list, but Gmail seems to be marking it as spam even though we have correct DKIM and SPF records (these are standards for authenticating emails) for our emails. If you mark the invitation as not spam, it may help new people receive the mail in their inbox.
-
-## Mastodon/Fediverse:
-
-Mastodon is a Free Software to create a social media service similar to Twitter in features. Unlike twitter, mastodon is not controlled by a single company. Many people and organizations around the world run their own mastodon services which are referred to as instances and users of any of these instances can interact with users of any other instance. Additionally there are other software interoperable with mastodon and all of it together constitute the fediverse. Some other software part of the Fediverse are Pleroma, Friendica, Peertube, Pixelfed etc.
-
-## Matrix/Element:
-
-Matrix is a communication protocol for sharing instant messages, photos, files and audio/video calls. Element is most feature-complete app for Matrix protocol and is available on smart phones and laptop/desktop. Matrix has a similar decentralized architecture to mastodon, where different people and organizations provide an interoperable network of home servers (similar to an instance of mastodon). If you are new to using matrix, you can sign up for accounts by following instructions at [https://chat.feneas.org](https://chat.feneas.org), [https://chat.tchncs.de](https://chat.tchncs.de) or [https://chat.privacytools.io](https://chat.privacytools.io), instead of using matrix.org which will help to reduce their server load.
-
-You can reach out to us by mailing to camp at mm.gnu.org.in for any queries or concerns.
-
-\
-\
-
-Regards,  
-
-Free Software Camp Organizing Team
diff --git a/Posters/FSFCamp.png b/posters/FSFCamp.png
similarity index 100%
rename from Posters/FSFCamp.png
rename to posters/FSFCamp.png
diff --git a/Posters/FSFCamp_Banner.png b/posters/FSFCamp_Banner.png
similarity index 100%
rename from Posters/FSFCamp_Banner.png
rename to posters/FSFCamp_Banner.png
diff --git a/Posters/FSFCamp_Banner.svg b/posters/FSFCamp_Banner.svg
similarity index 100%
rename from Posters/FSFCamp_Banner.svg
rename to posters/FSFCamp_Banner.svg
diff --git a/Posters/FSFCamp_V1.svg b/posters/FSFCamp_V1.svg
similarity index 100%
rename from Posters/FSFCamp_V1.svg
rename to posters/FSFCamp_V1.svg
diff --git a/Posters/FSFCamp_V2.0.svg b/posters/FSFCamp_V2.0.svg
similarity index 100%
rename from Posters/FSFCamp_V2.0.svg
rename to posters/FSFCamp_V2.0.svg
diff --git a/Posters/FSFCamp_V3.0.svg b/posters/FSFCamp_V3.0.svg
similarity index 100%
rename from Posters/FSFCamp_V3.0.svg
rename to posters/FSFCamp_V3.0.svg
diff --git a/Posters/FSFCamp_V3.1.svg b/posters/FSFCamp_V3.1.svg
similarity index 100%
rename from Posters/FSFCamp_V3.1.svg
rename to posters/FSFCamp_V3.1.svg
diff --git a/Posters/FSFCamp_V3.2.svg b/posters/FSFCamp_V3.2.svg
similarity index 100%
rename from Posters/FSFCamp_V3.2.svg
rename to posters/FSFCamp_V3.2.svg
diff --git a/Scripts/.gitkeep b/scripts/.gitkeep
similarity index 100%
rename from Scripts/.gitkeep
rename to scripts/.gitkeep
diff --git a/Scripts/generate-site b/scripts/generate-site
similarity index 100%
rename from Scripts/generate-site
rename to scripts/generate-site
diff --git a/scripts/make.sh b/scripts/make.sh
new file mode 100755
index 0000000000000000000000000000000000000000..30e88e4f19f9e1553741340d91b3150dcab76f8f
--- /dev/null
+++ b/scripts/make.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+# A simple script to run hugo and copy output files to the production branch
+
+set -e
+
+cd `git rev-parse --show-toplevel`
+cd website
+hugo
+cd ..
+git checkout production
+cp -r website/public/* .
+rm -rf website
diff --git a/Scripts/sendmail.sh b/scripts/sendmail.sh
similarity index 100%
rename from Scripts/sendmail.sh
rename to scripts/sendmail.sh
diff --git a/website/content/about.md b/website/content/about.md
deleted file mode 100644
index f49aec5cc51eace941ce3656a4bce51c9d03191a..0000000000000000000000000000000000000000
--- a/website/content/about.md
+++ /dev/null
@@ -1,25 +0,0 @@
-+++
-title = "About"
-description = "Hugo, the world's fastest framework for building websites"
-date = "2019-02-28"
-aliases = ["about-us", "about-hugo", "contact"]
-author = "Hugo Authors"
-+++
-
-Written in Go, Hugo is an open source static site generator available under the [Apache Licence 2.0.](https://github.com/gohugoio/hugo/blob/master/LICENSE) Hugo supports TOML, YAML and JSON data file types, Markdown and HTML content files and uses shortcodes to add rich content. Other notable features are taxonomies, multilingual mode, image processing, custom output formats, HTML/CSS/JS minification and support for Sass SCSS workflows.
-
-Hugo makes use of a variety of open source projects including:
-
-* https://github.com/yuin/goldmark
-* https://github.com/alecthomas/chroma
-* https://github.com/muesli/smartcrop
-* https://github.com/spf13/cobra
-* https://github.com/spf13/viper
-
-Hugo is ideal for blogs, corporate websites, creative portfolios, online magazines, single page applications or even a website with thousands of pages.
-
-Hugo is for people who want to hand code their own website without worrying about setting up complicated runtimes, dependencies and databases.
-
-Websites built with Hugo are extremelly fast, secure and can be deployed anywhere including, AWS, GitHub Pages, Heroku, Netlify and any other hosting provider.
-
-Learn more and contribute on [GitHub](https://github.com/gohugoio).
diff --git a/website/content/archives.md b/website/content/archives.md
deleted file mode 100644
index db16eed90c9961609defd28cadf13092f53da11a..0000000000000000000000000000000000000000
--- a/website/content/archives.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-date: 2019-05-28
-type: section
-layout: "archives"
----
diff --git a/website/content/welcome-mentor.md b/website/content/welcome-mentor.md
deleted file mode 100644
index 664bf5e470b0981010f81c4dde4f34dae4723bde..0000000000000000000000000000000000000000
--- a/website/content/welcome-mentor.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-title: "Welcome Mentors"
-date: 2020-09-29T00:38:53+05:30
-slug: welcome-mentors
-aliases:
-    - /welcome-mentor
----
-
-Dear Mentor,
-
-\
-\
-
-We have received your application to join Free Software Camp 2020 organized by Free Software Foundation of India and Free Software Community of India. Please read this email and take necessary steps to complete your application.
-
-1. Make sure you have read the code of conduct
-2. Add your project ideas to this wiki page (contact us with your git.fosscommunity.in username for getting access to edit the wiki page)
-3. Consider subscribing to our low volume announcement mailing list or following us on mastodon/fediverse for updates regarding the camp and join in the conversation on matrix using any of the matrix powered apps like Element. If new to using matrix, you can sign up for accounts by following instructions at chat.feneas.org, chat.tchncs.de or chat.privacytools.io, instead of using matrix.org which will help to reduce their server load.
-
-
-You can reach out to us on camp at mm.gnu.org.in for any queries or concerns.
-
-
-\
-\
-
-Regards,
-
-
-Free Software Camp Organizing Team
diff --git a/website/content/welcome-mentors.md b/website/content/welcome-mentors.md
index 1c05baaf801e70db8aa62e438102abd4fef9ec0e..041ba13363315c4f3334c09a60c3005d64ae51c5 100644
--- a/website/content/welcome-mentors.md
+++ b/website/content/welcome-mentors.md
@@ -2,24 +2,18 @@
 title: "Welcome Mentor"
 date: 2020-09-29T00:38:53+05:30
 slug: welcome-mentors
+aliases:
+    - /welcome-mentor
 ---
 Dear Mentor,
-
-\
-\
-
+<br><br>
 We have received your application to join Free Software Camp 2020 organized by Free Software Foundation of India and Free Software Community of India. Please read this email and take necessary steps to complete your application.
 
-1) Make sure you have read the [code of conduct](https://camp.fsf.org.in/coc)
-2) Add your project ideas to this [wiki page](https://git.fosscommunity.in/fsfi/camp/-/wikis/ideas-list) (contact us with your git.fosscommunity.in username for getting access to edit the wiki page)
-3) Consider subscribing to our low volume announcement [mailing list](https://lists.fsci.in/postorius/lists/camp-announce.mm.gnu.org.in/) or following us on [mastodon/fediverse](https://social.masto.host/@fscamp) for updates regarding the camp and join in the conversation on [matrix](https://matrix.to/#/#fscamp:poddery.com) using any of the matrix powered apps like Element. If new to using matrix, you can sign up for accounts by following instructions at [chat.feneas.org](https://chat.feneas.org), [chat.tchncs.de](https://chat.tchncs.de) or [chat.privacytools.io](https://chat.privacytools.io), instead of using matrix.org which will help to reduce their server load.
+1. Make sure you have read the [code of conduct](https://camp.fsf.org.in/coc)
+1. Add your project ideas to this [wiki page](https://git.fosscommunity.in/fsfi/camp/-/wikis/ideas-list) (contact us with your git.fosscommunity.in username for getting access to edit the wiki page)
+1. Consider subscribing to our low volume announcement [mailing list](https://lists.fsci.in/postorius/lists/camp-announce.mm.gnu.org.in/) or following us on [mastodon/fediverse](https://social.masto.host/@fscamp) for updates regarding the camp and join in the conversation on [matrix](https://matrix.to/#/#fscamp:poddery.com) using any of the matrix powered apps like Element. If new to using matrix, you can sign up for accounts by following instructions at [chat.feneas.org](https://chat.feneas.org), [chat.tchncs.de](https://chat.tchncs.de) or [chat.privacytools.io](https://chat.privacytools.io), instead of using matrix.org which will help to reduce their server load.
 
 You can reach out to us on camp at mm.gnu.org.in for any queries or concerns.
-
-
+<br><br>
 Regards,
-
-\
-\
-
 Free Software Camp Organizing Team