diff --git a/packages/webamp-modern/.babelrc b/packages/webamp-modern/.babelrc
new file mode 100644
index 00000000..ce4b793b
--- /dev/null
+++ b/packages/webamp-modern/.babelrc
@@ -0,0 +1,44 @@
+{
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "useBuiltIns": "entry",
+        "corejs": "2",
+        "targets": {
+          "browsers": [
+            "last 2 Chrome versions",
+            "last 2 ChromeAndroid versions",
+            "last 2 Safari versions",
+            "last 2 Firefox versions",
+            "last 2 Edge versions",
+            "last 2 iOS versions",
+            "last 2 Opera versions"
+          ]
+        }
+      }
+    ],
+    "@babel/preset-react",
+    "@babel/preset-typescript"
+  ],
+  "plugins": [
+    "@babel/plugin-proposal-nullish-coalescing-operator",
+    "@babel/plugin-proposal-optional-chaining",
+    "@babel/plugin-proposal-object-rest-spread",
+    "@babel/plugin-proposal-class-properties"
+  ],
+  "env": {
+    "test": {
+      "plugins": [
+        "@babel/plugin-transform-modules-commonjs",
+        "@babel/plugin-syntax-dynamic-import"
+      ]
+    },
+    "library": {
+      "plugins": ["@babel/plugin-transform-runtime"]
+    },
+    "production": {
+      "plugins": ["@babel/plugin-syntax-dynamic-import"]
+    }
+  }
+}
diff --git a/packages/webamp-modern/.eslintignore b/packages/webamp-modern/.eslintignore
new file mode 100644
index 00000000..6a659d86
--- /dev/null
+++ b/packages/webamp-modern/.eslintignore
@@ -0,0 +1,6 @@
+*.min.js
+built/
+coverage/
+**/node_modules/
+examples/webpack/bundle.js
+pacakges/tweetBot/env/
\ No newline at end of file
diff --git a/packages/webamp-modern/.eslintrc b/packages/webamp-modern/.eslintrc
new file mode 100644
index 00000000..8316f091
--- /dev/null
+++ b/packages/webamp-modern/.eslintrc
@@ -0,0 +1,167 @@
+{
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "jsx": true,
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "jsx": true,
+      "experimentalObjectRestSpread": true
+    }
+  },
+  "plugins": [
+    "react",
+    "prettier",
+    "import",
+    "@typescript-eslint",
+    "react-hooks"
+  ],
+  "settings": {
+    "react": {
+      "version": "15.2"
+    },
+    "import/resolver": {
+      "node": {
+        "extensions": [".js", ".ts", ".tsx"]
+      }
+    }
+  },
+  "env": {
+    "node": true,
+    "amd": true,
+    "es6": true,
+    "jest": true
+  },
+  // TODO: Consider removing some of these.
+  // https://github.com/facebook/create-react-app/pull/1840
+  // Create React App and "Standard" only allow the following:
+  // * document
+  // * window
+  // * console
+  // * navigator
+  "globals": {
+    "window": true,
+    "document": true,
+    "console": true,
+    "navigator": true,
+    "alert": true,
+    "Blob": true,
+    "fetch": true,
+    "FileReader": true,
+    "Element": true,
+    "AudioNode": true,
+    "MutationObserver": true,
+    "Image": true,
+    "location": true
+  },
+  "rules": {
+    "no-multiple-empty-lines": [
+      "error",
+      {
+        "max": 2,
+        "maxEOF": 0,
+        "maxBOF": 0
+      }
+    ],
+    "block-scoped-var": "warn",
+    "camelcase": "error",
+    "constructor-super": "error",
+    "dot-notation": "error",
+    "eqeqeq": ["error", "smart"],
+    "guard-for-in": "error",
+    "lines-between-class-members": [
+      "warn",
+      "always",
+      { "exceptAfterSingleLine": true }
+    ],
+    "max-depth": ["warn", 4],
+    "max-params": ["warn", 5],
+    "new-cap": "error",
+    "no-caller": "error",
+    "no-catch-shadow": "error",
+    "no-const-assign": "error",
+    "no-debugger": "error",
+    "no-delete-var": "error",
+    "no-div-regex": "warn",
+    "no-dupe-args": "error",
+    "no-dupe-class-members": "error",
+    "no-dupe-keys": "error",
+    "no-duplicate-case": "error",
+    "no-duplicate-imports": "error",
+    "no-else-return": "error",
+    "no-empty-character-class": "error",
+    "no-eval": "error",
+    "no-ex-assign": "error",
+    "no-extend-native": "warn",
+    "no-extra-boolean-cast": "error",
+    "no-extra-semi": "error",
+    "no-fallthrough": "error",
+    "no-floating-decimal": "error",
+    "no-func-assign": "error",
+    "no-implied-eval": "error",
+    "no-inner-declarations": "error",
+    "no-irregular-whitespace": "error",
+    "no-label-var": "error",
+    "no-labels": "error",
+    "no-lone-blocks": "error",
+    "no-lonely-if": "error",
+    "no-multi-spaces": "warn",
+    "no-multi-str": "error",
+    "no-native-reassign": "error",
+    "no-negated-in-lhs": "warn",
+    "no-nested-ternary": "warn",
+    "no-new-object": "error",
+    "no-new-symbol": "error",
+    "no-new-wrappers": "error",
+    "no-obj-calls": "error",
+    "no-octal": "error",
+    "no-octal-escape": "error",
+    "no-proto": "error",
+    "no-redeclare": "error",
+    "no-shadow": "warn",
+    "no-spaced-func": "error",
+    "no-this-before-super": "error",
+    "no-throw-literal": "error",
+    "no-trailing-spaces": "error",
+    "no-undef": "error",
+    "no-undef-init": "error",
+    "no-unneeded-ternary": "error",
+    "no-unreachable": "error",
+    "no-unused-expressions": "error",
+    "@typescript-eslint/no-unused-vars": [
+      "error",
+      { "ignoreRestSiblings": true }
+    ],
+    "no-use-before-define": ["error", "nofunc"],
+    "no-useless-rename": "error",
+    "no-var": "error",
+    "no-with": "error",
+    "prefer-arrow-callback": "warn",
+    "prefer-const": "error",
+    "prefer-spread": "error",
+    "prefer-template": "warn",
+    "radix": "error",
+    "no-return-await": "error",
+    "react/no-string-refs": "error",
+    "react/jsx-boolean-value": "error",
+    "react/jsx-uses-react": "error",
+    "react/jsx-uses-vars": "error",
+    "react/prefer-es6-class": "error",
+    "react/jsx-pascal-case": "error",
+    "react/require-render-return": "error",
+    "react/self-closing-comp": "error",
+    "react/no-unescaped-entities": "error",
+    "use-isnan": "error",
+    "valid-typeof": "error",
+    "prettier/prettier": "error",
+    "import/default": "error",
+    "import/export": "error",
+    "import/first": "error",
+    "import/named": "error",
+    "import/namespace": "error",
+    "import/no-duplicates": "error",
+    "import/no-extraneous-dependencies": "error",
+    "import/no-named-as-default-member": "error",
+    "react-hooks/rules-of-hooks": "error",
+    "react-hooks/exhaustive-deps": "error"
+  }
+}
diff --git a/packages/webamp-modern/.gitignore b/packages/webamp-modern/.gitignore
new file mode 100644
index 00000000..2d3f39b9
--- /dev/null
+++ b/packages/webamp-modern/.gitignore
@@ -0,0 +1,7 @@
+**/node_modules
+
+/built
+/demo/built
+/coverage
+/examples/webpack/bundle.js
+**/__diff_output__/
diff --git a/packages/webamp-modern/.prettierignore b/packages/webamp-modern/.prettierignore
new file mode 100644
index 00000000..fe6cea0c
--- /dev/null
+++ b/packages/webamp-modern/.prettierignore
@@ -0,0 +1,8 @@
+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/config/jest.unit.js b/packages/webamp-modern/config/jest.unit.js
new file mode 100644
index 00000000..87fd40d4
--- /dev/null
+++ b/packages/webamp-modern/config/jest.unit.js
@@ -0,0 +1,18 @@
+module.exports = {
+  displayName: "test",
+  rootDir: "../",
+  testRegex: "\\.test\\.(js|ts|tsx)$",
+  globals: {
+    SENTRY_DSN: null,
+  },
+  moduleFileExtensions: ["js", "tsx", "ts"],
+  moduleNameMapper: {
+    "\\.css$": "<rootDir>/js/__mocks__/styleMock.js",
+    "\\.wsz$": "<rootDir>/js/__mocks__/fileMock.js",
+    "\\.mp3$": "<rootDir>/js/__mocks__/fileMock.js",
+  },
+  transform: {
+    "^.+\\.(js|ts|tsx)$": "babel-jest",
+  },
+  testPathIgnorePatterns: ["/node_modules/"],
+};
diff --git a/packages/webamp-modern/config/webpack.library.js b/packages/webamp-modern/config/webpack.library.js
new file mode 100644
index 00000000..42031b50
--- /dev/null
+++ b/packages/webamp-modern/config/webpack.library.js
@@ -0,0 +1,58 @@
+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.common.js b/packages/webamp-modern/demo/config/webpack.common.js
new file mode 100644
index 00000000..f0043963
--- /dev/null
+++ b/packages/webamp-modern/demo/config/webpack.common.js
@@ -0,0 +1,74 @@
+const path = require("path");
+const HtmlWebpackPlugin = require("html-webpack-plugin");
+
+module.exports = {
+  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: "production",
+          },
+        },
+      },
+      {
+        test: /\.(wsz|wal|mp3|png|ico|jpg|svg)$/,
+        use: [
+          {
+            loader: "file-loader",
+            options: {
+              emitFile: true,
+              name: "[path][name]-[hash].[ext]",
+            },
+          },
+        ],
+      },
+    ],
+    noParse: [/jszip\.js$/],
+  },
+  plugins: [
+    new HtmlWebpackPlugin({
+      filename: "modern/index.html",
+      template: "../modern/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",
+      chunks: ["modern"],
+    }),
+  ],
+
+  performance: {
+    // We do some crazy shit okay! Don't judge!
+    maxEntrypointSize: 7000000,
+    maxAssetSize: 7000000,
+  },
+  entry: {
+    modern: ["../modern/src/index.js"],
+  },
+  context: path.resolve(__dirname, "../"),
+  output: {
+    filename: "[name]-[hash].js",
+    chunkFilename: "[name]-[hash].js",
+    publicPath: "/",
+    path: path.resolve(__dirname, "../built"),
+  },
+};
diff --git a/packages/webamp-modern/demo/config/webpack.dev.js b/packages/webamp-modern/demo/config/webpack.dev.js
new file mode 100644
index 00000000..9bb2b4f6
--- /dev/null
+++ b/packages/webamp-modern/demo/config/webpack.dev.js
@@ -0,0 +1,10 @@
+const merge = require("webpack-merge");
+const common = require("./webpack.common.js");
+
+module.exports = merge(common, {
+  devtool: "source-map",
+  mode: "development",
+  devServer: {
+    overlay: true,
+  },
+});
diff --git a/packages/webamp-modern/demo/config/webpack.prod.js b/packages/webamp-modern/demo/config/webpack.prod.js
new file mode 100644
index 00000000..7cafcfea
--- /dev/null
+++ b/packages/webamp-modern/demo/config/webpack.prod.js
@@ -0,0 +1,10 @@
+const merge = require("webpack-merge");
+
+const common = require("./webpack.common.js");
+
+const config = merge(common, {
+  devtool: "source-map",
+  mode: "production",
+});
+
+module.exports = config;
diff --git a/packages/webamp-modern/demo/mp3/llama-2.91.mp3 b/packages/webamp-modern/demo/mp3/llama-2.91.mp3
new file mode 100644
index 00000000..7262ff2b
Binary files /dev/null and b/packages/webamp-modern/demo/mp3/llama-2.91.mp3 differ
diff --git a/packages/webamp/eslint-local-rules.js b/packages/webamp-modern/eslint-local-rules.js
similarity index 100%
rename from packages/webamp/eslint-local-rules.js
rename to packages/webamp-modern/eslint-local-rules.js
diff --git a/packages/webamp/modern/.eslintrc b/packages/webamp-modern/modern/.eslintrc
similarity index 100%
rename from packages/webamp/modern/.eslintrc
rename to packages/webamp-modern/modern/.eslintrc
diff --git a/packages/webamp/modern/README.md b/packages/webamp-modern/modern/README.md
similarity index 100%
rename from packages/webamp/modern/README.md
rename to packages/webamp-modern/modern/README.md
diff --git a/packages/webamp/modern/eslint/maki-class.js b/packages/webamp-modern/modern/eslint/maki-class.js
similarity index 100%
rename from packages/webamp/modern/eslint/maki-class.js
rename to packages/webamp-modern/modern/eslint/maki-class.js
diff --git a/packages/webamp/modern/eslint/maki-eslint-utils.js b/packages/webamp-modern/modern/eslint/maki-eslint-utils.js
similarity index 100%
rename from packages/webamp/modern/eslint/maki-eslint-utils.js
rename to packages/webamp-modern/modern/eslint/maki-eslint-utils.js
diff --git a/packages/webamp/modern/eslint/maki-method-types.js b/packages/webamp-modern/modern/eslint/maki-method-types.js
similarity index 100%
rename from packages/webamp/modern/eslint/maki-method-types.js
rename to packages/webamp-modern/modern/eslint/maki-method-types.js
diff --git a/packages/webamp/modern/eslint/maki-missing-methods.js b/packages/webamp-modern/modern/eslint/maki-missing-methods.js
similarity index 100%
rename from packages/webamp/modern/eslint/maki-missing-methods.js
rename to packages/webamp-modern/modern/eslint/maki-missing-methods.js
diff --git a/packages/webamp/modern/index.html b/packages/webamp-modern/modern/index.html
similarity index 100%
rename from packages/webamp/modern/index.html
rename to packages/webamp-modern/modern/index.html
diff --git a/packages/webamp/modern/maki.md b/packages/webamp-modern/modern/maki.md
similarity index 100%
rename from packages/webamp/modern/maki.md
rename to packages/webamp-modern/modern/maki.md
diff --git a/packages/webamp/modern/resources/SimpleTutorial.wal b/packages/webamp-modern/modern/resources/SimpleTutorial.wal
similarity index 100%
rename from packages/webamp/modern/resources/SimpleTutorial.wal
rename to packages/webamp-modern/modern/resources/SimpleTutorial.wal
diff --git a/packages/webamp/modern/resources/Winamp-Modern-Skins-Tutorial.pdf b/packages/webamp-modern/modern/resources/Winamp-Modern-Skins-Tutorial.pdf
similarity index 100%
rename from packages/webamp/modern/resources/Winamp-Modern-Skins-Tutorial.pdf
rename to packages/webamp-modern/modern/resources/Winamp-Modern-Skins-Tutorial.pdf
diff --git a/packages/webamp/modern/resources/attribute-skin-data.json b/packages/webamp-modern/modern/resources/attribute-skin-data.json
similarity index 100%
rename from packages/webamp/modern/resources/attribute-skin-data.json
rename to packages/webamp-modern/modern/resources/attribute-skin-data.json
diff --git a/packages/webamp/modern/resources/fixtures/issue_898/minimal.m b/packages/webamp-modern/modern/resources/fixtures/issue_898/minimal.m
similarity index 100%
rename from packages/webamp/modern/resources/fixtures/issue_898/minimal.m
rename to packages/webamp-modern/modern/resources/fixtures/issue_898/minimal.m
diff --git a/packages/webamp/modern/resources/fixtures/issue_898/minimal.maki b/packages/webamp-modern/modern/resources/fixtures/issue_898/minimal.maki
similarity index 100%
rename from packages/webamp/modern/resources/fixtures/issue_898/minimal.maki
rename to packages/webamp-modern/modern/resources/fixtures/issue_898/minimal.maki
diff --git a/packages/webamp/modern/resources/fixtures/issue_898/multipass_system.maki b/packages/webamp-modern/modern/resources/fixtures/issue_898/multipass_system.maki
similarity index 100%
rename from packages/webamp/modern/resources/fixtures/issue_898/multipass_system.maki
rename to packages/webamp-modern/modern/resources/fixtures/issue_898/multipass_system.maki
diff --git a/packages/webamp/modern/resources/fixtures/standardframe.m b/packages/webamp-modern/modern/resources/fixtures/standardframe.m
similarity index 100%
rename from packages/webamp/modern/resources/fixtures/standardframe.m
rename to packages/webamp-modern/modern/resources/fixtures/standardframe.m
diff --git a/packages/webamp/modern/resources/fixtures/standardframe.maki b/packages/webamp-modern/modern/resources/fixtures/standardframe.maki
similarity index 100%
rename from packages/webamp/modern/resources/fixtures/standardframe.maki
rename to packages/webamp-modern/modern/resources/fixtures/standardframe.maki
diff --git a/packages/webamp/modern/resources/maki-skin-data.json b/packages/webamp-modern/modern/resources/maki-skin-data.json
similarity index 100%
rename from packages/webamp/modern/resources/maki-skin-data.json
rename to packages/webamp-modern/modern/resources/maki-skin-data.json
diff --git a/packages/webamp/modern/resources/maki_compiler/Unknown (Winamp 5.03)/extra/nde_specs_v1.txt b/packages/webamp-modern/modern/resources/maki_compiler/Unknown (Winamp 5.03)/extra/nde_specs_v1.txt
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/Unknown (Winamp 5.03)/extra/nde_specs_v1.txt
rename to packages/webamp-modern/modern/resources/maki_compiler/Unknown (Winamp 5.03)/extra/nde_specs_v1.txt
diff --git a/packages/webamp/modern/resources/maki_compiler/Unknown (Winamp 5.03)/lib/config.mi b/packages/webamp-modern/modern/resources/maki_compiler/Unknown (Winamp 5.03)/lib/config.mi
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/Unknown (Winamp 5.03)/lib/config.mi
rename to packages/webamp-modern/modern/resources/maki_compiler/Unknown (Winamp 5.03)/lib/config.mi
diff --git a/packages/webamp/modern/resources/maki_compiler/Unknown (Winamp 5.03)/lib/std.mi b/packages/webamp-modern/modern/resources/maki_compiler/Unknown (Winamp 5.03)/lib/std.mi
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/Unknown (Winamp 5.03)/lib/std.mi
rename to packages/webamp-modern/modern/resources/maki_compiler/Unknown (Winamp 5.03)/lib/std.mi
diff --git a/packages/webamp/modern/resources/maki_compiler/Unknown (Winamp 5.03)/readme.md b/packages/webamp-modern/modern/resources/maki_compiler/Unknown (Winamp 5.03)/readme.md
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/Unknown (Winamp 5.03)/readme.md
rename to packages/webamp-modern/modern/resources/maki_compiler/Unknown (Winamp 5.03)/readme.md
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/customseek.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/customseek.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/customseek.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/customseek.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/dragvolume.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/dragvolume.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/dragvolume.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/dragvolume.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/rotationlayer.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/rotationlayer.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/rotationlayer.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/rotationlayer.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/std.mi b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/std.mi
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/std.mi
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/Lib/std.mi
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/hello_world.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/hello_world.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/hello_world.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/hello_world.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/hello_world.maki b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/hello_world.maki
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/hello_world.maki
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/hello_world.maki
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/mc.exe b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/mc.exe
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/mc.exe
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.0.a9 (Winamp 3 alpha 8r)/mc.exe
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/centerlayer.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/centerlayer.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/centerlayer.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/centerlayer.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/config.mi b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/config.mi
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/config.mi
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/config.mi
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/customseek.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/customseek.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/customseek.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/customseek.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/dragvolume.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/dragvolume.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/dragvolume.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/dragvolume.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/pldir.mi b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/pldir.mi
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/pldir.mi
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/pldir.mi
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/rotationlayer.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/rotationlayer.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/rotationlayer.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/rotationlayer.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/std.mi b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/std.mi
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/std.mi
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/Lib/std.mi
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.maki b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.maki
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.maki
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/basicTests.maki
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/hello_world.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/hello_world.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/hello_world.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/hello_world.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/hello_world.maki b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/hello_world.maki
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/hello_world.maki
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/hello_world.maki
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/mc.exe b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/mc.exe
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/mc.exe
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/mc.exe
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/simpleFunctions.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/simpleFunctions.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/simpleFunctions.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/simpleFunctions.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/simpleFunctions.maki b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/simpleFunctions.maki
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/simpleFunctions.maki
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 build 488d)/simpleFunctions.maki
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/avswitcher.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/avswitcher.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/avswitcher.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/avswitcher.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/buttonsounds.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/buttonsounds.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/buttonsounds.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/buttonsounds.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/centerlayer.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/centerlayer.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/centerlayer.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/centerlayer.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/config.mi b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/config.mi
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/config.mi
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/config.mi
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/core.mi b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/core.mi
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/core.mi
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/core.mi
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/customseek.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/customseek.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/customseek.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/customseek.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/dragvolume.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/dragvolume.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/dragvolume.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/dragvolume.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/dumpcscript.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/dumpcscript.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/dumpcscript.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/dumpcscript.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/pldir.mi b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/pldir.mi
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/pldir.mi
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/pldir.mi
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/rotationlayer.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/rotationlayer.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/rotationlayer.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/rotationlayer.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/std.mi b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/std.mi
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/std.mi
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/Lib/std.mi
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.maki b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.maki
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.maki
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/basicTests.maki
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/hello_world.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/hello_world.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/hello_world.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/hello_world.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/hello_world.maki b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/hello_world.maki
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/hello_world.maki
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/hello_world.maki
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/mc.exe b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/mc.exe
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/mc.exe
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/mc.exe
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/simpleFunctions.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/simpleFunctions.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/simpleFunctions.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/simpleFunctions.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/simpleFunctions.maki b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/simpleFunctions.maki
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/simpleFunctions.maki
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.1.b3 (Winamp 3.0 full)/simpleFunctions.maki
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.maki b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.maki
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.maki
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/basicTests.maki
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/hello_world.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/hello_world.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/hello_world.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/hello_world.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/hello_world.maki b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/hello_world.maki
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/hello_world.maki
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/hello_world.maki
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/lib/std.mi b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/lib/std.mi
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/lib/std.mi
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/lib/std.mi
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/mc.exe b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/mc.exe
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/mc.exe
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/mc.exe
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/simpleFunctions.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/simpleFunctions.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/simpleFunctions.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/simpleFunctions.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/simpleFunctions.maki b/packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/simpleFunctions.maki
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/simpleFunctions.maki
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.1.13 (Winamp 5.02)/simpleFunctions.maki
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.maki b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.maki
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.maki
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/basicTests.maki
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/hello_world.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/hello_world.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/hello_world.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/hello_world.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/hello_world.maki b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/hello_world.maki
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/hello_world.maki
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/hello_world.maki
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/application.mi b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/application.mi
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/application.mi
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/application.mi
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/colormgr.mi b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/colormgr.mi
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/colormgr.mi
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/colormgr.mi
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/AutoRepeatButton.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/AutoRepeatButton.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/AutoRepeatButton.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/AutoRepeatButton.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/centerlayer.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/centerlayer.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/centerlayer.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/centerlayer.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/customseek.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/customseek.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/customseek.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/customseek.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/debug.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/debug.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/debug.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/debug.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/dispatch_ifc.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/dispatch_ifc.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/dispatch_ifc.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/dispatch_ifc.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/dragvolume.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/dragvolume.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/dragvolume.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/dragvolume.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/fillbar.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/fillbar.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/fillbar.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/fillbar.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/glow.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/glow.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/glow.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/glow.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/glowobject.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/glowobject.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/glowobject.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/glowobject.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/rotationlayer.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/rotationlayer.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/rotationlayer.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/rotationlayer.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/songinfo.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/songinfo.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/songinfo.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/com/songinfo.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/config.mi b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/config.mi
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/config.mi
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/config.mi
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/core.mi b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/core.mi
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/core.mi
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/core.mi
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/exd.mi b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/exd.mi
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/exd.mi
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/exd.mi
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/fileio.mi b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/fileio.mi
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/fileio.mi
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/fileio.mi
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/pldir.mi b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/pldir.mi
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/pldir.mi
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/pldir.mi
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/std.mi b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/std.mi
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/std.mi
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/std.mi
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/winampconfig.mi b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/winampconfig.mi
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/winampconfig.mi
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/lib/winampconfig.mi
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/mc.exe b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/mc.exe
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/mc.exe
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/mc.exe
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/nscrt.dll b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/nscrt.dll
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/nscrt.dll
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/nscrt.dll
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/simpleFunctions.m b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/simpleFunctions.m
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/simpleFunctions.m
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/simpleFunctions.m
diff --git a/packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/simpleFunctions.maki b/packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/simpleFunctions.maki
similarity index 100%
rename from packages/webamp/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/simpleFunctions.maki
rename to packages/webamp-modern/modern/resources/maki_compiler/v1.2.0 (Winamp 5.66)/simpleFunctions.maki
diff --git a/packages/webamp/modern/resources/maki_decompiler_1.1/COPYING b/packages/webamp-modern/modern/resources/maki_decompiler_1.1/COPYING
similarity index 100%
rename from packages/webamp/modern/resources/maki_decompiler_1.1/COPYING
rename to packages/webamp-modern/modern/resources/maki_decompiler_1.1/COPYING
diff --git a/packages/webamp/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Code.pm b/packages/webamp-modern/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Code.pm
similarity index 100%
rename from packages/webamp/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Code.pm
rename to packages/webamp-modern/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Code.pm
diff --git a/packages/webamp/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Command.pm b/packages/webamp-modern/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Command.pm
similarity index 100%
rename from packages/webamp/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Command.pm
rename to packages/webamp-modern/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Command.pm
diff --git a/packages/webamp/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Objects.pm b/packages/webamp-modern/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Objects.pm
similarity index 100%
rename from packages/webamp/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Objects.pm
rename to packages/webamp-modern/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Objects.pm
diff --git a/packages/webamp/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Parse.pm b/packages/webamp-modern/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Parse.pm
similarity index 100%
rename from packages/webamp/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Parse.pm
rename to packages/webamp-modern/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Parse.pm
diff --git a/packages/webamp/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Variable.pm b/packages/webamp-modern/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Variable.pm
similarity index 100%
rename from packages/webamp/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Variable.pm
rename to packages/webamp-modern/modern/resources/maki_decompiler_1.1/PerlAmp/Maki/Variable.pm
diff --git a/packages/webamp/modern/resources/maki_decompiler_1.1/README b/packages/webamp-modern/modern/resources/maki_decompiler_1.1/README
similarity index 100%
rename from packages/webamp/modern/resources/maki_decompiler_1.1/README
rename to packages/webamp-modern/modern/resources/maki_decompiler_1.1/README
diff --git a/packages/webamp/modern/resources/maki_decompiler_1.1/makiToPerl.pm b/packages/webamp-modern/modern/resources/maki_decompiler_1.1/makiToPerl.pm
similarity index 100%
rename from packages/webamp/modern/resources/maki_decompiler_1.1/makiToPerl.pm
rename to packages/webamp-modern/modern/resources/maki_decompiler_1.1/makiToPerl.pm
diff --git a/packages/webamp/modern/resources/maki_decompiler_1.1/mdc.pl b/packages/webamp-modern/modern/resources/maki_decompiler_1.1/mdc.pl
similarity index 100%
rename from packages/webamp/modern/resources/maki_decompiler_1.1/mdc.pl
rename to packages/webamp-modern/modern/resources/maki_decompiler_1.1/mdc.pl
diff --git a/packages/webamp/modern/resources/maki_decompiler_1.1/tool/extract_objects.pl b/packages/webamp-modern/modern/resources/maki_decompiler_1.1/tool/extract_objects.pl
similarity index 100%
rename from packages/webamp/modern/resources/maki_decompiler_1.1/tool/extract_objects.pl
rename to packages/webamp-modern/modern/resources/maki_decompiler_1.1/tool/extract_objects.pl
diff --git a/packages/webamp/modern/resources/testSkins/sameObject/container.xml b/packages/webamp-modern/modern/resources/testSkins/sameObject/container.xml
similarity index 100%
rename from packages/webamp/modern/resources/testSkins/sameObject/container.xml
rename to packages/webamp-modern/modern/resources/testSkins/sameObject/container.xml
diff --git a/packages/webamp/modern/resources/testSkins/sameObject/script.m b/packages/webamp-modern/modern/resources/testSkins/sameObject/script.m
similarity index 100%
rename from packages/webamp/modern/resources/testSkins/sameObject/script.m
rename to packages/webamp-modern/modern/resources/testSkins/sameObject/script.m
diff --git a/packages/webamp/modern/resources/testSkins/sameObject/script.maki b/packages/webamp-modern/modern/resources/testSkins/sameObject/script.maki
similarity index 100%
rename from packages/webamp/modern/resources/testSkins/sameObject/script.maki
rename to packages/webamp-modern/modern/resources/testSkins/sameObject/script.maki
diff --git a/packages/webamp/modern/resources/testSkins/sameObject/skin.xml b/packages/webamp-modern/modern/resources/testSkins/sameObject/skin.xml
similarity index 100%
rename from packages/webamp/modern/resources/testSkins/sameObject/skin.xml
rename to packages/webamp-modern/modern/resources/testSkins/sameObject/skin.xml
diff --git a/packages/webamp/modern/resources/testSkins/simpleClick/container.xml b/packages/webamp-modern/modern/resources/testSkins/simpleClick/container.xml
similarity index 100%
rename from packages/webamp/modern/resources/testSkins/simpleClick/container.xml
rename to packages/webamp-modern/modern/resources/testSkins/simpleClick/container.xml
diff --git a/packages/webamp/modern/resources/testSkins/simpleClick/script.m b/packages/webamp-modern/modern/resources/testSkins/simpleClick/script.m
similarity index 100%
rename from packages/webamp/modern/resources/testSkins/simpleClick/script.m
rename to packages/webamp-modern/modern/resources/testSkins/simpleClick/script.m
diff --git a/packages/webamp/modern/resources/testSkins/simpleClick/script.maki b/packages/webamp-modern/modern/resources/testSkins/simpleClick/script.maki
similarity index 100%
rename from packages/webamp/modern/resources/testSkins/simpleClick/script.maki
rename to packages/webamp-modern/modern/resources/testSkins/simpleClick/script.maki
diff --git a/packages/webamp/modern/resources/testSkins/simpleClick/skin.xml b/packages/webamp-modern/modern/resources/testSkins/simpleClick/skin.xml
similarity index 100%
rename from packages/webamp/modern/resources/testSkins/simpleClick/skin.xml
rename to packages/webamp-modern/modern/resources/testSkins/simpleClick/skin.xml
diff --git a/packages/webamp/modern/skins/CornerAmp_Redux.wal b/packages/webamp-modern/modern/skins/CornerAmp_Redux.wal
similarity index 100%
rename from packages/webamp/modern/skins/CornerAmp_Redux.wal
rename to packages/webamp-modern/modern/skins/CornerAmp_Redux.wal
diff --git a/packages/webamp/modern/skins/simple.wal b/packages/webamp-modern/modern/skins/simple.wal
similarity index 100%
rename from packages/webamp/modern/skins/simple.wal
rename to packages/webamp-modern/modern/skins/simple.wal
diff --git a/packages/webamp/modern/src/Actions.ts b/packages/webamp-modern/modern/src/Actions.ts
similarity index 100%
rename from packages/webamp/modern/src/Actions.ts
rename to packages/webamp-modern/modern/src/Actions.ts
diff --git a/packages/webamp/modern/src/App.css b/packages/webamp-modern/modern/src/App.css
similarity index 100%
rename from packages/webamp/modern/src/App.css
rename to packages/webamp-modern/modern/src/App.css
diff --git a/packages/webamp/modern/src/App.js b/packages/webamp-modern/modern/src/App.js
similarity index 99%
rename from packages/webamp/modern/src/App.js
rename to packages/webamp-modern/modern/src/App.js
index d96f21a3..da38b706 100644
--- a/packages/webamp/modern/src/App.js
+++ b/packages/webamp-modern/modern/src/App.js
@@ -6,7 +6,7 @@ import * as Selectors from "./Selectors";
 // import simpleSkin from "../skins/simple.wal";
 import cornerSkin from "../skins/CornerAmp_Redux.wal";
 import { useDispatch, useSelector, useStore } from "react-redux";
