diff --git a/packages/webamp-modern/.eslintrc b/packages/webamp-modern/.eslintrc
index 8316f091..88ae93c6 100644
--- a/packages/webamp-modern/.eslintrc
+++ b/packages/webamp-modern/.eslintrc
@@ -63,7 +63,6 @@
       }
     ],
     "block-scoped-var": "warn",
-    "camelcase": "error",
     "constructor-super": "error",
     "dot-notation": "error",
     "eqeqeq": ["error", "smart"],
diff --git a/packages/webamp-modern/.gitignore b/packages/webamp-modern/.gitignore
index 2d3f39b9..293baaae 100644
--- a/packages/webamp-modern/.gitignore
+++ b/packages/webamp-modern/.gitignore
@@ -1,7 +1,6 @@
 **/node_modules
 
 /built
-/demo/built
 /coverage
 /examples/webpack/bundle.js
 **/__diff_output__/
diff --git a/packages/webamp-modern/.prettierignore b/packages/webamp-modern/.prettierignore
index fe6cea0c..a90e9ecf 100644
--- a/packages/webamp-modern/.prettierignore
+++ b/packages/webamp-modern/.prettierignore
@@ -1,8 +1,6 @@
 package.json
 **/*.min.css
 **/base-skin.css
-demo/js/googleAnalytics.min.js
 built/*
-demo/built/*
 coverage/*
 examples/webpack/bundle.js
diff --git a/packages/webamp-modern/modern/README.md b/packages/webamp-modern/README.md
similarity index 92%
rename from packages/webamp-modern/modern/README.md
rename to packages/webamp-modern/README.md
index cf667664..4cafd9a8 100644
--- a/packages/webamp-modern/modern/README.md
+++ b/packages/webamp-modern/README.md
@@ -24,7 +24,7 @@ In addition to the Maki interpreter, we also need an implementation of the Maki
 
 We also have a tool for examining a corpus of modern skins an extracting which methods of the standard libary they use. This lives in `modern/src/maki-interpreter/tools/extract-functions.js` it's not really built for anyone but Jordan to run, so it has a few paths hard coded into it. This could be fixed if somebody else had the interest. By running `yarn analyze-wals` it will look in a specific hard-coded folder for skins and extract method data from them. It will then write that data to `modern/resources/maki-skin-data.json`. This data is invaluable for prioritizing which methods we should implement next. Some methods are only used by a very small number of skins. Others are not used at all.
 
-The data extracted by the `extract-functions.js` utility and the list of unimplmented methods which is validated by `modern/src/objects.test.js` can be visualized visiting [https://webamp.org/modern/ready/](https://webamp.org/modern/ready/) or `localhost:8080/modern/ready` if developing locally. This dashboard makes it very easy to see current progress and explore the usage of different methods. Keep in mind that as of this writting some ~20% of `.maki` files fail to parse, so the data on this page represents a lower bound of actual usage.
+The data extracted by the `extract-functions.js` utility and the list of unimplmented methods which is validated by `modern/src/objects.test.js` can be visualized visiting [https://webamp.org/ready/](https://webamp.org/ready/) or `localhost:8080/ready` if developing locally. This dashboard makes it very easy to see current progress and explore the usage of different methods. Keep in mind that as of this writting some ~20% of `.maki` files fail to parse, so the data on this page represents a lower bound of actual usage.
 
 ## Architecture
 
@@ -39,7 +39,7 @@ yarn
 yarn start
 ```
 
-Then open: `http://localhost:8080/modern/`.
+Then open: `http://localhost:8080/`.
 
 ## Tests
 
diff --git a/packages/webamp-modern/demo/config/webpack.common.js b/packages/webamp-modern/config/webpack.common.js
similarity index 89%
rename from packages/webamp-modern/demo/config/webpack.common.js
rename to packages/webamp-modern/config/webpack.common.js
index f0043963..702caaad 100644
--- a/packages/webamp-modern/demo/config/webpack.common.js
+++ b/packages/webamp-modern/config/webpack.common.js
@@ -42,16 +42,16 @@ module.exports = {
   },
   plugins: [
     new HtmlWebpackPlugin({
-      filename: "modern/index.html",
-      template: "../modern/index.html",
+      filename: "index.html",
+      template: "./index.html",
       chunks: ["modern"],
     }),
     // Ideally we could just do this via client-side routing, but it's tricky
     // with both the real app and this sub directory. So we just hack it to
     // duplicate the html file in both places and move on with our lives.
     new HtmlWebpackPlugin({
-      filename: "modern/ready/index.html",
-      template: "../modern/index.html",
+      filename: "./ready/index.html",
+      template: "./index.html",
       chunks: ["modern"],
     }),
   ],
@@ -62,7 +62,7 @@ module.exports = {
     maxAssetSize: 7000000,
   },
   entry: {
-    modern: ["../modern/src/index.js"],
+    modern: ["./src/index.js"],
   },
   context: path.resolve(__dirname, "../"),
   output: {
diff --git a/packages/webamp-modern/demo/config/webpack.dev.js b/packages/webamp-modern/config/webpack.dev.js
similarity index 100%
rename from packages/webamp-modern/demo/config/webpack.dev.js
rename to packages/webamp-modern/config/webpack.dev.js
diff --git a/packages/webamp-modern/config/webpack.library.js b/packages/webamp-modern/config/webpack.library.js
deleted file mode 100644
index 42031b50..00000000
--- a/packages/webamp-modern/config/webpack.library.js
+++ /dev/null
@@ -1,58 +0,0 @@
-const path = require("path");
-const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer");
-
-module.exports = {
-  devtool: "source-map",
-  mode: "production",
-  resolve: {
-    extensions: [".js", ".ts", ".tsx"],
-  },
-  module: {
-    rules: [
-      {
-        test: /\.css$/,
-        use: [
-          "style-loader",
-          { loader: "css-loader", options: { importLoaders: 1 } },
-          // We really only need this in prod. We could find a way to disable it in dev.
-        ],
-      },
-      {
-        test: /\.(js|ts|tsx)$/,
-        exclude: /(node_modules)/,
-        use: {
-          loader: "babel-loader",
-          options: {
-            envName: "library",
-          },
-        },
-      },
-    ],
-    noParse: [/jszip\.js$/],
-  },
-  plugins: [
-    new BundleAnalyzerPlugin({
-      analyzerMode: "static",
-      reportFilename: "library-report.html",
-      openAnalyzer: false,
-    }),
-  ],
-  performance: {
-    // We do some crazy shit okay! Don't judge!
-    maxEntrypointSize: 9000000,
-    maxAssetSize: 9000000,
-  },
-  entry: {
-    bundle: "./js/webamp.js",
-    "bundle.min": "./js/webamp.js",
-    "lazy-bundle": "./js/webampLazy.tsx",
-    "lazy-bundle.min": "./js/webampLazy.tsx",
-  },
-  output: {
-    path: path.resolve(__dirname, "../built"),
-    filename: "webamp.[name].js",
-    library: "Webamp",
-    libraryTarget: "umd",
-    libraryExport: "default",
-  },
-};
diff --git a/packages/webamp-modern/demo/config/webpack.prod.js b/packages/webamp-modern/config/webpack.prod.js
similarity index 100%
rename from packages/webamp-modern/demo/config/webpack.prod.js
rename to packages/webamp-modern/config/webpack.prod.js
diff --git a/packages/webamp-modern/demo/mp3/llama-2.91.mp3 b/packages/webamp-modern/demo/mp3/llama-2.91.mp3
deleted file mode 100644
index 7262ff2b..00000000
Binary files a/packages/webamp-modern/demo/mp3/llama-2.91.mp3 and /dev/null differ
diff --git a/packages/webamp-modern/eslint-local-rules.js b/packages/webamp-modern/eslint-local-rules.js
index f773912a..14344243 100644
--- a/packages/webamp-modern/eslint-local-rules.js
+++ b/packages/webamp-modern/eslint-local-rules.js
@@ -1,6 +1,6 @@
-const makiClassRule = require("./modern/eslint/maki-class");
-const makiMissingMethods = require("./modern/eslint/maki-missing-methods");
-const makiMethodTypes = require("./modern/eslint/maki-method-types");
+const makiClassRule = require("./eslint/maki-class");
+const makiMissingMethods = require("./eslint/maki-missing-methods");
+const makiMethodTypes = require("./eslint/maki-method-types");
 
 module.exports = {
   "maki-class": makiClassRule,
diff --git a/packages/webamp-modern/modern/eslint/maki-class.js b/packages/webamp-modern/eslint/maki-class.js
similarity index 100%
rename from packages/webamp-modern/modern/eslint/maki-class.js
rename to packages/webamp-modern/eslint/maki-class.js
diff --git a/packages/webamp-modern/modern/eslint/maki-eslint-utils.js b/packages/webamp-modern/eslint/maki-eslint-utils.js
similarity index 100%
rename from packages/webamp-modern/modern/eslint/maki-eslint-utils.js
rename to packages/webamp-modern/eslint/maki-eslint-utils.js
diff --git a/packages/webamp-modern/modern/eslint/maki-method-types.js b/packages/webamp-modern/eslint/maki-method-types.js
similarity index 98%
rename from packages/webamp-modern/modern/eslint/maki-method-types.js
rename to packages/webamp-modern/eslint/maki-method-types.js
index ea424715..67971ce0 100644
--- a/packages/webamp-modern/modern/eslint/maki-method-types.js
+++ b/packages/webamp-modern/eslint/maki-method-types.js
@@ -37,7 +37,7 @@ const TYPE_MAP = {
 function getTypeData(makiType) {
   const type = TYPE_MAP[makiType.toLowerCase()];
   if (type == null) {
-    console.warn(`Could not find type for "${makiType}"`);
+    // console.warn(`Could not find type for "${makiType}"`);
   }
   return type;
 }
diff --git a/packages/webamp-modern/modern/eslint/maki-missing-methods.js b/packages/webamp-modern/eslint/maki-missing-methods.js
similarity index 100%
rename from packages/webamp-modern/modern/eslint/maki-missing-methods.js
rename to packages/webamp-modern/eslint/maki-missing-methods.js
diff --git a/packages/webamp-modern/modern/index.html b/packages/webamp-modern/index.html
similarity index 100%
rename from packages/webamp-modern/modern/index.html
rename to packages/webamp-modern/index.html
diff --git a/packages/webamp-modern/modern/maki.md b/packages/webamp-modern/maki.md
similarity index 100%
rename from packages/webamp-modern/modern/maki.md
rename to packages/webamp-modern/maki.md
diff --git a/packages/webamp-modern/modern/.eslintrc b/packages/webamp-modern/modern/.eslintrc
deleted file mode 100644
index 2fef56ea..00000000
--- a/packages/webamp-modern/modern/.eslintrc
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "rules": {
-    // TODO: Turn these all back on
-    "camelcase": "off"
-  }
-}
diff --git a/packages/webamp-modern/package.json b/packages/webamp-modern/package.json
index 111862cb..30150a11 100644
--- a/packages/webamp-modern/package.json
+++ b/packages/webamp-modern/package.json
@@ -4,10 +4,10 @@
   "description": "Winamp Modern Skins in the browser",
   "scripts": {
     "lint-fix": "eslint . --ext ts,tsx,js --fix",
-    "lint": "eslint . --ext ts,tsx,js --rulesdir=modern/eslint",
+    "lint": "eslint . --ext ts,tsx,js --rulesdir=eslint",
     "type-check": "tsc",
-    "serve": "http-server ./demo/built",
-    "start": "webpack-dev-server --open --config=demo/config/webpack.dev.js",
+    "serve": "http-server ./built",
+    "start": "webpack-dev-server --open --config=config/webpack.dev.js",
     "test": "jest --config=config/jest.unit.js",
     "tdd": "jest --config=config/jest.unit.js --watch",
     "format": "prettier --write \"**/*.{js,ts,tsx,d.ts,css}\"",
