diff --git a/collapsibleTabs.js b/resources/skins.vector.js/collapsibleTabs.js
similarity index 100%
rename from collapsibleTabs.js
rename to resources/skins.vector.js/collapsibleTabs.js
diff --git a/vector.js b/resources/skins.vector.js/vector.js
similarity index 100%
rename from vector.js
rename to resources/skins.vector.js/vector.js
diff --git a/responsive.less b/resources/skins.vector.styles.responsive.less
similarity index 100%
rename from responsive.less
rename to resources/skins.vector.styles.responsive.less
diff --git a/components/common.less b/resources/skins.vector.styles/common.less
similarity index 100%
rename from components/common.less
rename to resources/skins.vector.styles/common.less
diff --git a/components/externalLinks.less b/resources/skins.vector.styles/externalLinks.less
similarity index 100%
rename from components/externalLinks.less
rename to resources/skins.vector.styles/externalLinks.less
diff --git a/components/footer.less b/resources/skins.vector.styles/footer.less
similarity index 100%
rename from components/footer.less
rename to resources/skins.vector.styles/footer.less
diff --git a/images/arrow-collapsed-ltr.png b/resources/skins.vector.styles/images/arrow-collapsed-ltr.png
similarity index 100%
rename from images/arrow-collapsed-ltr.png
rename to resources/skins.vector.styles/images/arrow-collapsed-ltr.png
diff --git a/images/arrow-collapsed-rtl.png b/resources/skins.vector.styles/images/arrow-collapsed-rtl.png
similarity index 100%
rename from images/arrow-collapsed-rtl.png
rename to resources/skins.vector.styles/images/arrow-collapsed-rtl.png
diff --git a/images/arrow-down.png b/resources/skins.vector.styles/images/arrow-down.png
similarity index 100%
rename from images/arrow-down.png
rename to resources/skins.vector.styles/images/arrow-down.png
diff --git a/images/arrow-down.svg b/resources/skins.vector.styles/images/arrow-down.svg
similarity index 100%
rename from images/arrow-down.svg
rename to resources/skins.vector.styles/images/arrow-down.svg
diff --git a/images/arrow-expanded.png b/resources/skins.vector.styles/images/arrow-expanded.png
similarity index 100%
rename from images/arrow-expanded.png
rename to resources/skins.vector.styles/images/arrow-expanded.png
diff --git a/images/bullet-icon.svg b/resources/skins.vector.styles/images/bullet-icon.svg
similarity index 100%
rename from images/bullet-icon.svg
rename to resources/skins.vector.styles/images/bullet-icon.svg
diff --git a/images/external-link-ltr-icon.png b/resources/skins.vector.styles/images/external-link-ltr-icon.png
similarity index 100%
rename from images/external-link-ltr-icon.png
rename to resources/skins.vector.styles/images/external-link-ltr-icon.png
diff --git a/images/external-link-ltr-icon.svg b/resources/skins.vector.styles/images/external-link-ltr-icon.svg
similarity index 100%
rename from images/external-link-ltr-icon.svg
rename to resources/skins.vector.styles/images/external-link-ltr-icon.svg
diff --git a/images/external-link-rtl-icon.png b/resources/skins.vector.styles/images/external-link-rtl-icon.png
similarity index 100%
rename from images/external-link-rtl-icon.png
rename to resources/skins.vector.styles/images/external-link-rtl-icon.png
diff --git a/images/external-link-rtl-icon.svg b/resources/skins.vector.styles/images/external-link-rtl-icon.svg
similarity index 100%
rename from images/external-link-rtl-icon.svg
rename to resources/skins.vector.styles/images/external-link-rtl-icon.svg
diff --git a/images/link-icon.png b/resources/skins.vector.styles/images/link-icon.png
similarity index 100%
rename from images/link-icon.png
rename to resources/skins.vector.styles/images/link-icon.png
diff --git a/images/magnify-clip.png b/resources/skins.vector.styles/images/magnify-clip.png
similarity index 100%
rename from images/magnify-clip.png
rename to resources/skins.vector.styles/images/magnify-clip.png
diff --git a/images/portal-separator.png b/resources/skins.vector.styles/images/portal-separator.png
similarity index 100%
rename from images/portal-separator.png
rename to resources/skins.vector.styles/images/portal-separator.png
diff --git a/images/search-fade.png b/resources/skins.vector.styles/images/search-fade.png
similarity index 100%
rename from images/search-fade.png
rename to resources/skins.vector.styles/images/search-fade.png
diff --git a/images/search.png b/resources/skins.vector.styles/images/search.png
similarity index 100%
rename from images/search.png
rename to resources/skins.vector.styles/images/search.png
diff --git a/images/search.svg b/resources/skins.vector.styles/images/search.svg
similarity index 100%
rename from images/search.svg
rename to resources/skins.vector.styles/images/search.svg
diff --git a/images/tab-current-fade.png b/resources/skins.vector.styles/images/tab-current-fade.png
similarity index 100%
rename from images/tab-current-fade.png
rename to resources/skins.vector.styles/images/tab-current-fade.png
diff --git a/images/tab-normal-fade.png b/resources/skins.vector.styles/images/tab-normal-fade.png
similarity index 100%
rename from images/tab-normal-fade.png
rename to resources/skins.vector.styles/images/tab-normal-fade.png
diff --git a/images/tab-separator.png b/resources/skins.vector.styles/images/tab-separator.png
similarity index 100%
rename from images/tab-separator.png
rename to resources/skins.vector.styles/images/tab-separator.png
diff --git a/images/unwatch-icon-hl.png b/resources/skins.vector.styles/images/unwatch-icon-hl.png
similarity index 100%
rename from images/unwatch-icon-hl.png
rename to resources/skins.vector.styles/images/unwatch-icon-hl.png
diff --git a/images/unwatch-icon-hl.svg b/resources/skins.vector.styles/images/unwatch-icon-hl.svg
similarity index 100%
rename from images/unwatch-icon-hl.svg
rename to resources/skins.vector.styles/images/unwatch-icon-hl.svg
diff --git a/images/unwatch-icon.png b/resources/skins.vector.styles/images/unwatch-icon.png
similarity index 100%
rename from images/unwatch-icon.png
rename to resources/skins.vector.styles/images/unwatch-icon.png
diff --git a/images/unwatch-icon.svg b/resources/skins.vector.styles/images/unwatch-icon.svg
similarity index 100%
rename from images/unwatch-icon.svg
rename to resources/skins.vector.styles/images/unwatch-icon.svg
diff --git a/images/user-avatar.png b/resources/skins.vector.styles/images/user-avatar.png
similarity index 100%
rename from images/user-avatar.png
rename to resources/skins.vector.styles/images/user-avatar.png
diff --git a/images/user-avatar.svg b/resources/skins.vector.styles/images/user-avatar.svg
similarity index 100%
rename from images/user-avatar.svg
rename to resources/skins.vector.styles/images/user-avatar.svg
diff --git a/images/watch-icon-hl.png b/resources/skins.vector.styles/images/watch-icon-hl.png
similarity index 100%
rename from images/watch-icon-hl.png
rename to resources/skins.vector.styles/images/watch-icon-hl.png
diff --git a/images/watch-icon-hl.svg b/resources/skins.vector.styles/images/watch-icon-hl.svg
similarity index 100%
rename from images/watch-icon-hl.svg
rename to resources/skins.vector.styles/images/watch-icon-hl.svg
diff --git a/images/watch-icon-loading.svg b/resources/skins.vector.styles/images/watch-icon-loading.svg
similarity index 100%
rename from images/watch-icon-loading.svg
rename to resources/skins.vector.styles/images/watch-icon-loading.svg
diff --git a/images/watch-icon.png b/resources/skins.vector.styles/images/watch-icon.png
similarity index 100%
rename from images/watch-icon.png
rename to resources/skins.vector.styles/images/watch-icon.png
diff --git a/images/watch-icon.svg b/resources/skins.vector.styles/images/watch-icon.svg
similarity index 100%
rename from images/watch-icon.svg
rename to resources/skins.vector.styles/images/watch-icon.svg
diff --git a/components/navigation.less b/resources/skins.vector.styles/navigation.less
similarity index 100%
rename from components/navigation.less
rename to resources/skins.vector.styles/navigation.less
diff --git a/components/personalNavigation.less b/resources/skins.vector.styles/personalNavigation.less
similarity index 100%
rename from components/personalNavigation.less
rename to resources/skins.vector.styles/personalNavigation.less
diff --git a/print.less b/resources/skins.vector.styles/print.less
similarity index 99%
rename from print.less
rename to resources/skins.vector.styles/print.less
index 97ab23d..638e915 100644
--- a/print.less
+++ b/resources/skins.vector.styles/print.less
@@ -1,4 +1,4 @@
-@import 'variables.less';
+@import '../../variables.less';
 @wmui-color-base0: #000;
 
 @color-base: @wmui-color-base0;
