diff --git a/app/assets/javascripts/markdown-it-bundle.js b/app/assets/javascripts/markdown-it-bundle.js
index 2299af2c603..052891aaf5e 100644
--- a/app/assets/javascripts/markdown-it-bundle.js
+++ b/app/assets/javascripts/markdown-it-bundle.js
@@ -1,20 +1,20 @@
 //= require markdown-it.js
-//= require ./pretty-text/addon/engines/discourse-markdown/helpers
-//= require ./pretty-text/addon/engines/discourse-markdown/mentions
-//= require ./pretty-text/addon/engines/discourse-markdown/quotes
-//= require ./pretty-text/addon/engines/discourse-markdown/emoji
-//= require ./pretty-text/addon/engines/discourse-markdown/onebox
-//= require ./pretty-text/addon/engines/discourse-markdown/bbcode-block
-//= require ./pretty-text/addon/engines/discourse-markdown/bbcode-inline
-//= require ./pretty-text/addon/engines/discourse-markdown/code
-//= require ./pretty-text/addon/engines/discourse-markdown/category-hashtag
-//= require ./pretty-text/addon/engines/discourse-markdown/censored
-//= require ./pretty-text/addon/engines/discourse-markdown/table
-//= require ./pretty-text/addon/engines/discourse-markdown/paragraph
-//= require ./pretty-text/addon/engines/discourse-markdown/newline
-//= require ./pretty-text/addon/engines/discourse-markdown/html-img
-//= require ./pretty-text/addon/engines/discourse-markdown/text-post-process
-//= require ./pretty-text/addon/engines/discourse-markdown/upload-protocol
-//= require ./pretty-text/addon/engines/discourse-markdown/inject-line-number
-//= require ./pretty-text/addon/engines/discourse-markdown/resize-controls
-//= require ./pretty-text/addon/engines/discourse-markdown/d-wrap
+//= require ./pretty-text/engines/discourse-markdown/helpers
+//= require ./pretty-text/engines/discourse-markdown/mentions
+//= require ./pretty-text/engines/discourse-markdown/quotes
+//= require ./pretty-text/engines/discourse-markdown/emoji
+//= require ./pretty-text/engines/discourse-markdown/onebox
+//= require ./pretty-text/engines/discourse-markdown/bbcode-block
+//= require ./pretty-text/engines/discourse-markdown/bbcode-inline
+//= require ./pretty-text/engines/discourse-markdown/code
+//= require ./pretty-text/engines/discourse-markdown/category-hashtag
+//= require ./pretty-text/engines/discourse-markdown/censored
+//= require ./pretty-text/engines/discourse-markdown/table
+//= require ./pretty-text/engines/discourse-markdown/paragraph
+//= require ./pretty-text/engines/discourse-markdown/newline
+//= require ./pretty-text/engines/discourse-markdown/html-img
+//= require ./pretty-text/engines/discourse-markdown/text-post-process
+//= require ./pretty-text/engines/discourse-markdown/upload-protocol
+//= require ./pretty-text/engines/discourse-markdown/inject-line-number
+//= require ./pretty-text/engines/discourse-markdown/resize-controls
+//= require ./pretty-text/engines/discourse-markdown/d-wrap
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/bbcode-block.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/bbcode-block.js
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/bbcode-inline.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/bbcode-inline.js
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/category-hashtag.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/category-hashtag.js
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/censored.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/censored.js
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/code.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/code.js
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/d-wrap.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/d-wrap.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/d-wrap.js
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/d-wrap.js
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/emoji.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/emoji.js
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/helpers.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/helpers.js
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/html-img.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/html-img.js
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/inject-line-number.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/inject-line-number.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/inject-line-number.js
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/inject-line-number.js
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/mentions.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/mentions.js
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/newline.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/newline.js
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/onebox.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/onebox.js
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/paragraph.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/paragraph.js
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/quotes.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/quotes.js
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/resize-controls.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/resize-controls.js
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/table.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/table.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/table.js
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/table.js
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/text-post-process.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/text-post-process.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/text-post-process.js
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/text-post-process.js
diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/upload-protocol.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js
similarity index 100%
rename from app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/upload-protocol.js
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/upload-protocol.js