diff --git a/packages/webamp-modern/modern/resources/SimpleTutorial.wal b/packages/webamp-modern/resources/SimpleTutorial.wal
similarity index 100%
rename from packages/webamp-modern/modern/resources/SimpleTutorial.wal
rename to packages/webamp-modern/resources/SimpleTutorial.wal
diff --git a/packages/webamp-modern/modern/resources/Winamp-Modern-Skins-Tutorial.pdf b/packages/webamp-modern/resources/Winamp-Modern-Skins-Tutorial.pdf
similarity index 100%
rename from packages/webamp-modern/modern/resources/Winamp-Modern-Skins-Tutorial.pdf
rename to packages/webamp-modern/resources/Winamp-Modern-Skins-Tutorial.pdf
diff --git a/packages/webamp-modern/modern/resources/attribute-skin-data.json b/packages/webamp-modern/resources/attribute-skin-data.json
similarity index 100%
rename from packages/webamp-modern/modern/resources/attribute-skin-data.json
rename to packages/webamp-modern/resources/attribute-skin-data.json
diff --git a/packages/webamp-modern/modern/resources/fixtures/issue_898/minimal.m b/packages/webamp-modern/resources/fixtures/issue_898/minimal.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/fixtures/issue_898/minimal.m
rename to packages/webamp-modern/resources/fixtures/issue_898/minimal.m
diff --git a/packages/webamp-modern/modern/resources/fixtures/issue_898/minimal.maki b/packages/webamp-modern/resources/fixtures/issue_898/minimal.maki
similarity index 100%
rename from packages/webamp-modern/modern/resources/fixtures/issue_898/minimal.maki
rename to packages/webamp-modern/resources/fixtures/issue_898/minimal.maki
diff --git a/packages/webamp-modern/modern/resources/fixtures/issue_898/multipass_system.maki b/packages/webamp-modern/resources/fixtures/issue_898/multipass_system.maki
similarity index 100%
rename from packages/webamp-modern/modern/resources/fixtures/issue_898/multipass_system.maki
rename to packages/webamp-modern/resources/fixtures/issue_898/multipass_system.maki
diff --git a/packages/webamp-modern/modern/resources/fixtures/standardframe.m b/packages/webamp-modern/resources/fixtures/standardframe.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/fixtures/standardframe.m
rename to packages/webamp-modern/resources/fixtures/standardframe.m
diff --git a/packages/webamp-modern/modern/resources/fixtures/standardframe.maki b/packages/webamp-modern/resources/fixtures/standardframe.maki
similarity index 100%
rename from packages/webamp-modern/modern/resources/fixtures/standardframe.maki
rename to packages/webamp-modern/resources/fixtures/standardframe.maki
diff --git a/packages/webamp-modern/modern/resources/maki-skin-data.json b/packages/webamp-modern/resources/maki-skin-data.json
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki-skin-data.json
rename to packages/webamp-modern/resources/maki-skin-data.json
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/Unknown (Winamp 5.03)/extra/nde_specs_v1.txt b/packages/webamp-modern/resources/maki_compiler/Unknown (Winamp 5.03)/extra/nde_specs_v1.txt
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/Unknown (Winamp 5.03)/extra/nde_specs_v1.txt
rename to packages/webamp-modern/resources/maki_compiler/Unknown (Winamp 5.03)/extra/nde_specs_v1.txt
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/Unknown (Winamp 5.03)/lib/config.mi b/packages/webamp-modern/resources/maki_compiler/Unknown (Winamp 5.03)/lib/config.mi
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/Unknown (Winamp 5.03)/lib/config.mi
rename to packages/webamp-modern/resources/maki_compiler/Unknown (Winamp 5.03)/lib/config.mi
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/Unknown (Winamp 5.03)/lib/std.mi b/packages/webamp-modern/resources/maki_compiler/Unknown (Winamp 5.03)/lib/std.mi
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/Unknown (Winamp 5.03)/lib/std.mi
rename to packages/webamp-modern/resources/maki_compiler/Unknown (Winamp 5.03)/lib/std.mi
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/Unknown (Winamp 5.03)/readme.md b/packages/webamp-modern/resources/maki_compiler/Unknown (Winamp 5.03)/readme.md
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/Unknown (Winamp 5.03)/readme.md
rename to packages/webamp-modern/resources/maki_compiler/Unknown (Winamp 5.03)/readme.md
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/customseek.m b/packages/webamp-modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/customseek.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/customseek.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/customseek.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/dragvolume.m b/packages/webamp-modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/dragvolume.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/dragvolume.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/dragvolume.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/rotationlayer.m b/packages/webamp-modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/rotationlayer.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/rotationlayer.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/rotationlayer.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/std.mi b/packages/webamp-modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/std.mi
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/std.mi
rename to packages/webamp-modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/std.mi
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/hello_world.m b/packages/webamp-modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/hello_world.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/hello_world.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/hello_world.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/hello_world.maki b/packages/webamp-modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/hello_world.maki
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/hello_world.maki
rename to packages/webamp-modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/hello_world.maki
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/mc.exe b/packages/webamp-modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/mc.exe
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/mc.exe
rename to packages/webamp-modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/mc.exe
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/centerlayer.m b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/centerlayer.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/centerlayer.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/centerlayer.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/config.mi b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/config.mi
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/config.mi
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/config.mi
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/customseek.m b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/customseek.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/customseek.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/customseek.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/dragvolume.m b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/dragvolume.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/dragvolume.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/dragvolume.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/pldir.mi b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/pldir.mi
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/pldir.mi
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/pldir.mi
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/rotationlayer.m b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/rotationlayer.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/rotationlayer.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/rotationlayer.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/std.mi b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/std.mi
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/std.mi
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/std.mi
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.m b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.maki b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.maki
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.maki
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.maki
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/hello_world.m b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/hello_world.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/hello_world.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/hello_world.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/hello_world.maki b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/hello_world.maki
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/hello_world.maki
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/hello_world.maki
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/mc.exe b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/mc.exe
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/mc.exe
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/mc.exe
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/simpleFunctions.m b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/simpleFunctions.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/simpleFunctions.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/simpleFunctions.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/simpleFunctions.maki b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/simpleFunctions.maki
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/simpleFunctions.maki
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/simpleFunctions.maki
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/avswitcher.m b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/avswitcher.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/avswitcher.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/avswitcher.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/buttonsounds.m b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/buttonsounds.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/buttonsounds.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/buttonsounds.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/centerlayer.m b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/centerlayer.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/centerlayer.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/centerlayer.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/config.mi b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/config.mi
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/config.mi
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/config.mi
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/core.mi b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/core.mi
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/core.mi
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/core.mi
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/customseek.m b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/customseek.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/customseek.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/customseek.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/dragvolume.m b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/dragvolume.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/dragvolume.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/dragvolume.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/dumpcscript.m b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/dumpcscript.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/dumpcscript.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/dumpcscript.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/pldir.mi b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/pldir.mi
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/pldir.mi
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/pldir.mi
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/rotationlayer.m b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/rotationlayer.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/rotationlayer.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/rotationlayer.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/std.mi b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/std.mi
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/std.mi
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/std.mi
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.m b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.maki b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.maki
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.maki
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.maki
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/hello_world.m b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/hello_world.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/hello_world.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/hello_world.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/hello_world.maki b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/hello_world.maki
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/hello_world.maki
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/hello_world.maki
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/mc.exe b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/mc.exe
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/mc.exe
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/mc.exe
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/simpleFunctions.m b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/simpleFunctions.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/simpleFunctions.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/simpleFunctions.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/simpleFunctions.maki b/packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/simpleFunctions.maki
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/simpleFunctions.maki
rename to packages/webamp-modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/simpleFunctions.maki
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.m b/packages/webamp-modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.maki b/packages/webamp-modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.maki
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.maki
rename to packages/webamp-modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.maki
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/hello_world.m b/packages/webamp-modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/hello_world.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/hello_world.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/hello_world.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/hello_world.maki b/packages/webamp-modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/hello_world.maki
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/hello_world.maki
rename to packages/webamp-modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/hello_world.maki
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/lib/std.mi b/packages/webamp-modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/lib/std.mi
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/lib/std.mi
rename to packages/webamp-modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/lib/std.mi
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/mc.exe b/packages/webamp-modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/mc.exe
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/mc.exe
rename to packages/webamp-modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/mc.exe
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/simpleFunctions.m b/packages/webamp-modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/simpleFunctions.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/simpleFunctions.m
rename to packages/webamp-modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/simpleFunctions.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/simpleFunctions.maki b/packages/webamp-modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/simpleFunctions.maki
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/simpleFunctions.maki
rename to packages/webamp-modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/simpleFunctions.maki
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.m b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.m
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.maki b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.maki
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.maki
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.maki
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/hello_world.m b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/hello_world.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/hello_world.m
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/hello_world.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/hello_world.maki b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/hello_world.maki
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/hello_world.maki
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/hello_world.maki
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/application.mi b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/application.mi
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/application.mi
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/application.mi
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/colormgr.mi b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/colormgr.mi
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/colormgr.mi
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/colormgr.mi
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/AutoRepeatButton.m b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/AutoRepeatButton.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/AutoRepeatButton.m
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/AutoRepeatButton.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/centerlayer.m b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/centerlayer.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/centerlayer.m
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/centerlayer.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/customseek.m b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/customseek.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/customseek.m
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/customseek.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/debug.m b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/debug.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/debug.m
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/debug.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/dispatch_ifc.m b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/dispatch_ifc.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/dispatch_ifc.m
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/dispatch_ifc.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/dragvolume.m b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/dragvolume.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/dragvolume.m
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/dragvolume.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/fillbar.m b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/fillbar.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/fillbar.m
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/fillbar.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/glow.m b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/glow.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/glow.m
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/glow.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/glowobject.m b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/glowobject.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/glowobject.m
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/glowobject.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/rotationlayer.m b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/rotationlayer.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/rotationlayer.m
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/rotationlayer.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/songinfo.m b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/songinfo.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/songinfo.m
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/songinfo.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/config.mi b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/config.mi
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/config.mi
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/config.mi
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/core.mi b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/core.mi
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/core.mi
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/core.mi
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/exd.mi b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/exd.mi
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/exd.mi
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/exd.mi
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/fileio.mi b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/fileio.mi
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/fileio.mi
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/fileio.mi
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/pldir.mi b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/pldir.mi
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/pldir.mi
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/pldir.mi
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/std.mi b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/std.mi
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/std.mi
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/std.mi
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/winampconfig.mi b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/winampconfig.mi
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/winampconfig.mi
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/winampconfig.mi
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/mc.exe b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/mc.exe
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/mc.exe
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/mc.exe
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/nscrt.dll b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/nscrt.dll
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/nscrt.dll
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/nscrt.dll
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/simpleFunctions.m b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/simpleFunctions.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/simpleFunctions.m
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/simpleFunctions.m
diff --git a/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/simpleFunctions.maki b/packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/simpleFunctions.maki
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/simpleFunctions.maki
rename to packages/webamp-modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/simpleFunctions.maki
diff --git a/packages/webamp-modern/modern/resources/maki_decompiler_1.1/COPYING b/packages/webamp-modern/resources/maki_decompiler_1.1/COPYING
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_decompiler_1.1/COPYING
rename to packages/webamp-modern/resources/maki_decompiler_1.1/COPYING
diff --git a/packages/webamp-modern/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Code.pm b/packages/webamp-modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Code.pm
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Code.pm
rename to packages/webamp-modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Code.pm
diff --git a/packages/webamp-modern/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Command.pm b/packages/webamp-modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Command.pm
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Command.pm
rename to packages/webamp-modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Command.pm
diff --git a/packages/webamp-modern/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Objects.pm b/packages/webamp-modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Objects.pm
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Objects.pm
rename to packages/webamp-modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Objects.pm
diff --git a/packages/webamp-modern/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Parse.pm b/packages/webamp-modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Parse.pm
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Parse.pm
rename to packages/webamp-modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Parse.pm
diff --git a/packages/webamp-modern/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Variable.pm b/packages/webamp-modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Variable.pm
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Variable.pm
rename to packages/webamp-modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Variable.pm
diff --git a/packages/webamp-modern/modern/resources/maki_decompiler_1.1/README b/packages/webamp-modern/resources/maki_decompiler_1.1/README
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_decompiler_1.1/README
rename to packages/webamp-modern/resources/maki_decompiler_1.1/README
diff --git a/packages/webamp-modern/modern/resources/maki_decompiler_1.1/makiToPerl.pm b/packages/webamp-modern/resources/maki_decompiler_1.1/makiToPerl.pm
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_decompiler_1.1/makiToPerl.pm
rename to packages/webamp-modern/resources/maki_decompiler_1.1/makiToPerl.pm
diff --git a/packages/webamp-modern/modern/resources/maki_decompiler_1.1/mdc.pl b/packages/webamp-modern/resources/maki_decompiler_1.1/mdc.pl
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_decompiler_1.1/mdc.pl
rename to packages/webamp-modern/resources/maki_decompiler_1.1/mdc.pl
diff --git a/packages/webamp-modern/modern/resources/maki_decompiler_1.1/tool/extract_objects.pl b/packages/webamp-modern/resources/maki_decompiler_1.1/tool/extract_objects.pl
similarity index 100%
rename from packages/webamp-modern/modern/resources/maki_decompiler_1.1/tool/extract_objects.pl
rename to packages/webamp-modern/resources/maki_decompiler_1.1/tool/extract_objects.pl
diff --git a/packages/webamp-modern/modern/resources/testSkins/sameObject/container.xml b/packages/webamp-modern/resources/testSkins/sameObject/container.xml
similarity index 100%
rename from packages/webamp-modern/modern/resources/testSkins/sameObject/container.xml
rename to packages/webamp-modern/resources/testSkins/sameObject/container.xml
diff --git a/packages/webamp-modern/modern/resources/testSkins/sameObject/script.m b/packages/webamp-modern/resources/testSkins/sameObject/script.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/testSkins/sameObject/script.m
rename to packages/webamp-modern/resources/testSkins/sameObject/script.m
diff --git a/packages/webamp-modern/modern/resources/testSkins/sameObject/script.maki b/packages/webamp-modern/resources/testSkins/sameObject/script.maki
similarity index 100%
rename from packages/webamp-modern/modern/resources/testSkins/sameObject/script.maki
rename to packages/webamp-modern/resources/testSkins/sameObject/script.maki
diff --git a/packages/webamp-modern/modern/resources/testSkins/sameObject/skin.xml b/packages/webamp-modern/resources/testSkins/sameObject/skin.xml
similarity index 100%
rename from packages/webamp-modern/modern/resources/testSkins/sameObject/skin.xml
rename to packages/webamp-modern/resources/testSkins/sameObject/skin.xml
diff --git a/packages/webamp-modern/modern/resources/testSkins/simpleClick/container.xml b/packages/webamp-modern/resources/testSkins/simpleClick/container.xml
similarity index 100%
rename from packages/webamp-modern/modern/resources/testSkins/simpleClick/container.xml
rename to packages/webamp-modern/resources/testSkins/simpleClick/container.xml
diff --git a/packages/webamp-modern/modern/resources/testSkins/simpleClick/script.m b/packages/webamp-modern/resources/testSkins/simpleClick/script.m
similarity index 100%
rename from packages/webamp-modern/modern/resources/testSkins/simpleClick/script.m
rename to packages/webamp-modern/resources/testSkins/simpleClick/script.m
diff --git a/packages/webamp-modern/modern/resources/testSkins/simpleClick/script.maki b/packages/webamp-modern/resources/testSkins/simpleClick/script.maki
similarity index 100%
rename from packages/webamp-modern/modern/resources/testSkins/simpleClick/script.maki
rename to packages/webamp-modern/resources/testSkins/simpleClick/script.maki
diff --git a/packages/webamp-modern/modern/resources/testSkins/simpleClick/skin.xml b/packages/webamp-modern/resources/testSkins/simpleClick/skin.xml
similarity index 100%
rename from packages/webamp-modern/modern/resources/testSkins/simpleClick/skin.xml
rename to packages/webamp-modern/resources/testSkins/simpleClick/skin.xml
diff --git a/packages/webamp-modern/modern/skins/CornerAmp_Redux.wal b/packages/webamp-modern/skins/CornerAmp_Redux.wal
similarity index 100%
rename from packages/webamp-modern/modern/skins/CornerAmp_Redux.wal
rename to packages/webamp-modern/skins/CornerAmp_Redux.wal
diff --git a/packages/webamp-modern/modern/skins/simple.wal b/packages/webamp-modern/skins/simple.wal
similarity index 100%
rename from packages/webamp-modern/modern/skins/simple.wal
rename to packages/webamp-modern/skins/simple.wal
diff --git a/packages/webamp-modern/modern/src/Actions.ts b/packages/webamp-modern/src/Actions.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/Actions.ts
rename to packages/webamp-modern/src/Actions.ts
diff --git a/packages/webamp-modern/modern/src/App.css b/packages/webamp-modern/src/App.css
similarity index 100%
rename from packages/webamp-modern/modern/src/App.css
rename to packages/webamp-modern/src/App.css
diff --git a/packages/webamp-modern/modern/src/App.js b/packages/webamp-modern/src/App.js
similarity index 100%
rename from packages/webamp-modern/modern/src/App.js
rename to packages/webamp-modern/src/App.js
diff --git a/packages/webamp-modern/modern/src/Dashboard.js b/packages/webamp-modern/src/Dashboard.js
similarity index 100%
rename from packages/webamp-modern/modern/src/Dashboard.js
rename to packages/webamp-modern/src/Dashboard.js
diff --git a/packages/webamp-modern/modern/src/Emitter.ts b/packages/webamp-modern/src/Emitter.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/Emitter.ts
rename to packages/webamp-modern/src/Emitter.ts
diff --git a/packages/webamp-modern/modern/src/Selectors.ts b/packages/webamp-modern/src/Selectors.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/Selectors.ts
rename to packages/webamp-modern/src/Selectors.ts
diff --git a/packages/webamp-modern/modern/src/Sidebar.js b/packages/webamp-modern/src/Sidebar.js
similarity index 100%
rename from packages/webamp-modern/modern/src/Sidebar.js
rename to packages/webamp-modern/src/Sidebar.js
diff --git a/packages/webamp-modern/modern/src/__tests__/__snapshots__/objects.test.js.snap b/packages/webamp-modern/src/__tests__/__snapshots__/objects.test.js.snap
similarity index 100%
rename from packages/webamp-modern/modern/src/__tests__/__snapshots__/objects.test.js.snap
rename to packages/webamp-modern/src/__tests__/__snapshots__/objects.test.js.snap
diff --git a/packages/webamp-modern/modern/src/__tests__/__snapshots__/utils.test.js.snap b/packages/webamp-modern/src/__tests__/__snapshots__/utils.test.js.snap
similarity index 100%
rename from packages/webamp-modern/modern/src/__tests__/__snapshots__/utils.test.js.snap
rename to packages/webamp-modern/src/__tests__/__snapshots__/utils.test.js.snap
diff --git a/packages/webamp-modern/modern/src/__tests__/integration.test.js b/packages/webamp-modern/src/__tests__/integration.test.js
similarity index 100%
rename from packages/webamp-modern/modern/src/__tests__/integration.test.js
rename to packages/webamp-modern/src/__tests__/integration.test.js
diff --git a/packages/webamp-modern/modern/src/__tests__/objects.test.js b/packages/webamp-modern/src/__tests__/objects.test.js
similarity index 100%
rename from packages/webamp-modern/modern/src/__tests__/objects.test.js
rename to packages/webamp-modern/src/__tests__/objects.test.js
diff --git a/packages/webamp-modern/modern/src/__tests__/parser.test.js b/packages/webamp-modern/src/__tests__/parser.test.js
similarity index 100%
rename from packages/webamp-modern/modern/src/__tests__/parser.test.js
rename to packages/webamp-modern/src/__tests__/parser.test.js
diff --git a/packages/webamp-modern/modern/src/__tests__/testConstants.js b/packages/webamp-modern/src/__tests__/testConstants.js
similarity index 100%
rename from packages/webamp-modern/modern/src/__tests__/testConstants.js
rename to packages/webamp-modern/src/__tests__/testConstants.js
diff --git a/packages/webamp-modern/modern/src/__tests__/utils.test.js b/packages/webamp-modern/src/__tests__/utils.test.js
similarity index 100%
rename from packages/webamp-modern/modern/src/__tests__/utils.test.js
rename to packages/webamp-modern/src/__tests__/utils.test.js
diff --git a/packages/webamp-modern/modern/src/__tests__/virtualMachine.test.js b/packages/webamp-modern/src/__tests__/virtualMachine.test.js
similarity index 100%
rename from packages/webamp-modern/modern/src/__tests__/virtualMachine.test.js
rename to packages/webamp-modern/src/__tests__/virtualMachine.test.js
diff --git a/packages/webamp-modern/modern/src/components/DropTarget.tsx b/packages/webamp-modern/src/components/DropTarget.tsx
similarity index 100%
rename from packages/webamp-modern/modern/src/components/DropTarget.tsx
rename to packages/webamp-modern/src/components/DropTarget.tsx
diff --git a/packages/webamp-modern/modern/src/debugger/Command.js b/packages/webamp-modern/src/debugger/Command.js
similarity index 100%
rename from packages/webamp-modern/modern/src/debugger/Command.js
rename to packages/webamp-modern/src/debugger/Command.js
diff --git a/packages/webamp-modern/modern/src/debugger/Value.js b/packages/webamp-modern/src/debugger/Value.js
similarity index 100%
rename from packages/webamp-modern/modern/src/debugger/Value.js
rename to packages/webamp-modern/src/debugger/Value.js
diff --git a/packages/webamp-modern/modern/src/debugger/Variable.js b/packages/webamp-modern/src/debugger/Variable.js
similarity index 100%
rename from packages/webamp-modern/modern/src/debugger/Variable.js
rename to packages/webamp-modern/src/debugger/Variable.js
diff --git a/packages/webamp-modern/modern/src/debugger/index.js b/packages/webamp-modern/src/debugger/index.js
similarity index 100%
rename from packages/webamp-modern/modern/src/debugger/index.js
rename to packages/webamp-modern/src/debugger/index.js
diff --git a/packages/webamp-modern/modern/src/index.css b/packages/webamp-modern/src/index.css
similarity index 100%
rename from packages/webamp-modern/modern/src/index.css
rename to packages/webamp-modern/src/index.css
diff --git a/packages/webamp-modern/modern/src/index.js b/packages/webamp-modern/src/index.js
similarity index 100%
rename from packages/webamp-modern/modern/src/index.js
rename to packages/webamp-modern/src/index.js
diff --git a/packages/webamp-modern/modern/src/initialize.js b/packages/webamp-modern/src/initialize.js
similarity index 100%
rename from packages/webamp-modern/modern/src/initialize.js
rename to packages/webamp-modern/src/initialize.js
diff --git a/packages/webamp-modern/modern/src/initializeStateTree.ts b/packages/webamp-modern/src/initializeStateTree.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/initializeStateTree.ts
rename to packages/webamp-modern/src/initializeStateTree.ts
diff --git a/packages/webamp-modern/modern/src/logo.svg b/packages/webamp-modern/src/logo.svg
similarity index 100%
rename from packages/webamp-modern/modern/src/logo.svg
rename to packages/webamp-modern/src/logo.svg
diff --git a/packages/webamp-modern/modern/src/maki-interpreter/constants.js b/packages/webamp-modern/src/maki-interpreter/constants.js
similarity index 100%
rename from packages/webamp-modern/modern/src/maki-interpreter/constants.js
rename to packages/webamp-modern/src/maki-interpreter/constants.js
diff --git a/packages/webamp-modern/modern/src/maki-interpreter/interpreter.js b/packages/webamp-modern/src/maki-interpreter/interpreter.js
similarity index 100%
rename from packages/webamp-modern/modern/src/maki-interpreter/interpreter.js
rename to packages/webamp-modern/src/maki-interpreter/interpreter.js
diff --git a/packages/webamp-modern/modern/src/maki-interpreter/objectData/config.json b/packages/webamp-modern/src/maki-interpreter/objectData/config.json
similarity index 100%
rename from packages/webamp-modern/modern/src/maki-interpreter/objectData/config.json
rename to packages/webamp-modern/src/maki-interpreter/objectData/config.json
diff --git a/packages/webamp-modern/modern/src/maki-interpreter/objectData/pldir.json b/packages/webamp-modern/src/maki-interpreter/objectData/pldir.json
similarity index 100%
rename from packages/webamp-modern/modern/src/maki-interpreter/objectData/pldir.json
rename to packages/webamp-modern/src/maki-interpreter/objectData/pldir.json
diff --git a/packages/webamp-modern/modern/src/maki-interpreter/objectData/std.json b/packages/webamp-modern/src/maki-interpreter/objectData/std.json
similarity index 100%
rename from packages/webamp-modern/modern/src/maki-interpreter/objectData/std.json
rename to packages/webamp-modern/src/maki-interpreter/objectData/std.json
diff --git a/packages/webamp-modern/modern/src/maki-interpreter/objectData/stdPatched.js b/packages/webamp-modern/src/maki-interpreter/objectData/stdPatched.js
similarity index 100%
rename from packages/webamp-modern/modern/src/maki-interpreter/objectData/stdPatched.js
rename to packages/webamp-modern/src/maki-interpreter/objectData/stdPatched.js
diff --git a/packages/webamp-modern/modern/src/maki-interpreter/objects.js b/packages/webamp-modern/src/maki-interpreter/objects.js
similarity index 100%
rename from packages/webamp-modern/modern/src/maki-interpreter/objects.js
rename to packages/webamp-modern/src/maki-interpreter/objects.js
diff --git a/packages/webamp-modern/modern/src/maki-interpreter/parser.js b/packages/webamp-modern/src/maki-interpreter/parser.js
similarity index 100%
rename from packages/webamp-modern/modern/src/maki-interpreter/parser.js
rename to packages/webamp-modern/src/maki-interpreter/parser.js
diff --git a/packages/webamp-modern/modern/src/maki-interpreter/prettyPrinter.js b/packages/webamp-modern/src/maki-interpreter/prettyPrinter.js
similarity index 100%
rename from packages/webamp-modern/modern/src/maki-interpreter/prettyPrinter.js
rename to packages/webamp-modern/src/maki-interpreter/prettyPrinter.js
diff --git a/packages/webamp-modern/modern/src/maki-interpreter/readme.md b/packages/webamp-modern/src/maki-interpreter/readme.md
similarity index 100%
rename from packages/webamp-modern/modern/src/maki-interpreter/readme.md
rename to packages/webamp-modern/src/maki-interpreter/readme.md
diff --git a/packages/webamp-modern/modern/src/maki-interpreter/tools/build-typescript-interfaces.js b/packages/webamp-modern/src/maki-interpreter/tools/build-typescript-interfaces.js
similarity index 100%
rename from packages/webamp-modern/modern/src/maki-interpreter/tools/build-typescript-interfaces.js
rename to packages/webamp-modern/src/maki-interpreter/tools/build-typescript-interfaces.js
diff --git a/packages/webamp-modern/modern/src/maki-interpreter/tools/extract-attributes.js b/packages/webamp-modern/src/maki-interpreter/tools/extract-attributes.js
similarity index 100%
rename from packages/webamp-modern/modern/src/maki-interpreter/tools/extract-attributes.js
rename to packages/webamp-modern/src/maki-interpreter/tools/extract-attributes.js
diff --git a/packages/webamp-modern/modern/src/maki-interpreter/tools/extract-functions.js b/packages/webamp-modern/src/maki-interpreter/tools/extract-functions.js
similarity index 100%
rename from packages/webamp-modern/modern/src/maki-interpreter/tools/extract-functions.js
rename to packages/webamp-modern/src/maki-interpreter/tools/extract-functions.js
diff --git a/packages/webamp-modern/modern/src/maki-interpreter/tools/extract-maki-files.js b/packages/webamp-modern/src/maki-interpreter/tools/extract-maki-files.js
similarity index 100%
rename from packages/webamp-modern/modern/src/maki-interpreter/tools/extract-maki-files.js
rename to packages/webamp-modern/src/maki-interpreter/tools/extract-maki-files.js
diff --git a/packages/webamp-modern/modern/src/maki-interpreter/tools/extract-object-types.js b/packages/webamp-modern/src/maki-interpreter/tools/extract-object-types.js
similarity index 100%
rename from packages/webamp-modern/modern/src/maki-interpreter/tools/extract-object-types.js
rename to packages/webamp-modern/src/maki-interpreter/tools/extract-object-types.js
diff --git a/packages/webamp-modern/modern/src/maki-interpreter/tools/parse-mi.js b/packages/webamp-modern/src/maki-interpreter/tools/parse-mi.js
similarity index 100%
rename from packages/webamp-modern/modern/src/maki-interpreter/tools/parse-mi.js
rename to packages/webamp-modern/src/maki-interpreter/tools/parse-mi.js
diff --git a/packages/webamp-modern/modern/src/maki-interpreter/tools/parse-mi.test.js b/packages/webamp-modern/src/maki-interpreter/tools/parse-mi.test.js
similarity index 100%
rename from packages/webamp-modern/modern/src/maki-interpreter/tools/parse-mi.test.js
rename to packages/webamp-modern/src/maki-interpreter/tools/parse-mi.test.js
diff --git a/packages/webamp-modern/modern/src/maki-interpreter/variable.js b/packages/webamp-modern/src/maki-interpreter/variable.js
similarity index 100%
rename from packages/webamp-modern/modern/src/maki-interpreter/variable.js
rename to packages/webamp-modern/src/maki-interpreter/variable.js
diff --git a/packages/webamp-modern/modern/src/maki-interpreter/virtualMachine.js b/packages/webamp-modern/src/maki-interpreter/virtualMachine.js
similarity index 100%
rename from packages/webamp-modern/modern/src/maki-interpreter/virtualMachine.js
rename to packages/webamp-modern/src/maki-interpreter/virtualMachine.js
diff --git a/packages/webamp-modern/modern/src/runtime/.eslintrc b/packages/webamp-modern/src/runtime/.eslintrc
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/.eslintrc
rename to packages/webamp-modern/src/runtime/.eslintrc
diff --git a/packages/webamp-modern/modern/src/runtime/AlbumArtLayer.ts b/packages/webamp-modern/src/runtime/AlbumArtLayer.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/AlbumArtLayer.ts
rename to packages/webamp-modern/src/runtime/AlbumArtLayer.ts
diff --git a/packages/webamp-modern/modern/src/runtime/AnimatedLayer.ts b/packages/webamp-modern/src/runtime/AnimatedLayer.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/AnimatedLayer.ts
rename to packages/webamp-modern/src/runtime/AnimatedLayer.ts
diff --git a/packages/webamp-modern/modern/src/runtime/BitList.ts b/packages/webamp-modern/src/runtime/BitList.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/BitList.ts
rename to packages/webamp-modern/src/runtime/BitList.ts
diff --git a/packages/webamp-modern/modern/src/runtime/Browser.ts b/packages/webamp-modern/src/runtime/Browser.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/Browser.ts
rename to packages/webamp-modern/src/runtime/Browser.ts
diff --git a/packages/webamp-modern/modern/src/runtime/Button.ts b/packages/webamp-modern/src/runtime/Button.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/Button.ts
rename to packages/webamp-modern/src/runtime/Button.ts
diff --git a/packages/webamp-modern/modern/src/runtime/CfgGroup.ts b/packages/webamp-modern/src/runtime/CfgGroup.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/CfgGroup.ts
rename to packages/webamp-modern/src/runtime/CfgGroup.ts
diff --git a/packages/webamp-modern/modern/src/runtime/CheckBox.ts b/packages/webamp-modern/src/runtime/CheckBox.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/CheckBox.ts
rename to packages/webamp-modern/src/runtime/CheckBox.ts
diff --git a/packages/webamp-modern/modern/src/runtime/ComponentBucket.ts b/packages/webamp-modern/src/runtime/ComponentBucket.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/ComponentBucket.ts
rename to packages/webamp-modern/src/runtime/ComponentBucket.ts
diff --git a/packages/webamp-modern/modern/src/runtime/Config.ts b/packages/webamp-modern/src/runtime/Config.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/Config.ts
rename to packages/webamp-modern/src/runtime/Config.ts
diff --git a/packages/webamp-modern/modern/src/runtime/ConfigAttribute.ts b/packages/webamp-modern/src/runtime/ConfigAttribute.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/ConfigAttribute.ts
rename to packages/webamp-modern/src/runtime/ConfigAttribute.ts
diff --git a/packages/webamp-modern/modern/src/runtime/ConfigItem.ts b/packages/webamp-modern/src/runtime/ConfigItem.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/ConfigItem.ts
rename to packages/webamp-modern/src/runtime/ConfigItem.ts
diff --git a/packages/webamp-modern/modern/src/runtime/Container.ts b/packages/webamp-modern/src/runtime/Container.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/Container.ts
rename to packages/webamp-modern/src/runtime/Container.ts
diff --git a/packages/webamp-modern/modern/src/runtime/DropDownList.ts b/packages/webamp-modern/src/runtime/DropDownList.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/DropDownList.ts
rename to packages/webamp-modern/src/runtime/DropDownList.ts
diff --git a/packages/webamp-modern/modern/src/runtime/Edit.ts b/packages/webamp-modern/src/runtime/Edit.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/Edit.ts
rename to packages/webamp-modern/src/runtime/Edit.ts
diff --git a/packages/webamp-modern/modern/src/runtime/EqVis.ts b/packages/webamp-modern/src/runtime/EqVis.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/EqVis.ts
rename to packages/webamp-modern/src/runtime/EqVis.ts
diff --git a/packages/webamp-modern/modern/src/runtime/FeedWatcher.ts b/packages/webamp-modern/src/runtime/FeedWatcher.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/FeedWatcher.ts
rename to packages/webamp-modern/src/runtime/FeedWatcher.ts
diff --git a/packages/webamp-modern/modern/src/runtime/Form.ts b/packages/webamp-modern/src/runtime/Form.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/Form.ts
rename to packages/webamp-modern/src/runtime/Form.ts
diff --git a/packages/webamp-modern/modern/src/runtime/Frame.ts b/packages/webamp-modern/src/runtime/Frame.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/Frame.ts
rename to packages/webamp-modern/src/runtime/Frame.ts
diff --git a/packages/webamp-modern/modern/src/runtime/Group.ts b/packages/webamp-modern/src/runtime/Group.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/Group.ts
rename to packages/webamp-modern/src/runtime/Group.ts
diff --git a/packages/webamp-modern/modern/src/runtime/GroupList.ts b/packages/webamp-modern/src/runtime/GroupList.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/GroupList.ts
rename to packages/webamp-modern/src/runtime/GroupList.ts
diff --git a/packages/webamp-modern/modern/src/runtime/GuiList.ts b/packages/webamp-modern/src/runtime/GuiList.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/GuiList.ts
rename to packages/webamp-modern/src/runtime/GuiList.ts
diff --git a/packages/webamp-modern/modern/src/runtime/GuiObject.ts b/packages/webamp-modern/src/runtime/GuiObject.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/GuiObject.ts
rename to packages/webamp-modern/src/runtime/GuiObject.ts
diff --git a/packages/webamp-modern/modern/src/runtime/GuiTree.ts b/packages/webamp-modern/src/runtime/GuiTree.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/GuiTree.ts
rename to packages/webamp-modern/src/runtime/GuiTree.ts
diff --git a/packages/webamp-modern/modern/src/runtime/JsElements.ts b/packages/webamp-modern/src/runtime/JsElements.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/JsElements.ts
rename to packages/webamp-modern/src/runtime/JsElements.ts
diff --git a/packages/webamp-modern/modern/src/runtime/JsGammaSet.ts b/packages/webamp-modern/src/runtime/JsGammaSet.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/JsGammaSet.ts
rename to packages/webamp-modern/src/runtime/JsGammaSet.ts
diff --git a/packages/webamp-modern/modern/src/runtime/JsGroupDef.ts b/packages/webamp-modern/src/runtime/JsGroupDef.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/JsGroupDef.ts
rename to packages/webamp-modern/src/runtime/JsGroupDef.ts
diff --git a/packages/webamp-modern/modern/src/runtime/JsScript.ts b/packages/webamp-modern/src/runtime/JsScript.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/JsScript.ts
rename to packages/webamp-modern/src/runtime/JsScript.ts
diff --git a/packages/webamp-modern/modern/src/runtime/JsWinampAbstractionLayer.ts b/packages/webamp-modern/src/runtime/JsWinampAbstractionLayer.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/JsWinampAbstractionLayer.ts
rename to packages/webamp-modern/src/runtime/JsWinampAbstractionLayer.ts
diff --git a/packages/webamp-modern/modern/src/runtime/Layer.ts b/packages/webamp-modern/src/runtime/Layer.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/Layer.ts
rename to packages/webamp-modern/src/runtime/Layer.ts
diff --git a/packages/webamp-modern/modern/src/runtime/Layout.ts b/packages/webamp-modern/src/runtime/Layout.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/Layout.ts
rename to packages/webamp-modern/src/runtime/Layout.ts
diff --git a/packages/webamp-modern/modern/src/runtime/LayoutStatus.ts b/packages/webamp-modern/src/runtime/LayoutStatus.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/LayoutStatus.ts
rename to packages/webamp-modern/src/runtime/LayoutStatus.ts
diff --git a/packages/webamp-modern/modern/src/runtime/List.ts b/packages/webamp-modern/src/runtime/List.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/List.ts
rename to packages/webamp-modern/src/runtime/List.ts
diff --git a/packages/webamp-modern/modern/src/runtime/MakiMap.ts b/packages/webamp-modern/src/runtime/MakiMap.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/MakiMap.ts
rename to packages/webamp-modern/src/runtime/MakiMap.ts
diff --git a/packages/webamp-modern/modern/src/runtime/MakiObject.ts b/packages/webamp-modern/src/runtime/MakiObject.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/MakiObject.ts
rename to packages/webamp-modern/src/runtime/MakiObject.ts
diff --git a/packages/webamp-modern/modern/src/runtime/Menu.ts b/packages/webamp-modern/src/runtime/Menu.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/Menu.ts
rename to packages/webamp-modern/src/runtime/Menu.ts
diff --git a/packages/webamp-modern/modern/src/runtime/MenuButton.ts b/packages/webamp-modern/src/runtime/MenuButton.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/MenuButton.ts
rename to packages/webamp-modern/src/runtime/MenuButton.ts
diff --git a/packages/webamp-modern/modern/src/runtime/MouseRedir.ts b/packages/webamp-modern/src/runtime/MouseRedir.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/MouseRedir.ts
rename to packages/webamp-modern/src/runtime/MouseRedir.ts
diff --git a/packages/webamp-modern/modern/src/runtime/PlDir.ts b/packages/webamp-modern/src/runtime/PlDir.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/PlDir.ts
rename to packages/webamp-modern/src/runtime/PlDir.ts
diff --git a/packages/webamp-modern/modern/src/runtime/PlEdit.ts b/packages/webamp-modern/src/runtime/PlEdit.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/PlEdit.ts
rename to packages/webamp-modern/src/runtime/PlEdit.ts
diff --git a/packages/webamp-modern/modern/src/runtime/PopupMenu.ts b/packages/webamp-modern/src/runtime/PopupMenu.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/PopupMenu.ts
rename to packages/webamp-modern/src/runtime/PopupMenu.ts
diff --git a/packages/webamp-modern/modern/src/runtime/QueryList.ts b/packages/webamp-modern/src/runtime/QueryList.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/QueryList.ts
rename to packages/webamp-modern/src/runtime/QueryList.ts
diff --git a/packages/webamp-modern/modern/src/runtime/Region.ts b/packages/webamp-modern/src/runtime/Region.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/Region.ts
rename to packages/webamp-modern/src/runtime/Region.ts
diff --git a/packages/webamp-modern/modern/src/runtime/Slider.ts b/packages/webamp-modern/src/runtime/Slider.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/Slider.ts
rename to packages/webamp-modern/src/runtime/Slider.ts
diff --git a/packages/webamp-modern/modern/src/runtime/Status.ts b/packages/webamp-modern/src/runtime/Status.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/Status.ts
rename to packages/webamp-modern/src/runtime/Status.ts
diff --git a/packages/webamp-modern/modern/src/runtime/System.ts b/packages/webamp-modern/src/runtime/System.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/System.ts
rename to packages/webamp-modern/src/runtime/System.ts
diff --git a/packages/webamp-modern/modern/src/runtime/TabSheet.ts b/packages/webamp-modern/src/runtime/TabSheet.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/TabSheet.ts
rename to packages/webamp-modern/src/runtime/TabSheet.ts
diff --git a/packages/webamp-modern/modern/src/runtime/Text.ts b/packages/webamp-modern/src/runtime/Text.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/Text.ts
rename to packages/webamp-modern/src/runtime/Text.ts
diff --git a/packages/webamp-modern/modern/src/runtime/Timer.ts b/packages/webamp-modern/src/runtime/Timer.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/Timer.ts
rename to packages/webamp-modern/src/runtime/Timer.ts
diff --git a/packages/webamp-modern/modern/src/runtime/Title.ts b/packages/webamp-modern/src/runtime/Title.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/Title.ts
rename to packages/webamp-modern/src/runtime/Title.ts
diff --git a/packages/webamp-modern/modern/src/runtime/ToggleButton.ts b/packages/webamp-modern/src/runtime/ToggleButton.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/ToggleButton.ts
rename to packages/webamp-modern/src/runtime/ToggleButton.ts
diff --git a/packages/webamp-modern/modern/src/runtime/TreeItem.ts b/packages/webamp-modern/src/runtime/TreeItem.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/TreeItem.ts
rename to packages/webamp-modern/src/runtime/TreeItem.ts
diff --git a/packages/webamp-modern/modern/src/runtime/Vis.ts b/packages/webamp-modern/src/runtime/Vis.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/Vis.ts
rename to packages/webamp-modern/src/runtime/Vis.ts
diff --git a/packages/webamp-modern/modern/src/runtime/Wac.ts b/packages/webamp-modern/src/runtime/Wac.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/Wac.ts
rename to packages/webamp-modern/src/runtime/Wac.ts
diff --git a/packages/webamp-modern/modern/src/runtime/WindowHolder.ts b/packages/webamp-modern/src/runtime/WindowHolder.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/WindowHolder.ts
rename to packages/webamp-modern/src/runtime/WindowHolder.ts
diff --git a/packages/webamp-modern/modern/src/runtime/index.ts b/packages/webamp-modern/src/runtime/index.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/runtime/index.ts
rename to packages/webamp-modern/src/runtime/index.ts
diff --git a/packages/webamp-modern/modern/src/store.ts b/packages/webamp-modern/src/store.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/store.ts
rename to packages/webamp-modern/src/store.ts
diff --git a/packages/webamp-modern/modern/src/types.ts b/packages/webamp-modern/src/types.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/types.ts
rename to packages/webamp-modern/src/types.ts
diff --git a/packages/webamp-modern/modern/src/utils.ts b/packages/webamp-modern/src/utils.ts
similarity index 100%
rename from packages/webamp-modern/modern/src/utils.ts
rename to packages/webamp-modern/src/utils.ts
diff --git a/packages/webamp-modern/static.d.ts b/packages/webamp-modern/static.d.ts
index 2627e897..b69880b3 100644
--- a/packages/webamp-modern/static.d.ts
+++ b/packages/webamp-modern/static.d.ts
@@ -1,5 +1,4 @@
 declare module "*.wsz";
-declare module "*.mp3";
 declare module "*.png";
 declare module "*.ico";
 declare module "*.jpg";
diff --git a/packages/webamp-modern/tsconfig.json b/packages/webamp-modern/tsconfig.json
index a7279681..f02a124c 100644
--- a/packages/webamp-modern/tsconfig.json
+++ b/packages/webamp-modern/tsconfig.json
@@ -13,5 +13,5 @@
     "pretty": true
   },
   "include": ["**/*.ts", "**/*.tsx"],
-  "exclude": ["node_modules", "demo/built"]
+  "exclude": ["node_modules", "built"]
 }