diff --git a/screen-hd.less b/resources/skins.vector.styles/screen-hd.less
similarity index 91%
rename from screen-hd.less
rename to resources/skins.vector.styles/screen-hd.less
index e6aefb3..811b725 100644
--- a/screen-hd.less
+++ b/resources/skins.vector.styles/screen-hd.less
@@ -1,6 +1,6 @@
 /* Vector screen styles for high definition displays */
 
-@import 'variables.less';
+@import '../../variables.less';
 
 .mw-body,
 #mw-head-base,
diff --git a/resources/skins.vector.styles/screen.less b/resources/skins.vector.styles/screen.less
new file mode 100644
index 0000000..0e052d3
--- /dev/null
+++ b/resources/skins.vector.styles/screen.less
@@ -0,0 +1,7 @@
+/* Vector screen styles */
+
+@import '../../variables.less';
+@import 'common.less';
+@import 'navigation.less';
+@import 'footer.less';
+@import 'externalLinks.less';
diff --git a/components/search.less b/resources/skins.vector.styles/search.less
similarity index 100%
rename from components/search.less
rename to resources/skins.vector.styles/search.less
diff --git a/components/tabs.less b/resources/skins.vector.styles/tabs.less
similarity index 99%
rename from components/tabs.less
rename to resources/skins.vector.styles/tabs.less
index 69fd70f..4cb4ab1 100644
--- a/components/tabs.less
+++ b/resources/skins.vector.styles/tabs.less
@@ -1,4 +1,4 @@
-@import '../variables.less';
+@import '../../variables.less';
 @import 'mediawiki.mixins.less';
 
 /**
diff --git a/components/watchstar.less b/resources/skins.vector.styles/watchstar.less
similarity index 98%
rename from components/watchstar.less
rename to resources/skins.vector.styles/watchstar.less
index aaea6d0..4f6ef85 100644
--- a/components/watchstar.less
+++ b/resources/skins.vector.styles/watchstar.less
@@ -1,4 +1,4 @@
-@import '../variables.less';
+@import '../../variables.less';
 @import 'mediawiki.mixins.rotation.less';
 
 /* Watch/Unwatch Icon Styling */
