diff --git a/spec/fixtures/themes/theme-stylesheet.css b/spec/fixtures/packages/theme-with-index-css/index.css
similarity index 100%
rename from spec/fixtures/themes/theme-stylesheet.css
rename to spec/fixtures/packages/theme-with-index-css/index.css
diff --git a/spec/fixtures/themes/theme-stylesheet.less b/spec/fixtures/packages/theme-with-index-less/index.less
similarity index 100%
rename from spec/fixtures/themes/theme-stylesheet.less
rename to spec/fixtures/packages/theme-with-index-less/index.less
diff --git a/spec/fixtures/themes/theme-with-package-file/package.json b/spec/fixtures/packages/theme-with-package-file/package.json
similarity index 75%
rename from spec/fixtures/themes/theme-with-package-file/package.json
rename to spec/fixtures/packages/theme-with-package-file/package.json
index 9dc6565c6..b429a1151 100644
--- a/spec/fixtures/themes/theme-with-package-file/package.json
+++ b/spec/fixtures/packages/theme-with-package-file/package.json
@@ -1,3 +1,4 @@
 {
+  "theme": true,
   "stylesheets": ["first.css", "second.less", "last.css"]
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/themes/theme-with-package-file/first.css b/spec/fixtures/packages/theme-with-package-file/stylesheets/first.css
similarity index 100%
rename from spec/fixtures/themes/theme-with-package-file/first.css
rename to spec/fixtures/packages/theme-with-package-file/stylesheets/first.css
diff --git a/spec/fixtures/themes/theme-with-package-file/last.css b/spec/fixtures/packages/theme-with-package-file/stylesheets/last.css
similarity index 100%
rename from spec/fixtures/themes/theme-with-package-file/last.css
rename to spec/fixtures/packages/theme-with-package-file/stylesheets/last.css
diff --git a/spec/fixtures/themes/theme-with-package-file/second.less b/spec/fixtures/packages/theme-with-package-file/stylesheets/second.less
similarity index 100%
rename from spec/fixtures/themes/theme-with-package-file/second.less
rename to spec/fixtures/packages/theme-with-package-file/stylesheets/second.less
diff --git a/spec/fixtures/themes/theme-with-ui-variables/package.json b/spec/fixtures/packages/theme-with-ui-variables/package.json
similarity index 68%
rename from spec/fixtures/themes/theme-with-ui-variables/package.json
rename to spec/fixtures/packages/theme-with-ui-variables/package.json
index dde00ccc7..fa1446fd6 100644
--- a/spec/fixtures/themes/theme-with-ui-variables/package.json
+++ b/spec/fixtures/packages/theme-with-ui-variables/package.json
@@ -1,3 +1,4 @@
 {
+  "theme": true,
   "stylesheets": ["editor.less"]
 }
diff --git a/spec/fixtures/themes/theme-with-ui-variables/editor.less b/spec/fixtures/packages/theme-with-ui-variables/stylesheets/editor.less
similarity index 100%
rename from spec/fixtures/themes/theme-with-ui-variables/editor.less
rename to spec/fixtures/packages/theme-with-ui-variables/stylesheets/editor.less
diff --git a/spec/fixtures/themes/theme-with-ui-variables/ui-variables.less b/spec/fixtures/packages/theme-with-ui-variables/stylesheets/ui-variables.less
similarity index 100%
rename from spec/fixtures/themes/theme-with-ui-variables/ui-variables.less
rename to spec/fixtures/packages/theme-with-ui-variables/stylesheets/ui-variables.less
diff --git a/spec/fixtures/themes/theme-without-package-file/a.css b/spec/fixtures/packages/theme-without-package-file/stylesheets/a.css
similarity index 100%
rename from spec/fixtures/themes/theme-without-package-file/a.css
rename to spec/fixtures/packages/theme-without-package-file/stylesheets/a.css
diff --git a/spec/fixtures/themes/theme-without-package-file/b.css b/spec/fixtures/packages/theme-without-package-file/stylesheets/b.css
similarity index 100%
rename from spec/fixtures/themes/theme-without-package-file/b.css
rename to spec/fixtures/packages/theme-without-package-file/stylesheets/b.css
diff --git a/spec/fixtures/themes/theme-without-package-file/c.less b/spec/fixtures/packages/theme-without-package-file/stylesheets/c.less
similarity index 100%
rename from spec/fixtures/themes/theme-without-package-file/c.less
rename to spec/fixtures/packages/theme-without-package-file/stylesheets/c.less
diff --git a/spec/fixtures/themes/theme-without-package-file/d.csv b/spec/fixtures/packages/theme-without-package-file/stylesheets/d.csv
similarity index 100%
rename from spec/fixtures/themes/theme-without-package-file/d.csv
rename to spec/fixtures/packages/theme-without-package-file/stylesheets/d.csv