diff --git a/assets/javascripts/wizard-custom.js b/assets/javascripts/wizard-custom.js
index c9f332c1..250ef21b 100644
--- a/assets/javascripts/wizard-custom.js
+++ b/assets/javascripts/wizard-custom.js
@@ -1,106 +1,106 @@
-//= require discourse/lib/autocomplete
-//= require discourse/lib/utilities
-//= require discourse/lib/offset-calculator
-//= require discourse/lib/lock-on
-//= require discourse/lib/text-direction
-//= require discourse/lib/to-markdown
-//= require discourse/lib/load-script
-//= require discourse/lib/url
-//= require discourse/lib/ajax
-//= require discourse/lib/ajax-error
-//= require discourse/lib/page-visible
-//= require discourse/lib/logout
-//= require discourse/lib/render-tag
-//= require discourse/lib/notification-levels
-//= require discourse/lib/computed
-//= require discourse/lib/user-search
-//= require discourse/lib/debounce
-//= require discourse/lib/text
-//= require discourse/lib/formatter
-//= require discourse/lib/quote
-//= require discourse/lib/link-mentions
-//= require discourse/lib/link-category-hashtags
-//= require discourse/lib/category-hashtags
-//= require discourse/lib/link-tag-hashtag
-//= require discourse/lib/tag-hashtags
-//= require discourse/lib/raw-templates
-//= require discourse/lib/uploads
-//= require discourse/lib/category-tag-search
-//= require discourse/lib/intercept-click
-//= require discourse/lib/show-modal
-//= require discourse/lib/key-value-store
-//= require discourse/lib/settings
-//= require discourse/lib/user-presence
-//= require discourse/lib/hash
-//= require discourse/lib/bookmark
-//= require discourse/lib/put-cursor-at-end
-//= require discourse/lib/safari-hacks
+//= require discourse/app/lib/autocomplete
+//= require discourse/app/lib/utilities
+//= require discourse/app/lib/offset-calculator
+//= require discourse/app/lib/lock-on
+//= require discourse/app/lib/text-direction
+//= require discourse/app/lib/to-markdown
+//= require discourse/app/lib/load-script
+//= require discourse/app/lib/url
+//= require discourse/app/lib/ajax
+//= require discourse/app/lib/ajax-error
+//= require discourse/app/lib/page-visible
+//= require discourse/app/lib/logout
+//= require discourse/app/lib/render-tag
+//= require discourse/app/lib/notification-levels
+//= require discourse/app/lib/computed
+//= require discourse/app/lib/user-search
+//= require discourse/app/lib/debounce
+//= require discourse/app/lib/text
+//= require discourse/app/lib/formatter
+//= require discourse/app/lib/quote
+//= require discourse/app/lib/link-mentions
+//= require discourse/app/lib/link-category-hashtags
+//= require discourse/app/lib/category-hashtags
+//= require discourse/app/lib/link-tag-hashtag
+//= require discourse/app/lib/tag-hashtags
+//= require discourse/app/lib/raw-templates
+//= require discourse/app/lib/uploads
+//= require discourse/app/lib/category-tag-search
+//= require discourse/app/lib/intercept-click
+//= require discourse/app/lib/show-modal
+//= require discourse/app/lib/key-value-store
+//= require discourse/app/lib/settings
+//= require discourse/app/lib/user-presence
+//= require discourse/app/lib/hash
+//= require discourse/app/lib/bookmark
+//= require discourse/app/lib/put-cursor-at-end
+//= require discourse/app/lib/safari-hacks
 
-//= require discourse/mixins/singleton
+//= require discourse/app/mixins/singleton
 
-//= require discourse/adapters/rest
+//= require discourse/app/adapters/rest
 
