diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..13566b8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/hugoplate.iml b/.idea/hugoplate.iml
new file mode 100644
index 0000000..c956989
--- /dev/null
+++ b/.idea/hugoplate.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..323f7bc
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/hugoplate.iml" filepath="$PROJECT_DIR$/.idea/hugoplate.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/php.xml b/.idea/php.xml
new file mode 100644
index 0000000..f324872
--- /dev/null
+++ b/.idea/php.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MessDetectorOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PHPCSFixerOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PHPCodeSnifferOptionsConfiguration">
+    <option name="highlightLevel" value="WARNING" />
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PhpStanOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PsalmOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/exampleSite/assets/images/avatar-sm.png b/assets/images/avatar-sm.png
similarity index 100%
rename from exampleSite/assets/images/avatar-sm.png
rename to assets/images/avatar-sm.png
diff --git a/exampleSite/assets/images/avatar.png b/assets/images/avatar.png
similarity index 100%
rename from exampleSite/assets/images/avatar.png
rename to assets/images/avatar.png
diff --git a/exampleSite/assets/images/banner.png b/assets/images/banner.png
similarity index 100%
rename from exampleSite/assets/images/banner.png
rename to assets/images/banner.png
diff --git a/exampleSite/assets/images/call-to-action.png b/assets/images/call-to-action.png
similarity index 100%
rename from exampleSite/assets/images/call-to-action.png
rename to assets/images/call-to-action.png
diff --git a/exampleSite/assets/images/favicon.png b/assets/images/favicon.png
similarity index 100%
rename from exampleSite/assets/images/favicon.png
rename to assets/images/favicon.png
diff --git a/exampleSite/assets/images/gallery/01.jpg b/assets/images/gallery/01.jpg
similarity index 100%
rename from exampleSite/assets/images/gallery/01.jpg
rename to assets/images/gallery/01.jpg
diff --git a/exampleSite/assets/images/gallery/02.jpg b/assets/images/gallery/02.jpg
similarity index 100%
rename from exampleSite/assets/images/gallery/02.jpg
rename to assets/images/gallery/02.jpg
diff --git a/exampleSite/assets/images/gallery/03.jpg b/assets/images/gallery/03.jpg
similarity index 100%
rename from exampleSite/assets/images/gallery/03.jpg
rename to assets/images/gallery/03.jpg
diff --git a/exampleSite/assets/images/gallery/04.jpg b/assets/images/gallery/04.jpg
similarity index 100%
rename from exampleSite/assets/images/gallery/04.jpg
rename to assets/images/gallery/04.jpg
diff --git a/exampleSite/assets/images/gallery/05.jpg b/assets/images/gallery/05.jpg
similarity index 100%
rename from exampleSite/assets/images/gallery/05.jpg
rename to assets/images/gallery/05.jpg
diff --git a/exampleSite/assets/images/gallery/06.jpg b/assets/images/gallery/06.jpg
similarity index 100%
rename from exampleSite/assets/images/gallery/06.jpg
rename to assets/images/gallery/06.jpg
diff --git a/exampleSite/assets/images/image-placeholder.png b/assets/images/image-placeholder.png
similarity index 100%
rename from exampleSite/assets/images/image-placeholder.png
rename to assets/images/image-placeholder.png
diff --git a/exampleSite/assets/images/logo-darkmode.png b/assets/images/logo-darkmode.png
similarity index 100%
rename from exampleSite/assets/images/logo-darkmode.png
rename to assets/images/logo-darkmode.png
diff --git a/exampleSite/assets/images/logo.png b/assets/images/logo.png
similarity index 100%
rename from exampleSite/assets/images/logo.png
rename to assets/images/logo.png
diff --git a/exampleSite/assets/images/no-search-found.png b/assets/images/no-search-found.png
similarity index 100%
rename from exampleSite/assets/images/no-search-found.png
rename to assets/images/no-search-found.png
diff --git a/exampleSite/assets/images/service-1.png b/assets/images/service-1.png
similarity index 100%
rename from exampleSite/assets/images/service-1.png
rename to assets/images/service-1.png
diff --git a/exampleSite/assets/images/service-2.png b/assets/images/service-2.png
similarity index 100%
rename from exampleSite/assets/images/service-2.png
rename to assets/images/service-2.png
diff --git a/exampleSite/assets/images/service-3.png b/assets/images/service-3.png
similarity index 100%
rename from exampleSite/assets/images/service-3.png
rename to assets/images/service-3.png
diff --git a/assets/scss/custom.scss b/assets/scss/custom.scss
old mode 100644
new mode 100755
index 6dc68fe..9685904
--- a/assets/scss/custom.scss
+++ b/assets/scss/custom.scss
@@ -1,2 +1 @@
-// DO NOT WRITE ANY STYLE IN THIS FILE
-// If you want to add your own styles, please write it in the `./assets/scss/custom.scss` file.
+// Add your own custom styles here
diff --git a/exampleSite/config/_default/languages.toml b/config/_default/languages.toml
similarity index 100%
rename from exampleSite/config/_default/languages.toml
rename to config/_default/languages.toml
diff --git a/exampleSite/config/_default/menus.en.toml b/config/_default/menus.en.toml
similarity index 100%
rename from exampleSite/config/_default/menus.en.toml
rename to config/_default/menus.en.toml
diff --git a/exampleSite/config/_default/module.toml b/config/_default/module.toml
similarity index 97%
rename from exampleSite/config/_default/module.toml
rename to config/_default/module.toml
index fc960d7..3b84cf2 100644
--- a/exampleSite/config/_default/module.toml
+++ b/config/_default/module.toml
@@ -2,8 +2,8 @@
 extended = true
 min = "0.115.2"
 
