diff --git a/style/force-wide.js b/style/force-wide/force-wide.js similarity index 100% rename from style/force-wide.js rename to style/force-wide/force-wide.js diff --git a/style/force-wide.scss b/style/force-wide/force-wide.scss similarity index 100% rename from style/force-wide.scss rename to style/force-wide/force-wide.scss diff --git a/style/navbar-override.css b/style/navbar/navbar-override.css similarity index 100% rename from style/navbar-override.css rename to style/navbar/navbar-override.css diff --git a/style/no-banner.css b/style/navbar/no-banner.css similarity index 100% rename from style/no-banner.css rename to style/navbar/no-banner.css diff --git a/style/override-navbar.js b/style/navbar/override-navbar.js similarity index 100% rename from style/override-navbar.js rename to style/navbar/override-navbar.js diff --git a/style/new-styles.js b/style/optimization/new-styles.js similarity index 100% rename from style/new-styles.js rename to style/optimization/new-styles.js diff --git a/style/old.scss b/style/optimization/old.scss similarity index 100% rename from style/old.scss rename to style/optimization/old.scss diff --git a/style/style.scss b/style/optimization/style.scss similarity index 100% rename from style/style.scss rename to style/optimization/style.scss diff --git a/touch/touch-player.js b/touch/player/touch-player.js similarity index 100% rename from touch/touch-player.js rename to touch/player/touch-player.js diff --git a/style/touch-player.scss b/touch/player/touch-player.scss similarity index 100% rename from style/touch-player.scss rename to touch/player/touch-player.scss diff --git a/style/full-tweets-title.css b/utils/full-tweets-title/full-tweets-title.css similarity index 100% rename from style/full-tweets-title.css rename to utils/full-tweets-title/full-tweets-title.css diff --git a/utils/full-tweets-title.js b/utils/full-tweets-title/full-tweets-title.js similarity index 100% rename from utils/full-tweets-title.js rename to utils/full-tweets-title/full-tweets-title.js diff --git a/utils/gui-settings.html b/utils/gui-settings/gui-settings.html similarity index 100% rename from utils/gui-settings.html rename to utils/gui-settings/gui-settings.html diff --git a/utils/gui-settings.js b/utils/gui-settings/gui-settings.js similarity index 100% rename from utils/gui-settings.js rename to utils/gui-settings/gui-settings.js diff --git a/style/gui-settings.scss b/utils/gui-settings/gui-settings.scss similarity index 100% rename from style/gui-settings.scss rename to utils/gui-settings/gui-settings.scss diff --git a/style/remove-promotions.css b/utils/remove-promotions/remove-promotions.css similarity index 100% rename from style/remove-promotions.css rename to utils/remove-promotions/remove-promotions.css diff --git a/utils/remove-promotions.js b/utils/remove-promotions/remove-promotions.js similarity index 100% rename from utils/remove-promotions.js rename to utils/remove-promotions/remove-promotions.js diff --git a/utils/toast.js b/utils/toast/toast.js similarity index 100% rename from utils/toast.js rename to utils/toast/toast.js diff --git a/style/toast.scss b/utils/toast/toast.scss similarity index 100% rename from style/toast.scss rename to utils/toast/toast.scss diff --git a/style/blur-video-control.css b/video/blur-video-control/blur-video-control.css similarity index 100% rename from style/blur-video-control.css rename to video/blur-video-control/blur-video-control.css diff --git a/video/blur-video-control.js b/video/blur-video-control/blur-video-control.js similarity index 100% rename from video/blur-video-control.js rename to video/blur-video-control/blur-video-control.js diff --git a/utils/image-viewer.html b/video/view-cover/image-viewer.html similarity index 100% rename from utils/image-viewer.html rename to video/view-cover/image-viewer.html diff --git a/style/image-viewer.scss b/video/view-cover/image-viewer.scss similarity index 100% rename from style/image-viewer.scss rename to video/view-cover/image-viewer.scss diff --git a/video/view-cover.js b/video/view-cover/view-cover.js similarity index 100% rename from video/view-cover.js rename to video/view-cover/view-cover.js