diff --git a/screen.less b/screen.less
deleted file mode 100644
index 4a5e3b8..0000000
--- a/screen.less
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Vector screen styles */
-
-@import 'variables.less';
-@import 'components/common.less';
-@import 'components/navigation.less';
-@import 'components/footer.less';
-@import 'components/externalLinks.less';
diff --git a/skin.json b/skin.json
index 3301799..0c2e836 100644
--- a/skin.json
+++ b/skin.json
@@ -39,13 +39,13 @@
 				"mobile"
 			],
 			"styles": {
-				"screen.less": {
+				"resources/skins.vector.styles/screen.less": {
 					"media": "screen"
 				},
-				"screen-hd.less": {
+				"resources/skins.vector.styles/screen-hd.less": {
 					"media": "screen and ( min-width: 982px )"
 				},
-				"print.less": []
+				"resources/skins.vector.styles/print.less": []
 			}
 		},
 		"skins.vector.styles.responsive": {
@@ -54,13 +54,13 @@
 				"mobile"
 			],
 			"styles": [
-				"responsive.less"
+				"resources/skins.vector.styles.responsive.less"
 			]
 		},
 		"skins.vector.js": {
 			"scripts": [
-				"collapsibleTabs.js",
-				"vector.js"
+				"resources/skins.vector.js/collapsibleTabs.js",
+				"resources/skins.vector.js/vector.js"
 			],
 			"dependencies": [
 				"mediawiki.util"