diff --git a/assets/javascripts/discourse/adplugin-route-map.js b/admin/assets/javascripts/discourse/adplugin-route-map.js
similarity index 100%
rename from assets/javascripts/discourse/adplugin-route-map.js
rename to admin/assets/javascripts/discourse/adplugin-route-map.js
diff --git a/assets/javascripts/discourse/components/house-ads-chooser.js b/admin/assets/javascripts/discourse/components/house-ads-chooser.js
similarity index 100%
rename from assets/javascripts/discourse/components/house-ads-chooser.js
rename to admin/assets/javascripts/discourse/components/house-ads-chooser.js
diff --git a/assets/javascripts/discourse/templates/components/house-ads-list-setting.hbs b/admin/assets/javascripts/discourse/components/house-ads-list-setting.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/components/house-ads-list-setting.hbs
rename to admin/assets/javascripts/discourse/components/house-ads-list-setting.hbs
diff --git a/assets/javascripts/discourse/components/house-ads-list-setting.js b/admin/assets/javascripts/discourse/components/house-ads-list-setting.js
similarity index 100%
rename from assets/javascripts/discourse/components/house-ads-list-setting.js
rename to admin/assets/javascripts/discourse/components/house-ads-list-setting.js
diff --git a/assets/javascripts/discourse/templates/components/house-ads-setting.hbs b/admin/assets/javascripts/discourse/components/house-ads-setting.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/components/house-ads-setting.hbs
rename to admin/assets/javascripts/discourse/components/house-ads-setting.hbs
diff --git a/assets/javascripts/discourse/components/house-ads-setting.js b/admin/assets/javascripts/discourse/components/house-ads-setting.js
similarity index 100%
rename from assets/javascripts/discourse/components/house-ads-setting.js
rename to admin/assets/javascripts/discourse/components/house-ads-setting.js
diff --git a/assets/javascripts/discourse/controllers/admin-plugins-house-ads-index.js b/admin/assets/javascripts/discourse/controllers/admin-plugins-house-ads-index.js
similarity index 100%
rename from assets/javascripts/discourse/controllers/admin-plugins-house-ads-index.js
rename to admin/assets/javascripts/discourse/controllers/admin-plugins-house-ads-index.js
diff --git a/assets/javascripts/discourse/controllers/admin-plugins-house-ads-show.js b/admin/assets/javascripts/discourse/controllers/admin-plugins-house-ads-show.js
similarity index 100%
rename from assets/javascripts/discourse/controllers/admin-plugins-house-ads-show.js
rename to admin/assets/javascripts/discourse/controllers/admin-plugins-house-ads-show.js
diff --git a/assets/javascripts/discourse/controllers/admin-plugins-house-ads.js b/admin/assets/javascripts/discourse/controllers/admin-plugins-house-ads.js
similarity index 100%
rename from assets/javascripts/discourse/controllers/admin-plugins-house-ads.js
rename to admin/assets/javascripts/discourse/controllers/admin-plugins-house-ads.js
diff --git a/assets/javascripts/discourse/routes/admin-plugins-house-ads-index.js b/admin/assets/javascripts/discourse/routes/admin-plugins-house-ads-index.js
similarity index 100%
rename from assets/javascripts/discourse/routes/admin-plugins-house-ads-index.js
rename to admin/assets/javascripts/discourse/routes/admin-plugins-house-ads-index.js
diff --git a/assets/javascripts/discourse/routes/admin-plugins-house-ads-show.js b/admin/assets/javascripts/discourse/routes/admin-plugins-house-ads-show.js
similarity index 100%
rename from assets/javascripts/discourse/routes/admin-plugins-house-ads-show.js
rename to admin/assets/javascripts/discourse/routes/admin-plugins-house-ads-show.js
diff --git a/assets/javascripts/discourse/routes/admin-plugins-house-ads.js b/admin/assets/javascripts/discourse/routes/admin-plugins-house-ads.js
similarity index 100%
rename from assets/javascripts/discourse/routes/admin-plugins-house-ads.js
rename to admin/assets/javascripts/discourse/routes/admin-plugins-house-ads.js
diff --git a/assets/javascripts/discourse/templates/admin/plugins-house-ads-index.hbs b/admin/assets/javascripts/discourse/templates/admin/plugins-house-ads-index.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/admin/plugins-house-ads-index.hbs
rename to admin/assets/javascripts/discourse/templates/admin/plugins-house-ads-index.hbs
diff --git a/assets/javascripts/discourse/templates/admin/plugins-house-ads-show.hbs b/admin/assets/javascripts/discourse/templates/admin/plugins-house-ads-show.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/admin/plugins-house-ads-show.hbs
rename to admin/assets/javascripts/discourse/templates/admin/plugins-house-ads-show.hbs
diff --git a/assets/javascripts/discourse/templates/admin/plugins-house-ads.hbs b/admin/assets/javascripts/discourse/templates/admin/plugins-house-ads.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/admin/plugins-house-ads.hbs
rename to admin/assets/javascripts/discourse/templates/admin/plugins-house-ads.hbs
diff --git a/assets/javascripts/discourse/templates/components/ad-slot.hbs b/assets/javascripts/discourse/components/ad-slot.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/components/ad-slot.hbs
rename to assets/javascripts/discourse/components/ad-slot.hbs
diff --git a/assets/javascripts/discourse/templates/components/adbutler-ad.hbs b/assets/javascripts/discourse/components/adbutler-ad.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/components/adbutler-ad.hbs
rename to assets/javascripts/discourse/components/adbutler-ad.hbs
diff --git a/assets/javascripts/discourse/templates/components/amazon-product-links.hbs b/assets/javascripts/discourse/components/amazon-product-links.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/components/amazon-product-links.hbs
rename to assets/javascripts/discourse/components/amazon-product-links.hbs
diff --git a/assets/javascripts/discourse/templates/components/carbonads-ad.hbs b/assets/javascripts/discourse/components/carbonads-ad.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/components/carbonads-ad.hbs
rename to assets/javascripts/discourse/components/carbonads-ad.hbs
diff --git a/assets/javascripts/discourse/templates/components/google-adsense.hbs b/assets/javascripts/discourse/components/google-adsense.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/components/google-adsense.hbs
rename to assets/javascripts/discourse/components/google-adsense.hbs
diff --git a/assets/javascripts/discourse/templates/components/google-dfp-ad.hbs b/assets/javascripts/discourse/components/google-dfp-ad.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/components/google-dfp-ad.hbs
rename to assets/javascripts/discourse/components/google-dfp-ad.hbs
diff --git a/assets/javascripts/discourse/templates/components/house-ad.hbs b/assets/javascripts/discourse/components/house-ad.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/components/house-ad.hbs
rename to assets/javascripts/discourse/components/house-ad.hbs
diff --git a/assets/javascripts/discourse/components/post-bottom-ad.hbs b/assets/javascripts/discourse/components/post-bottom-ad.hbs
new file mode 100644
index 0000000..b67e781
--- /dev/null
+++ b/assets/javascripts/discourse/components/post-bottom-ad.hbs
@@ -0,0 +1,5 @@
+{{ad-slot
+  placement="post-bottom"
+  category=@model.topic.category.slug
+  postNumber=@model.post_number
+}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/connectors/after-topic-list-item/discourse-adplugin.hbs b/assets/javascripts/discourse/connectors/after-topic-list-item/discourse-adplugin.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/connectors/after-topic-list-item/discourse-adplugin.hbs
rename to assets/javascripts/discourse/connectors/after-topic-list-item/discourse-adplugin.hbs
diff --git a/assets/javascripts/discourse/templates/connectors/after-topic-list-item/discourse-adplugin.js b/assets/javascripts/discourse/connectors/after-topic-list-item/discourse-adplugin.js
similarity index 100%
rename from assets/javascripts/discourse/templates/connectors/after-topic-list-item/discourse-adplugin.js
rename to assets/javascripts/discourse/connectors/after-topic-list-item/discourse-adplugin.js
diff --git a/assets/javascripts/discourse/templates/connectors/discovery-list-container-top/discourse-adplugin.hbs b/assets/javascripts/discourse/connectors/discovery-list-container-top/discourse-adplugin.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/connectors/discovery-list-container-top/discourse-adplugin.hbs
rename to assets/javascripts/discourse/connectors/discovery-list-container-top/discourse-adplugin.hbs
diff --git a/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-adplugin.hbs b/assets/javascripts/discourse/connectors/post-bottom/discourse-adplugin.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/connectors/post-bottom/discourse-adplugin.hbs
rename to assets/javascripts/discourse/connectors/post-bottom/discourse-adplugin.hbs
diff --git a/assets/javascripts/discourse/templates/connectors/topic-above-post-stream/discourse-adplugin.hbs b/assets/javascripts/discourse/connectors/topic-above-post-stream/discourse-adplugin.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/connectors/topic-above-post-stream/discourse-adplugin.hbs
rename to assets/javascripts/discourse/connectors/topic-above-post-stream/discourse-adplugin.hbs
diff --git a/assets/javascripts/discourse/templates/connectors/topic-above-suggested/discourse-adplugin.hbs b/assets/javascripts/discourse/connectors/topic-above-suggested/discourse-adplugin.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/connectors/topic-above-suggested/discourse-adplugin.hbs
rename to assets/javascripts/discourse/connectors/topic-above-suggested/discourse-adplugin.hbs
diff --git a/assets/javascripts/initializers/initialize-ad-plugin.js b/assets/javascripts/discourse/initializers/initialize-ad-plugin.js
similarity index 100%
rename from assets/javascripts/initializers/initialize-ad-plugin.js
rename to assets/javascripts/discourse/initializers/initialize-ad-plugin.js
diff --git a/assets/javascripts/discourse/templates/components/post-bottom-ad.hbs b/assets/javascripts/discourse/templates/components/post-bottom-ad.hbs
deleted file mode 100644
index b134aa9..0000000
--- a/assets/javascripts/discourse/templates/components/post-bottom-ad.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-{{ad-slot
-  placement="post-bottom"
-  category=model.topic.category.slug
-  postNumber=model.post_number
-}}
\ No newline at end of file