-import DropTarget from "../../js/components/DropTarget";
+import DropTarget from "./components/DropTarget";
 import Debugger from "./debugger";
 import Sidebar from "./Sidebar";
 const Dashboard = React.lazy(() => import("./Dashboard"));
diff --git a/packages/webamp/modern/src/Dashboard.js b/packages/webamp-modern/modern/src/Dashboard.js
similarity index 100%
rename from packages/webamp/modern/src/Dashboard.js
rename to packages/webamp-modern/modern/src/Dashboard.js
diff --git a/packages/webamp/modern/src/Emitter.ts b/packages/webamp-modern/modern/src/Emitter.ts
similarity index 100%
rename from packages/webamp/modern/src/Emitter.ts
rename to packages/webamp-modern/modern/src/Emitter.ts
diff --git a/packages/webamp/modern/src/Selectors.ts b/packages/webamp-modern/modern/src/Selectors.ts
similarity index 100%
rename from packages/webamp/modern/src/Selectors.ts
rename to packages/webamp-modern/modern/src/Selectors.ts
diff --git a/packages/webamp/modern/src/Sidebar.js b/packages/webamp-modern/modern/src/Sidebar.js
similarity index 100%
rename from packages/webamp/modern/src/Sidebar.js
rename to packages/webamp-modern/modern/src/Sidebar.js
diff --git a/packages/webamp/modern/src/__tests__/__snapshots__/objects.test.js.snap b/packages/webamp-modern/modern/src/__tests__/__snapshots__/objects.test.js.snap
similarity index 100%
rename from packages/webamp/modern/src/__tests__/__snapshots__/objects.test.js.snap
rename to packages/webamp-modern/modern/src/__tests__/__snapshots__/objects.test.js.snap
diff --git a/packages/webamp/modern/src/__tests__/__snapshots__/utils.test.js.snap b/packages/webamp-modern/modern/src/__tests__/__snapshots__/utils.test.js.snap
similarity index 100%
rename from packages/webamp/modern/src/__tests__/__snapshots__/utils.test.js.snap
rename to packages/webamp-modern/modern/src/__tests__/__snapshots__/utils.test.js.snap
diff --git a/packages/webamp/modern/src/__tests__/integration.test.js b/packages/webamp-modern/modern/src/__tests__/integration.test.js
similarity index 100%
rename from packages/webamp/modern/src/__tests__/integration.test.js
rename to packages/webamp-modern/modern/src/__tests__/integration.test.js
diff --git a/packages/webamp/modern/src/__tests__/objects.test.js b/packages/webamp-modern/modern/src/__tests__/objects.test.js
similarity index 100%
rename from packages/webamp/modern/src/__tests__/objects.test.js
rename to packages/webamp-modern/modern/src/__tests__/objects.test.js
diff --git a/packages/webamp/modern/src/__tests__/parser.test.js b/packages/webamp-modern/modern/src/__tests__/parser.test.js
similarity index 100%
rename from packages/webamp/modern/src/__tests__/parser.test.js
rename to packages/webamp-modern/modern/src/__tests__/parser.test.js
diff --git a/packages/webamp/modern/src/__tests__/testConstants.js b/packages/webamp-modern/modern/src/__tests__/testConstants.js
similarity index 100%
rename from packages/webamp/modern/src/__tests__/testConstants.js
rename to packages/webamp-modern/modern/src/__tests__/testConstants.js
diff --git a/packages/webamp/modern/src/__tests__/utils.test.js b/packages/webamp-modern/modern/src/__tests__/utils.test.js
similarity index 100%
rename from packages/webamp/modern/src/__tests__/utils.test.js
rename to packages/webamp-modern/modern/src/__tests__/utils.test.js
diff --git a/packages/webamp/modern/src/__tests__/virtualMachine.test.js b/packages/webamp-modern/modern/src/__tests__/virtualMachine.test.js
similarity index 100%
rename from packages/webamp/modern/src/__tests__/virtualMachine.test.js
rename to packages/webamp-modern/modern/src/__tests__/virtualMachine.test.js
diff --git a/packages/webamp-modern/modern/src/components/DropTarget.tsx b/packages/webamp-modern/modern/src/components/DropTarget.tsx
new file mode 100644
index 00000000..9e7e9f5f
--- /dev/null
+++ b/packages/webamp-modern/modern/src/components/DropTarget.tsx
@@ -0,0 +1,52 @@
+import React, { useCallback } from "react";
+
+interface Coord {
+  x: number;
+  y: number;
+}
+
+interface Props extends React.HTMLAttributes<HTMLDivElement> {
+  handleDrop(e: React.DragEvent<HTMLDivElement>, coord: Coord): void;
+}
+
+function supress(e: React.DragEvent<HTMLDivElement>) {
+  e.stopPropagation();
+  e.preventDefault();
+  e.dataTransfer.dropEffect = "link";
+  e.dataTransfer.effectAllowed = "link";
+}
+
+const DropTarget = (props: Props) => {
+  const {
+    // eslint-disable-next-line no-shadow, no-unused-vars
+    handleDrop,
+    ...passThroughProps
+  } = props;
+
+  const onDrop = useCallback(
+    (e: React.DragEvent<HTMLDivElement>) => {
+      supress(e);
+      // TODO: We could probably move this coordinate logic into the playlist.
+      // I think that's the only place it gets used.
+      const { currentTarget } = e;
+      if (!(currentTarget instanceof Element)) {
+        return;
+      }
+
+      const { left: x, top: y } = currentTarget.getBoundingClientRect();
+      handleDrop(e, { x, y });
+    },
+    [handleDrop]
+  );
+  return (
+    <div
+      {...passThroughProps}
+      onDragStart={supress}
+      onDragEnter={supress}
+      onDragOver={supress}
+      onDrop={onDrop}
+    />
+  );
+};
+
+export default DropTarget;
diff --git a/packages/webamp/modern/src/debugger/Command.js b/packages/webamp-modern/modern/src/debugger/Command.js
similarity index 100%
rename from packages/webamp/modern/src/debugger/Command.js
rename to packages/webamp-modern/modern/src/debugger/Command.js
diff --git a/packages/webamp/modern/src/debugger/Value.js b/packages/webamp-modern/modern/src/debugger/Value.js
similarity index 100%
rename from packages/webamp/modern/src/debugger/Value.js
rename to packages/webamp-modern/modern/src/debugger/Value.js
diff --git a/packages/webamp/modern/src/debugger/Variable.js b/packages/webamp-modern/modern/src/debugger/Variable.js
similarity index 100%
rename from packages/webamp/modern/src/debugger/Variable.js
rename to packages/webamp-modern/modern/src/debugger/Variable.js
diff --git a/packages/webamp/modern/src/debugger/index.js b/packages/webamp-modern/modern/src/debugger/index.js
similarity index 100%
rename from packages/webamp/modern/src/debugger/index.js
rename to packages/webamp-modern/modern/src/debugger/index.js
diff --git a/packages/webamp/modern/src/index.css b/packages/webamp-modern/modern/src/index.css
similarity index 100%
rename from packages/webamp/modern/src/index.css
rename to packages/webamp-modern/modern/src/index.css
diff --git a/packages/webamp/modern/src/index.js b/packages/webamp-modern/modern/src/index.js
similarity index 100%
rename from packages/webamp/modern/src/index.js
rename to packages/webamp-modern/modern/src/index.js
diff --git a/packages/webamp/modern/src/initialize.js b/packages/webamp-modern/modern/src/initialize.js
similarity index 100%
rename from packages/webamp/modern/src/initialize.js
rename to packages/webamp-modern/modern/src/initialize.js
diff --git a/packages/webamp/modern/src/initializeStateTree.ts b/packages/webamp-modern/modern/src/initializeStateTree.ts
similarity index 100%
rename from packages/webamp/modern/src/initializeStateTree.ts
rename to packages/webamp-modern/modern/src/initializeStateTree.ts
diff --git a/packages/webamp/modern/src/logo.svg b/packages/webamp-modern/modern/src/logo.svg
similarity index 100%
rename from packages/webamp/modern/src/logo.svg
rename to packages/webamp-modern/modern/src/logo.svg
diff --git a/packages/webamp/modern/src/maki-interpreter/constants.js b/packages/webamp-modern/modern/src/maki-interpreter/constants.js
similarity index 100%
rename from packages/webamp/modern/src/maki-interpreter/constants.js
rename to packages/webamp-modern/modern/src/maki-interpreter/constants.js
diff --git a/packages/webamp/modern/src/maki-interpreter/interpreter.js b/packages/webamp-modern/modern/src/maki-interpreter/interpreter.js
similarity index 100%
rename from packages/webamp/modern/src/maki-interpreter/interpreter.js
rename to packages/webamp-modern/modern/src/maki-interpreter/interpreter.js
diff --git a/packages/webamp/modern/src/maki-interpreter/objectData/config.json b/packages/webamp-modern/modern/src/maki-interpreter/objectData/config.json
similarity index 100%
rename from packages/webamp/modern/src/maki-interpreter/objectData/config.json
rename to packages/webamp-modern/modern/src/maki-interpreter/objectData/config.json
diff --git a/packages/webamp/modern/src/maki-interpreter/objectData/pldir.json b/packages/webamp-modern/modern/src/maki-interpreter/objectData/pldir.json
similarity index 100%
rename from packages/webamp/modern/src/maki-interpreter/objectData/pldir.json
rename to packages/webamp-modern/modern/src/maki-interpreter/objectData/pldir.json
diff --git a/packages/webamp/modern/src/maki-interpreter/objectData/std.json b/packages/webamp-modern/modern/src/maki-interpreter/objectData/std.json
similarity index 100%
rename from packages/webamp/modern/src/maki-interpreter/objectData/std.json
rename to packages/webamp-modern/modern/src/maki-interpreter/objectData/std.json
diff --git a/packages/webamp/modern/src/maki-interpreter/objectData/stdPatched.js b/packages/webamp-modern/modern/src/maki-interpreter/objectData/stdPatched.js
similarity index 100%
rename from packages/webamp/modern/src/maki-interpreter/objectData/stdPatched.js
rename to packages/webamp-modern/modern/src/maki-interpreter/objectData/stdPatched.js
diff --git a/packages/webamp/modern/src/maki-interpreter/objects.js b/packages/webamp-modern/modern/src/maki-interpreter/objects.js
similarity index 100%
rename from packages/webamp/modern/src/maki-interpreter/objects.js
rename to packages/webamp-modern/modern/src/maki-interpreter/objects.js
diff --git a/packages/webamp/modern/src/maki-interpreter/parser.js b/packages/webamp-modern/modern/src/maki-interpreter/parser.js
similarity index 100%
rename from packages/webamp/modern/src/maki-interpreter/parser.js
rename to packages/webamp-modern/modern/src/maki-interpreter/parser.js
diff --git a/packages/webamp/modern/src/maki-interpreter/prettyPrinter.js b/packages/webamp-modern/modern/src/maki-interpreter/prettyPrinter.js
similarity index 100%
rename from packages/webamp/modern/src/maki-interpreter/prettyPrinter.js
rename to packages/webamp-modern/modern/src/maki-interpreter/prettyPrinter.js
diff --git a/packages/webamp/modern/src/maki-interpreter/readme.md b/packages/webamp-modern/modern/src/maki-interpreter/readme.md
similarity index 100%
rename from packages/webamp/modern/src/maki-interpreter/readme.md
rename to packages/webamp-modern/modern/src/maki-interpreter/readme.md
diff --git a/packages/webamp/modern/src/maki-interpreter/tools/build-typescript-interfaces.js b/packages/webamp-modern/modern/src/maki-interpreter/tools/build-typescript-interfaces.js
similarity index 100%
rename from packages/webamp/modern/src/maki-interpreter/tools/build-typescript-interfaces.js
rename to packages/webamp-modern/modern/src/maki-interpreter/tools/build-typescript-interfaces.js
diff --git a/packages/webamp/modern/src/maki-interpreter/tools/extract-attributes.js b/packages/webamp-modern/modern/src/maki-interpreter/tools/extract-attributes.js
similarity index 100%
rename from packages/webamp/modern/src/maki-interpreter/tools/extract-attributes.js
rename to packages/webamp-modern/modern/src/maki-interpreter/tools/extract-attributes.js
diff --git a/packages/webamp/modern/src/maki-interpreter/tools/extract-functions.js b/packages/webamp-modern/modern/src/maki-interpreter/tools/extract-functions.js
similarity index 100%
rename from packages/webamp/modern/src/maki-interpreter/tools/extract-functions.js
rename to packages/webamp-modern/modern/src/maki-interpreter/tools/extract-functions.js
diff --git a/packages/webamp/modern/src/maki-interpreter/tools/extract-maki-files.js b/packages/webamp-modern/modern/src/maki-interpreter/tools/extract-maki-files.js
similarity index 100%
rename from packages/webamp/modern/src/maki-interpreter/tools/extract-maki-files.js
rename to packages/webamp-modern/modern/src/maki-interpreter/tools/extract-maki-files.js
diff --git a/packages/webamp/modern/src/maki-interpreter/tools/extract-object-types.js b/packages/webamp-modern/modern/src/maki-interpreter/tools/extract-object-types.js
similarity index 100%
rename from packages/webamp/modern/src/maki-interpreter/tools/extract-object-types.js
rename to packages/webamp-modern/modern/src/maki-interpreter/tools/extract-object-types.js
diff --git a/packages/webamp/modern/src/maki-interpreter/tools/parse-mi.js b/packages/webamp-modern/modern/src/maki-interpreter/tools/parse-mi.js
similarity index 100%
rename from packages/webamp/modern/src/maki-interpreter/tools/parse-mi.js
rename to packages/webamp-modern/modern/src/maki-interpreter/tools/parse-mi.js
diff --git a/packages/webamp/modern/src/maki-interpreter/tools/parse-mi.test.js b/packages/webamp-modern/modern/src/maki-interpreter/tools/parse-mi.test.js
similarity index 100%
rename from packages/webamp/modern/src/maki-interpreter/tools/parse-mi.test.js
rename to packages/webamp-modern/modern/src/maki-interpreter/tools/parse-mi.test.js
diff --git a/packages/webamp/modern/src/maki-interpreter/variable.js b/packages/webamp-modern/modern/src/maki-interpreter/variable.js
similarity index 100%
rename from packages/webamp/modern/src/maki-interpreter/variable.js
rename to packages/webamp-modern/modern/src/maki-interpreter/variable.js
diff --git a/packages/webamp/modern/src/maki-interpreter/virtualMachine.js b/packages/webamp-modern/modern/src/maki-interpreter/virtualMachine.js
similarity index 100%
rename from packages/webamp/modern/src/maki-interpreter/virtualMachine.js
rename to packages/webamp-modern/modern/src/maki-interpreter/virtualMachine.js
diff --git a/packages/webamp/modern/src/runtime/.eslintrc b/packages/webamp-modern/modern/src/runtime/.eslintrc
similarity index 100%
rename from packages/webamp/modern/src/runtime/.eslintrc
rename to packages/webamp-modern/modern/src/runtime/.eslintrc
diff --git a/packages/webamp/modern/src/runtime/AlbumArtLayer.ts b/packages/webamp-modern/modern/src/runtime/AlbumArtLayer.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/AlbumArtLayer.ts
rename to packages/webamp-modern/modern/src/runtime/AlbumArtLayer.ts
diff --git a/packages/webamp/modern/src/runtime/AnimatedLayer.ts b/packages/webamp-modern/modern/src/runtime/AnimatedLayer.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/AnimatedLayer.ts
rename to packages/webamp-modern/modern/src/runtime/AnimatedLayer.ts
diff --git a/packages/webamp/modern/src/runtime/BitList.ts b/packages/webamp-modern/modern/src/runtime/BitList.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/BitList.ts
rename to packages/webamp-modern/modern/src/runtime/BitList.ts
diff --git a/packages/webamp/modern/src/runtime/Browser.ts b/packages/webamp-modern/modern/src/runtime/Browser.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/Browser.ts
rename to packages/webamp-modern/modern/src/runtime/Browser.ts
diff --git a/packages/webamp/modern/src/runtime/Button.ts b/packages/webamp-modern/modern/src/runtime/Button.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/Button.ts
rename to packages/webamp-modern/modern/src/runtime/Button.ts
diff --git a/packages/webamp/modern/src/runtime/CfgGroup.ts b/packages/webamp-modern/modern/src/runtime/CfgGroup.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/CfgGroup.ts
rename to packages/webamp-modern/modern/src/runtime/CfgGroup.ts
diff --git a/packages/webamp/modern/src/runtime/CheckBox.ts b/packages/webamp-modern/modern/src/runtime/CheckBox.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/CheckBox.ts
rename to packages/webamp-modern/modern/src/runtime/CheckBox.ts
diff --git a/packages/webamp/modern/src/runtime/ComponentBucket.ts b/packages/webamp-modern/modern/src/runtime/ComponentBucket.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/ComponentBucket.ts
rename to packages/webamp-modern/modern/src/runtime/ComponentBucket.ts
diff --git a/packages/webamp/modern/src/runtime/Config.ts b/packages/webamp-modern/modern/src/runtime/Config.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/Config.ts
rename to packages/webamp-modern/modern/src/runtime/Config.ts
diff --git a/packages/webamp/modern/src/runtime/ConfigAttribute.ts b/packages/webamp-modern/modern/src/runtime/ConfigAttribute.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/ConfigAttribute.ts
rename to packages/webamp-modern/modern/src/runtime/ConfigAttribute.ts
diff --git a/packages/webamp/modern/src/runtime/ConfigItem.ts b/packages/webamp-modern/modern/src/runtime/ConfigItem.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/ConfigItem.ts
rename to packages/webamp-modern/modern/src/runtime/ConfigItem.ts
diff --git a/packages/webamp/modern/src/runtime/Container.ts b/packages/webamp-modern/modern/src/runtime/Container.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/Container.ts
rename to packages/webamp-modern/modern/src/runtime/Container.ts
diff --git a/packages/webamp/modern/src/runtime/DropDownList.ts b/packages/webamp-modern/modern/src/runtime/DropDownList.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/DropDownList.ts
rename to packages/webamp-modern/modern/src/runtime/DropDownList.ts
diff --git a/packages/webamp/modern/src/runtime/Edit.ts b/packages/webamp-modern/modern/src/runtime/Edit.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/Edit.ts
rename to packages/webamp-modern/modern/src/runtime/Edit.ts
diff --git a/packages/webamp/modern/src/runtime/EqVis.ts b/packages/webamp-modern/modern/src/runtime/EqVis.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/EqVis.ts
rename to packages/webamp-modern/modern/src/runtime/EqVis.ts
diff --git a/packages/webamp/modern/src/runtime/FeedWatcher.ts b/packages/webamp-modern/modern/src/runtime/FeedWatcher.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/FeedWatcher.ts
rename to packages/webamp-modern/modern/src/runtime/FeedWatcher.ts
diff --git a/packages/webamp/modern/src/runtime/Form.ts b/packages/webamp-modern/modern/src/runtime/Form.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/Form.ts
rename to packages/webamp-modern/modern/src/runtime/Form.ts
diff --git a/packages/webamp/modern/src/runtime/Frame.ts b/packages/webamp-modern/modern/src/runtime/Frame.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/Frame.ts
rename to packages/webamp-modern/modern/src/runtime/Frame.ts
diff --git a/packages/webamp/modern/src/runtime/Group.ts b/packages/webamp-modern/modern/src/runtime/Group.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/Group.ts
rename to packages/webamp-modern/modern/src/runtime/Group.ts
diff --git a/packages/webamp/modern/src/runtime/GroupList.ts b/packages/webamp-modern/modern/src/runtime/GroupList.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/GroupList.ts
rename to packages/webamp-modern/modern/src/runtime/GroupList.ts
diff --git a/packages/webamp/modern/src/runtime/GuiList.ts b/packages/webamp-modern/modern/src/runtime/GuiList.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/GuiList.ts
rename to packages/webamp-modern/modern/src/runtime/GuiList.ts
diff --git a/packages/webamp/modern/src/runtime/GuiObject.ts b/packages/webamp-modern/modern/src/runtime/GuiObject.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/GuiObject.ts
rename to packages/webamp-modern/modern/src/runtime/GuiObject.ts
diff --git a/packages/webamp/modern/src/runtime/GuiTree.ts b/packages/webamp-modern/modern/src/runtime/GuiTree.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/GuiTree.ts
rename to packages/webamp-modern/modern/src/runtime/GuiTree.ts
diff --git a/packages/webamp/modern/src/runtime/JsElements.ts b/packages/webamp-modern/modern/src/runtime/JsElements.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/JsElements.ts
rename to packages/webamp-modern/modern/src/runtime/JsElements.ts
diff --git a/packages/webamp/modern/src/runtime/JsGammaSet.ts b/packages/webamp-modern/modern/src/runtime/JsGammaSet.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/JsGammaSet.ts
rename to packages/webamp-modern/modern/src/runtime/JsGammaSet.ts
diff --git a/packages/webamp/modern/src/runtime/JsGroupDef.ts b/packages/webamp-modern/modern/src/runtime/JsGroupDef.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/JsGroupDef.ts
rename to packages/webamp-modern/modern/src/runtime/JsGroupDef.ts
diff --git a/packages/webamp/modern/src/runtime/JsScript.ts b/packages/webamp-modern/modern/src/runtime/JsScript.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/JsScript.ts
rename to packages/webamp-modern/modern/src/runtime/JsScript.ts
diff --git a/packages/webamp/modern/src/runtime/JsWinampAbstractionLayer.ts b/packages/webamp-modern/modern/src/runtime/JsWinampAbstractionLayer.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/JsWinampAbstractionLayer.ts
rename to packages/webamp-modern/modern/src/runtime/JsWinampAbstractionLayer.ts
diff --git a/packages/webamp/modern/src/runtime/Layer.ts b/packages/webamp-modern/modern/src/runtime/Layer.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/Layer.ts
rename to packages/webamp-modern/modern/src/runtime/Layer.ts
diff --git a/packages/webamp/modern/src/runtime/Layout.ts b/packages/webamp-modern/modern/src/runtime/Layout.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/Layout.ts
rename to packages/webamp-modern/modern/src/runtime/Layout.ts
diff --git a/packages/webamp/modern/src/runtime/LayoutStatus.ts b/packages/webamp-modern/modern/src/runtime/LayoutStatus.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/LayoutStatus.ts
rename to packages/webamp-modern/modern/src/runtime/LayoutStatus.ts
diff --git a/packages/webamp/modern/src/runtime/List.ts b/packages/webamp-modern/modern/src/runtime/List.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/List.ts
rename to packages/webamp-modern/modern/src/runtime/List.ts
diff --git a/packages/webamp/modern/src/runtime/MakiMap.ts b/packages/webamp-modern/modern/src/runtime/MakiMap.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/MakiMap.ts
rename to packages/webamp-modern/modern/src/runtime/MakiMap.ts
diff --git a/packages/webamp/modern/src/runtime/MakiObject.ts b/packages/webamp-modern/modern/src/runtime/MakiObject.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/MakiObject.ts
rename to packages/webamp-modern/modern/src/runtime/MakiObject.ts
diff --git a/packages/webamp/modern/src/runtime/Menu.ts b/packages/webamp-modern/modern/src/runtime/Menu.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/Menu.ts
rename to packages/webamp-modern/modern/src/runtime/Menu.ts
diff --git a/packages/webamp/modern/src/runtime/MenuButton.ts b/packages/webamp-modern/modern/src/runtime/MenuButton.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/MenuButton.ts
rename to packages/webamp-modern/modern/src/runtime/MenuButton.ts
diff --git a/packages/webamp/modern/src/runtime/MouseRedir.ts b/packages/webamp-modern/modern/src/runtime/MouseRedir.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/MouseRedir.ts
rename to packages/webamp-modern/modern/src/runtime/MouseRedir.ts
diff --git a/packages/webamp/modern/src/runtime/PlDir.ts b/packages/webamp-modern/modern/src/runtime/PlDir.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/PlDir.ts
rename to packages/webamp-modern/modern/src/runtime/PlDir.ts
diff --git a/packages/webamp/modern/src/runtime/PlEdit.ts b/packages/webamp-modern/modern/src/runtime/PlEdit.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/PlEdit.ts
rename to packages/webamp-modern/modern/src/runtime/PlEdit.ts
diff --git a/packages/webamp/modern/src/runtime/PopupMenu.ts b/packages/webamp-modern/modern/src/runtime/PopupMenu.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/PopupMenu.ts
rename to packages/webamp-modern/modern/src/runtime/PopupMenu.ts
diff --git a/packages/webamp/modern/src/runtime/QueryList.ts b/packages/webamp-modern/modern/src/runtime/QueryList.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/QueryList.ts
rename to packages/webamp-modern/modern/src/runtime/QueryList.ts
diff --git a/packages/webamp/modern/src/runtime/Region.ts b/packages/webamp-modern/modern/src/runtime/Region.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/Region.ts
rename to packages/webamp-modern/modern/src/runtime/Region.ts
diff --git a/packages/webamp/modern/src/runtime/Slider.ts b/packages/webamp-modern/modern/src/runtime/Slider.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/Slider.ts
rename to packages/webamp-modern/modern/src/runtime/Slider.ts
diff --git a/packages/webamp/modern/src/runtime/Status.ts b/packages/webamp-modern/modern/src/runtime/Status.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/Status.ts
rename to packages/webamp-modern/modern/src/runtime/Status.ts
diff --git a/packages/webamp/modern/src/runtime/System.ts b/packages/webamp-modern/modern/src/runtime/System.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/System.ts
rename to packages/webamp-modern/modern/src/runtime/System.ts
diff --git a/packages/webamp/modern/src/runtime/TabSheet.ts b/packages/webamp-modern/modern/src/runtime/TabSheet.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/TabSheet.ts
rename to packages/webamp-modern/modern/src/runtime/TabSheet.ts
diff --git a/packages/webamp/modern/src/runtime/Text.ts b/packages/webamp-modern/modern/src/runtime/Text.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/Text.ts
rename to packages/webamp-modern/modern/src/runtime/Text.ts
diff --git a/packages/webamp/modern/src/runtime/Timer.ts b/packages/webamp-modern/modern/src/runtime/Timer.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/Timer.ts
rename to packages/webamp-modern/modern/src/runtime/Timer.ts
diff --git a/packages/webamp/modern/src/runtime/Title.ts b/packages/webamp-modern/modern/src/runtime/Title.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/Title.ts
rename to packages/webamp-modern/modern/src/runtime/Title.ts
diff --git a/packages/webamp/modern/src/runtime/ToggleButton.ts b/packages/webamp-modern/modern/src/runtime/ToggleButton.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/ToggleButton.ts
rename to packages/webamp-modern/modern/src/runtime/ToggleButton.ts
diff --git a/packages/webamp/modern/src/runtime/TreeItem.ts b/packages/webamp-modern/modern/src/runtime/TreeItem.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/TreeItem.ts
rename to packages/webamp-modern/modern/src/runtime/TreeItem.ts
diff --git a/packages/webamp/modern/src/runtime/Vis.ts b/packages/webamp-modern/modern/src/runtime/Vis.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/Vis.ts
rename to packages/webamp-modern/modern/src/runtime/Vis.ts
diff --git a/packages/webamp/modern/src/runtime/Wac.ts b/packages/webamp-modern/modern/src/runtime/Wac.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/Wac.ts
rename to packages/webamp-modern/modern/src/runtime/Wac.ts
diff --git a/packages/webamp/modern/src/runtime/WindowHolder.ts b/packages/webamp-modern/modern/src/runtime/WindowHolder.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/WindowHolder.ts
rename to packages/webamp-modern/modern/src/runtime/WindowHolder.ts
diff --git a/packages/webamp/modern/src/runtime/index.ts b/packages/webamp-modern/modern/src/runtime/index.ts
similarity index 100%
rename from packages/webamp/modern/src/runtime/index.ts
rename to packages/webamp-modern/modern/src/runtime/index.ts
diff --git a/packages/webamp/modern/src/store.ts b/packages/webamp-modern/modern/src/store.ts
similarity index 100%
rename from packages/webamp/modern/src/store.ts
rename to packages/webamp-modern/modern/src/store.ts
diff --git a/packages/webamp/modern/src/types.ts b/packages/webamp-modern/modern/src/types.ts
similarity index 100%
rename from packages/webamp/modern/src/types.ts
rename to packages/webamp-modern/modern/src/types.ts
diff --git a/packages/webamp/modern/src/utils.ts b/packages/webamp-modern/modern/src/utils.ts
similarity index 100%
rename from packages/webamp/modern/src/utils.ts
rename to packages/webamp-modern/modern/src/utils.ts
diff --git a/packages/webamp-modern/package.json b/packages/webamp-modern/package.json
new file mode 100644
index 00000000..111862cb
--- /dev/null
+++ b/packages/webamp-modern/package.json
@@ -0,0 +1,139 @@
+{
+  "name": "webamp-modern",
+  "version": "0.0.0",
+  "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",
+    "type-check": "tsc",
+    "serve": "http-server ./demo/built",
+    "start": "webpack-dev-server --open --config=demo/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}\"",
+    "analyze-wals": "babel-node --extensions=\".ts,.js,.tsx\" modern/src/maki-interpreter/tools/extract-functions.js > modern/resources/maki-skin-data.json",
+    "extract-object-types": "babel-node --extensions=\".ts,.js,.tsx\" modern/src/maki-interpreter/tools/extract-object-types.js",
+    "extract-attributes": "babel-node --extensions=\".ts,.js,.tsx\" modern/src/maki-interpreter/tools/extract-attributes.js > modern/resources/attribute-skin-data.json",
+    "maki-interfaces": "babel-node --extensions=\".ts,.js,.tsx\" modern/src/maki-interpreter/tools/build-typescript-interfaces.js > modern/__generated__/makiInterfaces.ts"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/captbaritone/webamp.git"
+  },
+  "keywords": [
+    "Winamp",
+    "HTML5",
+    "audio",
+    "web-audio-api"
+  ],
+  "author": "Jordan Eldredge <jordan@jordaneldredge.com>",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/captbaritone/webamp/issues"
+  },
+  "homepage": "https://github.com/captbaritone/webamp/",
+  "devDependencies": {
+    "@babel/core": "^7.7.2",
+    "@babel/node": "^7.0.0",
+    "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.4",
+    "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
+    "@babel/plugin-proposal-optional-chaining": "^7.6.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.0.0",
+    "@babel/plugin-transform-runtime": "^7.0.0",
+    "@babel/polyfill": "^7.7.0",
+    "@babel/preset-env": "^7.7.1",
+    "@babel/preset-react": "^7.7.0",
+    "@babel/preset-typescript": "^7.7.2",
+    "@babel/runtime": "^7.7.2",
+    "@sentry/browser": "5.9.1",
+    "@types/classnames": "^2.2.6",
+    "@types/css-font-loading-module": "^0.0.2",
+    "@types/fscreen": "^1.0.1",
+    "@types/invariant": "^2.2.29",
+    "@types/jest": "^23.3.2",
+    "@types/jszip": "^3.1.5",
+    "@types/lodash": "^4.14.116",
+    "@types/lodash-es": "^4.17.1",
+    "@types/rc-slider": "^8.6.3",
+    "@types/react": "^16.8.13",
+    "@types/react-dom": "^16.8.4",
+    "@types/react-redux": "^7.1.1",
+    "@types/webaudioapi": "^0.0.27",
+    "@typescript-eslint/eslint-plugin": "^2.6.1",
+    "@typescript-eslint/parser": "^2.7.0",
+    "babel-core": "7.0.0-bridge.0",
+    "babel-eslint": "^9.0.0-beta.3",
+    "babel-jest": "^23.4.2",
+    "babel-loader": "^8.0.4",
+    "butterchurn": "^2.6.7",
+    "canvas-mock": "0.0.0",
+    "classnames": "^2.2.5",
+    "copy-webpack-plugin": "^4.6.0",
+    "css-loader": "^1.0.1",
+    "cssnano": "^4.1.10",
+    "data-uri-to-buffer": "^2.0.0",
+    "eslint": "^6.5.1",
+    "eslint-plugin-import": "^2.18.2",
+    "eslint-plugin-prettier": "^3.1.0",
+    "eslint-plugin-react": "^7.16.0",
+    "file-loader": "^2.0.0",
+    "git-revision-webpack-plugin": "^3.0.3",
+    "glob": "^7.1.4",
+    "html-webpack-inline-svg-plugin": "^1.2.4",
+    "html-webpack-plugin": "^3.2.0",
+    "http-server": "^0.11.1",
+    "imagemin": "^6.1.0",
+    "imagemin-optipng": "^6.0.0",
+    "invariant": "^2.2.3",
+    "jest": "^24.9.0",
+    "jest-image-snapshot": "^2.12.0",
+    "jest-puppeteer": "^4.4.0",
+    "jszip": "^3.1.3",
+    "lodash": "^4.17.11",
+    "milkdrop-preset-converter-aws": "^0.1.6",
+    "music-metadata-browser": "^0.6.1",
+    "postcss": "^7.0.18",
+    "postcss-loader": "^3.0.0",
+    "prettier": "^2.0.4",
+    "puppeteer": "^1.15.0",
+    "rc-slider": "^8.7.1",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
+    "react-redux": "^7.1.0",
+    "react-test-renderer": "^16.8.1",
+    "redux": "^4.0.1",
+    "redux-devtools-extension": "^2.13.2",
+    "redux-thunk": "^2.3.0",
+    "reselect": "^3.0.1",
+    "screenfull": "^4.0.0",
+    "style-loader": "^0.23.1",
+    "tinyqueue": "^1.2.3",
+    "typescript": "^3.7.2",
+    "url-loader": "^1.1.2",
+    "webpack": "^4.41.2",
+    "webpack-bundle-analyzer": "^3.3.2",
+    "webpack-cli": "^3.1.2",
+    "webpack-dev-server": "^3.8.2",
+    "webpack-merge": "^4.1.2",
+    "winamp-eqf": "^1.0.0"
+  },
+  "jest": {
+    "globalSetup": "jest-environment-puppeteer/setup",
+    "globalTeardown": "jest-environment-puppeteer/teardown",
+    "projects": [
+      "config/jest.*.js"
+    ]
+  },
+  "prettier": {
+    "trailingComma": "es5"
+  },
+  "dependencies": {
+    "eslint-plugin-react-hooks": "^2.1.2",
+    "fscreen": "^1.0.2",
+    "react-dropzone": "^10.1.7",
+    "redux-sentry-middleware": "^0.1.3",
+    "xml-js": "^1.6.11"
+  }
+}
diff --git a/packages/webamp-modern/static.d.ts b/packages/webamp-modern/static.d.ts
new file mode 100644
index 00000000..2627e897
--- /dev/null
+++ b/packages/webamp-modern/static.d.ts
@@ -0,0 +1,6 @@
+declare module "*.wsz";
+declare module "*.mp3";
+declare module "*.png";
+declare module "*.ico";
+declare module "*.jpg";
+declare module "*.svg";
diff --git a/packages/webamp-modern/tsconfig.json b/packages/webamp-modern/tsconfig.json
new file mode 100644
index 00000000..a7279681
--- /dev/null
+++ b/packages/webamp-modern/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "module": "commonjs",
+    "target": "esnext",
+    "allowJs": true,
+    "skipLibCheck": true,
+    "allowSyntheticDefaultImports": true,
+    "resolveJsonModule": true,
+    "strict": true,
+    "jsx": "preserve",
+    "noEmit": true,
+    "pretty": true
+  },
+  "include": ["**/*.ts", "**/*.tsx"],
+  "exclude": ["node_modules", "demo/built"]
+}
diff --git a/packages/webamp/demo/config/webpack.common.js b/packages/webamp/demo/config/webpack.common.js
index 1916d66a..d13493d0 100644
--- a/packages/webamp/demo/config/webpack.common.js
+++ b/packages/webamp/demo/config/webpack.common.js
@@ -56,19 +56,6 @@ module.exports = {
       template: "./index.html",
       chunks: ["webamp"],
     }),
