diff --git a/skin.json b/skin.json
index a3f36cb7..fa383ac3 100644
--- a/skin.json
+++ b/skin.json
@@ -344,33 +344,33 @@
 	},
 	"ResourceModuleSkinStyles": {
 		"citizen": {
-			"+ext.echo.styles.badge": "skinStyles/extensions/echo/ext.echo.styles.badge.less",
-			"+ext.echo.ui": "skinStyles/extensions/echo/ext.echo.ui.less",
+			"+ext.echo.styles.badge": "skinStyles/extensions/Echo/ext.echo.styles.badge.less",
+			"+ext.echo.ui": "skinStyles/extensions/Echo/ext.echo.ui.less",
 
-			"+ext.flow": "skinStyles/extensions/flow/ext.flow.less",
-			"+ext.flow.styles.base": "skinStyles/extensions/flow/ext.flow.styles.base.less",
-			"+ext.flow.ui": "skinStyles/extensions/flow/ext.flow.ui.less",
+			"+ext.flow": "skinStyles/extensions/Flow/ext.flow.less",
+			"+ext.flow.styles.base": "skinStyles/extensions/Flow/ext.flow.styles.base.less",
+			"+ext.flow.ui": "skinStyles/extensions/Flow/ext.flow.ui.less",
 
-			"+ext.relatedArticles.cards": "skinStyles/extensions/related_articles/ext.relatedArticles.cards.less",
-			"+ext.relatedArticles.readMore": "skinStyles/extensions/related_articles/ext.relatedArticles.readMore.less",
+			"+ext.relatedArticles.cards": "skinStyles/extensions/RelatedArticles/ext.relatedArticles.cards.less",
+			"+ext.relatedArticles.readMore": "skinStyles/extensions/RelatedArticles/ext.relatedArticles.readMore.less",
 
-			"+ext.translate": "skinStyles/extensions/translate/ext.translate.less",
-			"+ext.translate.editor": "skinStyles/extensions/translate/ext.translate.editor.less",
-			"+ext.translate.loader": "skinStyles/extensions/translate/ext.translate.loader.less",
-			"+ext.translate.messagetable": "skinStyles/extensions/translate/ext.translate.messagetable.less",
-			"+ext.translate.special.translate": "skinStyles/extensions/translate/ext.translate.special.translate.less",
-			"+ext.translate.tag.languages": "skinStyles/extensions/translate/ext.translate.tag.languages.less",
+			"+ext.translate": "skinStyles/extensions/Translate/ext.translate.less",
+			"+ext.translate.editor": "skinStyles/extensions/Translate/ext.translate.editor.less",
+			"+ext.translate.loader": "skinStyles/extensions/Translate/ext.translate.loader.less",
+			"+ext.translate.messagetable": "skinStyles/extensions/Translate/ext.translate.messagetable.less",
+			"+ext.translate.special.translate": "skinStyles/extensions/Translate/ext.translate.special.translate.less",
+			"+ext.translate.tag.languages": "skinStyles/extensions/Translate/ext.translate.tag.languages.less",
 
-			"+ext.uls.common": "skinStyles/extensions/uls/ext.uls.common.less",
-			"+ext.uls.pt": "skinStyles/extensions/uls/ext.uls.pt.less",
+			"+ext.uls.common": "skinStyles/extensions/UniversalLanguageSelector/ext.uls.common.less",
+			"+ext.uls.pt": "skinStyles/extensions/UniversalLanguageSelector/ext.uls.pt.less",
 
-			"ext.CookieWarning.styles": "skinStyles/extensions/cookie_warning/ext.CookieWarning.styles.less",
+			"ext.CookieWarning.styles": "skinStyles/extensions/CookieWarning/ext.CookieWarning.styles.less",
 
-			"+ext.popups.main": "skinStyles/extensions/popups/ext.popups.main.less",
+			"+ext.popups.main": "skinStyles/extensions/Popups/ext.popups.main.less",
 
-			"+ext.Tabber": "skinStyles/extensions/tabber/ext.Tabber.less",
+			"+ext.Tabber": "skinStyles/extensions/Tabber/ext.Tabber.less",
 
-			"+ext.visualEditor.core": "skinStyles/extensions/visual_editor/ext.visualEditor.core.less",
+			"+ext.visualEditor.core": "skinStyles/extensions/VisualEditor/ext.visualEditor.core.less",
 
 			"+mediawiki.action.history.styles": "skinStyles/mediawiki/action/mediawiki.action.history.styles.less",
 			"+mediawiki.action.view.filepage": "skinStyles/mediawiki/action/mediawiki.action.view.filepage.less",
@@ -399,7 +399,7 @@
 			"+oojs-ui-widgets": "skinStyles/oojs/oojs-ui-widgets.less",
 			"+oojs-ui-windows": "skinStyles/oojs/oojs-ui-windows.less",
 
-			"+mmv": "skinStyles/mmv.less"
+			"+mmv": "skinStyles/extensions/MultimediaViewer/mmv.less"
 		}
 	},
 	"AutoloadClasses": {
diff --git a/skinStyles/extensions/cookie_warnings/ext.CookieWarning.styles.less b/skinStyles/extensions/CookieWarning/ext.CookieWarning.styles.less
similarity index 100%
rename from skinStyles/extensions/cookie_warnings/ext.CookieWarning.styles.less
rename to skinStyles/extensions/CookieWarning/ext.CookieWarning.styles.less
diff --git a/skinStyles/mmv.less b/skinStyles/extensions/MultimediaViewer/mmv.less
similarity index 92%
rename from skinStyles/mmv.less
rename to skinStyles/extensions/MultimediaViewer/mmv.less
index cf493d59..14c2e3db 100644
--- a/skinStyles/mmv.less
+++ b/skinStyles/extensions/MultimediaViewer/mmv.less
@@ -3,8 +3,8 @@
  * https://starcitizen.tools
 */
 
-@import '../resources/variables.less';
-@import '../resources/mixins.less';
+@import '../../resources/variables.less';
+@import '../../resources/mixins.less';
 
 .mw-mmv-image-metadata {
 	border-color: @base-80;
diff --git a/skinStyles/extensions/related_articles/ext.relatedArticles.cards.less b/skinStyles/extensions/RelatedArticles/ext.relatedArticles.cards.less
similarity index 100%
rename from skinStyles/extensions/related_articles/ext.relatedArticles.cards.less
rename to skinStyles/extensions/RelatedArticles/ext.relatedArticles.cards.less
diff --git a/skinStyles/extensions/related_articles/ext.relatedArticles.readMore.less b/skinStyles/extensions/RelatedArticles/ext.relatedArticles.readMore.less
similarity index 100%
rename from skinStyles/extensions/related_articles/ext.relatedArticles.readMore.less
rename to skinStyles/extensions/RelatedArticles/ext.relatedArticles.readMore.less
diff --git a/skinStyles/extensions/uls/ext.uls.common.less b/skinStyles/extensions/UniversalLanguageSelector/ext.uls.common.less
similarity index 100%
rename from skinStyles/extensions/uls/ext.uls.common.less
rename to skinStyles/extensions/UniversalLanguageSelector/ext.uls.common.less
diff --git a/skinStyles/extensions/uls/ext.uls.pt.less b/skinStyles/extensions/UniversalLanguageSelector/ext.uls.pt.less
similarity index 100%
rename from skinStyles/extensions/uls/ext.uls.pt.less
rename to skinStyles/extensions/UniversalLanguageSelector/ext.uls.pt.less
diff --git a/skinStyles/extensions/visual_editor/ext.visualEditor.core.less b/skinStyles/extensions/VisualEditor/ext.visualEditor.core.less
similarity index 100%
rename from skinStyles/extensions/visual_editor/ext.visualEditor.core.less
rename to skinStyles/extensions/VisualEditor/ext.visualEditor.core.less