-[[imports]]
-path = "github.com/zeon-studio/hugoplate"
+# [[imports]]
+# path = "github.com/zeon-studio/hugoplate"
 
 [[imports]]
 path = "github.com/gethugothemes/hugo-modules/search"
diff --git a/exampleSite/config/_default/params.toml b/config/_default/params.toml
similarity index 100%
rename from exampleSite/config/_default/params.toml
rename to config/_default/params.toml
diff --git a/exampleSite/content/english/_index.md b/content/english/_index.md
similarity index 100%
rename from exampleSite/content/english/_index.md
rename to content/english/_index.md
diff --git a/exampleSite/content/english/about/_index.md b/content/english/about/_index.md
similarity index 100%
rename from exampleSite/content/english/about/_index.md
rename to content/english/about/_index.md
diff --git a/exampleSite/content/english/authors/_index.md b/content/english/authors/_index.md
similarity index 100%
rename from exampleSite/content/english/authors/_index.md
rename to content/english/authors/_index.md
diff --git a/exampleSite/content/english/authors/john-doe.md b/content/english/authors/john-doe.md
similarity index 100%
rename from exampleSite/content/english/authors/john-doe.md
rename to content/english/authors/john-doe.md
diff --git a/exampleSite/content/english/authors/sam-wilson.md b/content/english/authors/sam-wilson.md
similarity index 100%
rename from exampleSite/content/english/authors/sam-wilson.md
rename to content/english/authors/sam-wilson.md
diff --git a/exampleSite/content/english/authors/william-jacob.md b/content/english/authors/william-jacob.md
similarity index 100%
rename from exampleSite/content/english/authors/william-jacob.md
rename to content/english/authors/william-jacob.md
diff --git a/exampleSite/content/english/blog/_index.md b/content/english/blog/_index.md
similarity index 100%
rename from exampleSite/content/english/blog/_index.md
rename to content/english/blog/_index.md
diff --git a/exampleSite/content/english/blog/post-1.md b/content/english/blog/post-1.md
similarity index 100%
rename from exampleSite/content/english/blog/post-1.md
rename to content/english/blog/post-1.md
diff --git a/exampleSite/content/english/blog/post-2.md b/content/english/blog/post-2.md
similarity index 100%
rename from exampleSite/content/english/blog/post-2.md
rename to content/english/blog/post-2.md
diff --git a/exampleSite/content/english/blog/post-3.md b/content/english/blog/post-3.md
similarity index 100%
rename from exampleSite/content/english/blog/post-3.md
rename to content/english/blog/post-3.md
diff --git a/exampleSite/content/english/blog/post-4.md b/content/english/blog/post-4.md
similarity index 100%
rename from exampleSite/content/english/blog/post-4.md
rename to content/english/blog/post-4.md
diff --git a/exampleSite/content/english/contact/_index.md b/content/english/contact/_index.md
similarity index 100%
rename from exampleSite/content/english/contact/_index.md
rename to content/english/contact/_index.md
diff --git a/exampleSite/content/english/pages/elements.md b/content/english/pages/elements.md
similarity index 100%
rename from exampleSite/content/english/pages/elements.md
rename to content/english/pages/elements.md
diff --git a/exampleSite/content/english/pages/privacy-policy.md b/content/english/pages/privacy-policy.md
similarity index 100%
rename from exampleSite/content/english/pages/privacy-policy.md
rename to content/english/pages/privacy-policy.md
diff --git a/exampleSite/content/english/sections/call-to-action.md b/content/english/sections/call-to-action.md
similarity index 100%
rename from exampleSite/content/english/sections/call-to-action.md
rename to content/english/sections/call-to-action.md
diff --git a/exampleSite/content/english/sections/testimonial.md b/content/english/sections/testimonial.md
similarity index 100%
rename from exampleSite/content/english/sections/testimonial.md
rename to content/english/sections/testimonial.md
diff --git a/exampleSite/data/social.json b/data/social.json
similarity index 100%
rename from exampleSite/data/social.json
rename to data/social.json
diff --git a/exampleSite/data/theme.json b/data/theme.json
similarity index 100%
rename from exampleSite/data/theme.json
rename to data/theme.json
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 0000000..6363d49
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,11 @@
+version: '3.9'
+
+services:
+  front:
+    image: hugomods/hugo:latest
+    ports:
+      - "127.0.0.1:1313:1313"
+    volumes:
+      - ".:/src"
+    command: >
+      npm run dev
diff --git a/exampleSite/assets/scss/custom.scss b/exampleSite/assets/scss/custom.scss
deleted file mode 100755
index 9685904..0000000
--- a/exampleSite/assets/scss/custom.scss
+++ /dev/null
@@ -1 +0,0 @@
-// Add your own custom styles here
diff --git a/exampleSite/go.mod b/go.mod
similarity index 100%
rename from exampleSite/go.mod
rename to go.mod
diff --git a/exampleSite/hugo.toml b/hugo.toml
similarity index 96%
rename from exampleSite/hugo.toml
rename to hugo.toml
index 973f054..3e84f4e 100755
--- a/exampleSite/hugo.toml
+++ b/hugo.toml
@@ -4,7 +4,7 @@ baseURL = "/"
 # Title of your website (required).
 title = "Hugoplate"
 # Your theme name