-    new HtmlWebpackPlugin({
-      filename: "modern/index.html",
-      template: "../modern/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",
-      chunks: ["modern"],
-    }),
     new HtmlWebpackInlineSVGPlugin({ runPreEmit: true }),
     new CopyWebpackPlugin([
       {
@@ -86,8 +73,6 @@ module.exports = {
   },
   entry: {
     webamp: ["./js/index.js"],
-    modern: ["../modern/src/index.js"],
-    wat: ["../modern/src/index.js"],
   },
   context: path.resolve(__dirname, "../"),
   output: {
diff --git a/packages/webamp/package.json b/packages/webamp/package.json
index f5d1e30b..e517982a 100644
--- a/packages/webamp/package.json
+++ b/packages/webamp/package.json
@@ -14,7 +14,7 @@
   ],
   "scripts": {
     "lint-fix": "eslint . --ext ts,tsx,js --fix",
-    "lint": "eslint . --ext ts,tsx,js --rulesdir=modern/eslint",
+    "lint": "eslint . --ext ts,tsx,js",
     "type-check": "tsc",
     "build": "webpack --config=demo/config/webpack.prod.js",
     "build-library": "webpack --config=config/webpack.library.js",
@@ -31,11 +31,7 @@
     "build-skin-png": "rm skins/base-2.91-png.wsz && cd skins/base-2.91-png && zip -x .* -x 'Skining Updates.txt' -r ../base-2.91-png.wsz .",
     "compile-skin": "node scripts/compileSkin.js > css/base-skin.css",
     "skin-info": "unzip -vl skins/base-2.91.wsz",
-    "build-presets": "node scripts/parsePresetFiles.js > presets/builtin.json",
-    "analyze-wals": "babel-node --extensions=\".ts,.js,.tsx\" modern/src/maki-interpreter/tools/extract-functions.js > modern/resources/maki-skin-data.json",
-    "extract-object-types": "babel-node --extensions=\".ts,.js,.tsx\" modern/src/maki-interpreter/tools/extract-object-types.js",
-    "extract-attributes": "babel-node --extensions=\".ts,.js,.tsx\" modern/src/maki-interpreter/tools/extract-attributes.js > modern/resources/attribute-skin-data.json",
-    "maki-interfaces": "babel-node --extensions=\".ts,.js,.tsx\" modern/src/maki-interpreter/tools/build-typescript-interfaces.js > modern/__generated__/makiInterfaces.ts"
+    "build-presets": "node scripts/parsePresetFiles.js > presets/builtin.json"
   },
   "repository": {
     "type": "git",
@@ -153,8 +149,6 @@
   "dependencies": {
     "eslint-plugin-react-hooks": "^2.1.2",
     "fscreen": "^1.0.2",
-    "react-dropzone": "^10.1.7",
-    "redux-sentry-middleware": "^0.1.3",
-    "xml-js": "^1.6.11"
+    "redux-sentry-middleware": "^0.1.3"
   }
 }