-//= require discourse/models/login-method
-//= require discourse/models/permission-type
-//= require discourse/models/archetype
-//= require discourse/models/rest
-//= require discourse/models/site
-//= require discourse/models/category
-//= require discourse/models/session
-//= require discourse/models/post-action-type
-//= require discourse/models/trust-level
-//= require discourse/models/store
-//= require discourse/models/result-set
-//= require discourse/models/bookmark
-//= require discourse/models/user
-//= require discourse/models/user-stream
-//= require discourse/models/user-action
-//= require discourse/models/user-action-group
-//= require discourse/models/user-posts-stream
-//= require discourse/models/badge
-//= require discourse/models/badge-grouping
-//= require discourse/models/user-badge
-//= require discourse/models/topic
-//= require discourse/models/action-summary
-//= require discourse/models/user-action-stat
-//= require discourse/models/user-drafts-stream
-//= require discourse/models/user-draft
-//= require discourse/models/composer
-//= require discourse/models/draft
-//= require discourse/models/group
-//= require discourse/models/group-history
+//= require discourse/app/models/login-method
+//= require discourse/app/models/permission-type
+//= require discourse/app/models/archetype
+//= require discourse/app/models/rest
+//= require discourse/app/models/site
+//= require discourse/app/models/category
+//= require discourse/app/models/session
+//= require discourse/app/models/post-action-type
+//= require discourse/app/models/trust-level
+//= require discourse/app/models/store
+//= require discourse/app/models/result-set
+//= require discourse/app/models/bookmark
+//= require discourse/app/models/user
+//= require discourse/app/models/user-stream
+//= require discourse/app/models/user-action
+//= require discourse/app/models/user-action-group
+//= require discourse/app/models/user-posts-stream
+//= require discourse/app/models/badge
+//= require discourse/app/models/badge-grouping
+//= require discourse/app/models/user-badge
+//= require discourse/app/models/topic
+//= require discourse/app/models/action-summary
+//= require discourse/app/models/user-action-stat
+//= require discourse/app/models/user-drafts-stream
+//= require discourse/app/models/user-draft
+//= require discourse/app/models/composer
+//= require discourse/app/models/draft
+//= require discourse/app/models/group
+//= require discourse/app/models/group-history
 
-//= require discourse/helpers/category-link
-//= require discourse/helpers/user-avatar
-//= require discourse/helpers/format-username
+//= require discourse/app/helpers/category-link
+//= require discourse/app/helpers/user-avatar
+//= require discourse/app/helpers/format-username
 //= require discourse-common/helpers/component-for-collection
 //= require discourse-common/helpers/component-for-row
-//= require discourse/helpers/discourse-tag
+//= require discourse/app/helpers/discourse-tag
 
-//= require discourse/services/app-events
-//= require discourse/services/emoji-store
+//= require discourse/app/services/app-events
+//= require discourse/app/services/emoji-store
 
-//= require discourse/components/user-selector
-//= require discourse/components/conditional-loading-spinner
-//= require discourse/components/d-button
-//= require discourse/components/composer-editor
-//= require discourse/components/d-editor
-//= require discourse/components/input-tip
-//= require discourse/components/emoji-picker
-//= require discourse/components/input-tip
-//= require discourse/components/date-picker
-//= require discourse/components/text-field
+//= require discourse/app/components/user-selector
+//= require discourse/app/components/conditional-loading-spinner
+//= require discourse/app/components/d-button
+//= require discourse/app/components/composer-editor
+//= require discourse/app/components/d-editor
+//= require discourse/app/components/input-tip
+//= require discourse/app/components/emoji-picker
+//= require discourse/app/components/input-tip
+//= require discourse/app/components/date-picker
+//= require discourse/app/components/text-field
 
-//= require discourse/templates/components/conditional-loading-spinner
-//= require discourse/templates/components/d-button
-//= require discourse/templates/components/d-editor
-//= require discourse/templates/components/emoji-picker
-//= require discourse/templates/components/popup-input-tip
-//= require discourse/templates/category-tag-autocomplete
-//= require discourse/templates/emoji-selector-autocomplete
-//= require discourse/templates/user-selector-autocomplete
+//= require discourse/app/templates/components/conditional-loading-spinner
+//= require discourse/app/templates/components/d-button
+//= require discourse/app/templates/components/d-editor
+//= require discourse/app/templates/components/emoji-picker
+//= require discourse/app/templates/components/popup-input-tip
+//= require discourse/app/templates/category-tag-autocomplete
+//= require discourse/app/templates/emoji-selector-autocomplete
+//= require discourse/app/templates/user-selector-autocomplete
 
-//= require discourse/pre-initializers/sniff-capabilities
+//= require discourse/app/pre-initializers/sniff-capabilities
 
 //= require ember-addons/decorator-alias
 //= require ember-addons/macro-alias