-# theme = "hugoplate"
+theme = "hugoplate"
 # Default time zone for time stamps; use any valid tz database name: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List
 timeZone = "America/New_York"
 # post pagination
diff --git a/exampleSite/i18n/en.yaml b/i18n/en.yaml
similarity index 100%
rename from exampleSite/i18n/en.yaml
rename to i18n/en.yaml
diff --git a/package.json b/package.json
index 480aa9f..553e29c 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "license": "MIT",
   "author": "zeon.studio",
   "scripts": {
-    "dev": "hugo server",
+    "dev": "hugo server --bind 0.0.0.0",
     "build": "hugo --gc --minify --templateMetrics --templateMetricsHints --forceSyncStatic",
     "test": "hugo server --disableFastRender --navigateToChanged --templateMetrics --templateMetricsHints --watch --forceSyncStatic -e production --minify",
     "dev:example": "cd exampleSite; hugo server",
diff --git a/exampleSite/postcss.config.js b/postcss.config.js
similarity index 100%
rename from exampleSite/postcss.config.js
rename to postcss.config.js
diff --git a/exampleSite/tailwind.config.js b/tailwind.config.js
similarity index 100%
rename from exampleSite/tailwind.config.js
rename to tailwind.config.js
diff --git a/assets/js/main.js b/themes/hugoplate/assets/js/main.js
similarity index 100%
rename from assets/js/main.js
rename to themes/hugoplate/assets/js/main.js
diff --git a/assets/plugins/maps/google-map.js b/themes/hugoplate/assets/plugins/maps/google-map.js
similarity index 100%
rename from assets/plugins/maps/google-map.js
rename to themes/hugoplate/assets/plugins/maps/google-map.js
diff --git a/assets/plugins/swiper/swiper-bundle.css b/themes/hugoplate/assets/plugins/swiper/swiper-bundle.css
similarity index 100%
rename from assets/plugins/swiper/swiper-bundle.css
rename to themes/hugoplate/assets/plugins/swiper/swiper-bundle.css
diff --git a/assets/plugins/swiper/swiper-bundle.js b/themes/hugoplate/assets/plugins/swiper/swiper-bundle.js
similarity index 100%
rename from assets/plugins/swiper/swiper-bundle.js
rename to themes/hugoplate/assets/plugins/swiper/swiper-bundle.js
diff --git a/assets/scss/base.scss b/themes/hugoplate/assets/scss/base.scss
similarity index 100%
rename from assets/scss/base.scss
rename to themes/hugoplate/assets/scss/base.scss
diff --git a/assets/scss/buttons.scss b/themes/hugoplate/assets/scss/buttons.scss
similarity index 100%
rename from assets/scss/buttons.scss
rename to themes/hugoplate/assets/scss/buttons.scss
diff --git a/assets/scss/components.scss b/themes/hugoplate/assets/scss/components.scss
similarity index 100%
rename from assets/scss/components.scss
rename to themes/hugoplate/assets/scss/components.scss
diff --git a/themes/hugoplate/assets/scss/custom.scss b/themes/hugoplate/assets/scss/custom.scss
new file mode 100644
index 0000000..6dc68fe
--- /dev/null
+++ b/themes/hugoplate/assets/scss/custom.scss
@@ -0,0 +1,2 @@
+// DO NOT WRITE ANY STYLE IN THIS FILE
+// If you want to add your own styles, please write it in the `./assets/scss/custom.scss` file.
diff --git a/assets/scss/main.scss b/themes/hugoplate/assets/scss/main.scss
similarity index 100%
rename from assets/scss/main.scss
rename to themes/hugoplate/assets/scss/main.scss
diff --git a/assets/scss/module-overrides.scss b/themes/hugoplate/assets/scss/module-overrides.scss
similarity index 100%
rename from assets/scss/module-overrides.scss
rename to themes/hugoplate/assets/scss/module-overrides.scss
diff --git a/assets/scss/navigation.scss b/themes/hugoplate/assets/scss/navigation.scss
similarity index 100%
rename from assets/scss/navigation.scss
rename to themes/hugoplate/assets/scss/navigation.scss
diff --git a/assets/scss/utilities.scss b/themes/hugoplate/assets/scss/utilities.scss
similarity index 100%
rename from assets/scss/utilities.scss
rename to themes/hugoplate/assets/scss/utilities.scss
diff --git a/layouts/404.html b/themes/hugoplate/layouts/404.html
similarity index 100%
rename from layouts/404.html
rename to themes/hugoplate/layouts/404.html
diff --git a/layouts/_default/baseof.html b/themes/hugoplate/layouts/_default/baseof.html
similarity index 100%
rename from layouts/_default/baseof.html
rename to themes/hugoplate/layouts/_default/baseof.html
diff --git a/layouts/_default/list.html b/themes/hugoplate/layouts/_default/list.html
similarity index 100%
rename from layouts/_default/list.html
rename to themes/hugoplate/layouts/_default/list.html
diff --git a/layouts/_default/single.html b/themes/hugoplate/layouts/_default/single.html
similarity index 100%
rename from layouts/_default/single.html
rename to themes/hugoplate/layouts/_default/single.html
diff --git a/layouts/_default/taxonomy.html b/themes/hugoplate/layouts/_default/taxonomy.html
similarity index 100%
rename from layouts/_default/taxonomy.html
rename to themes/hugoplate/layouts/_default/taxonomy.html
diff --git a/layouts/_default/terms.html b/themes/hugoplate/layouts/_default/terms.html
similarity index 100%
rename from layouts/_default/terms.html
rename to themes/hugoplate/layouts/_default/terms.html
diff --git a/layouts/about/list.html b/themes/hugoplate/layouts/about/list.html
similarity index 100%
rename from layouts/about/list.html
rename to themes/hugoplate/layouts/about/list.html
diff --git a/layouts/authors/list.html b/themes/hugoplate/layouts/authors/list.html
similarity index 100%
rename from layouts/authors/list.html
rename to themes/hugoplate/layouts/authors/list.html
diff --git a/layouts/authors/single.html b/themes/hugoplate/layouts/authors/single.html
similarity index 100%
rename from layouts/authors/single.html
rename to themes/hugoplate/layouts/authors/single.html
diff --git a/layouts/blog/list.html b/themes/hugoplate/layouts/blog/list.html
similarity index 100%
rename from layouts/blog/list.html
rename to themes/hugoplate/layouts/blog/list.html
diff --git a/layouts/blog/single.html b/themes/hugoplate/layouts/blog/single.html
similarity index 100%
rename from layouts/blog/single.html
rename to themes/hugoplate/layouts/blog/single.html
diff --git a/layouts/contact/list.html b/themes/hugoplate/layouts/contact/list.html
similarity index 100%
rename from layouts/contact/list.html
rename to themes/hugoplate/layouts/contact/list.html
diff --git a/layouts/index.html b/themes/hugoplate/layouts/index.html
similarity index 100%
rename from layouts/index.html
rename to themes/hugoplate/layouts/index.html
diff --git a/layouts/partials/call-to-action.html b/themes/hugoplate/layouts/partials/call-to-action.html
similarity index 100%
rename from layouts/partials/call-to-action.html
rename to themes/hugoplate/layouts/partials/call-to-action.html
diff --git a/layouts/partials/components/author-card.html b/themes/hugoplate/layouts/partials/components/author-card.html
similarity index 100%
rename from layouts/partials/components/author-card.html
rename to themes/hugoplate/layouts/partials/components/author-card.html
diff --git a/layouts/partials/components/blog-card.html b/themes/hugoplate/layouts/partials/components/blog-card.html
similarity index 100%
rename from layouts/partials/components/blog-card.html
rename to themes/hugoplate/layouts/partials/components/blog-card.html
diff --git a/layouts/partials/components/breadcrumb.html b/themes/hugoplate/layouts/partials/components/breadcrumb.html
similarity index 100%
rename from layouts/partials/components/breadcrumb.html
rename to themes/hugoplate/layouts/partials/components/breadcrumb.html
diff --git a/layouts/partials/components/language-switcher.html b/themes/hugoplate/layouts/partials/components/language-switcher.html
similarity index 100%
rename from layouts/partials/components/language-switcher.html
rename to themes/hugoplate/layouts/partials/components/language-switcher.html
diff --git a/layouts/partials/components/pagination.html b/themes/hugoplate/layouts/partials/components/pagination.html
similarity index 100%
rename from layouts/partials/components/pagination.html
rename to themes/hugoplate/layouts/partials/components/pagination.html
diff --git a/layouts/partials/components/theme-switcher.html b/themes/hugoplate/layouts/partials/components/theme-switcher.html
similarity index 100%
rename from layouts/partials/components/theme-switcher.html
rename to themes/hugoplate/layouts/partials/components/theme-switcher.html
diff --git a/layouts/partials/components/tw-size-indicator.html b/themes/hugoplate/layouts/partials/components/tw-size-indicator.html
similarity index 100%
rename from layouts/partials/components/tw-size-indicator.html
rename to themes/hugoplate/layouts/partials/components/tw-size-indicator.html
diff --git a/layouts/partials/essentials/footer.html b/themes/hugoplate/layouts/partials/essentials/footer.html
similarity index 100%
rename from layouts/partials/essentials/footer.html
rename to themes/hugoplate/layouts/partials/essentials/footer.html
diff --git a/layouts/partials/essentials/head.html b/themes/hugoplate/layouts/partials/essentials/head.html
similarity index 100%
rename from layouts/partials/essentials/head.html
rename to themes/hugoplate/layouts/partials/essentials/head.html
diff --git a/layouts/partials/essentials/header.html b/themes/hugoplate/layouts/partials/essentials/header.html
similarity index 100%
rename from layouts/partials/essentials/header.html
rename to themes/hugoplate/layouts/partials/essentials/header.html
diff --git a/layouts/partials/essentials/script.html b/themes/hugoplate/layouts/partials/essentials/script.html
similarity index 100%
rename from layouts/partials/essentials/script.html
rename to themes/hugoplate/layouts/partials/essentials/script.html
diff --git a/layouts/partials/essentials/style.html b/themes/hugoplate/layouts/partials/essentials/style.html
similarity index 100%
rename from layouts/partials/essentials/style.html
rename to themes/hugoplate/layouts/partials/essentials/style.html
diff --git a/layouts/partials/page-header.html b/themes/hugoplate/layouts/partials/page-header.html
similarity index 100%
rename from layouts/partials/page-header.html
rename to themes/hugoplate/layouts/partials/page-header.html
diff --git a/layouts/partials/widgets/categories.html b/themes/hugoplate/layouts/partials/widgets/categories.html
similarity index 100%
rename from layouts/partials/widgets/categories.html
rename to themes/hugoplate/layouts/partials/widgets/categories.html
diff --git a/layouts/partials/widgets/tags.html b/themes/hugoplate/layouts/partials/widgets/tags.html
similarity index 100%
rename from layouts/partials/widgets/tags.html
rename to themes/hugoplate/layouts/partials/widgets/tags.html
diff --git a/layouts/partials/widgets/widget-wrapper.html b/themes/hugoplate/layouts/partials/widgets/widget-wrapper.html
similarity index 100%
rename from layouts/partials/widgets/widget-wrapper.html
rename to themes/hugoplate/layouts/partials/widgets/widget-wrapper.html