refactor: reclass all packages

bamlab · Sep 21, 2023 · 0c381cf · 0c381cf
1 parent d406d87
commit 0c381cf
Show file tree

Hide file tree

Showing 255 changed files with 79 additions and 75 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -14,9 +14,9 @@ module.exports = {
         devDependencies: [
           "**/__tests__/**",
           // web app will be built with parcel in the dist folder, so we only package the final html/js files, not the deps
-          "packages/measure/src/webapp/**",
-          "packages/web-reporter-ui/utils/testUtils.ts",
-          "packages/web-reporter/src/**",
+          "packages/commands/measure/src/webapp/**",
+          "packages/core/web-reporter-ui/utils/testUtils.ts",
+          "packages/commands/report/src/**",
           "**/*.config.js", // This is necessary for tailwind.config.js in both web-reporter and web-reporter-ui
         ],
       },

diff --git a/.github/workflows/ios_e2e.sh b/.github/workflows/ios_e2e.sh
@@ -22,4 +22,4 @@ xcrun simctl install $UDID ./.github/workflows/fakeStore.app
 xcrun simctl launch $UDID $APPID
 
 mkdir -p report
-npx flashlight-ios-poc ios-test --appId $APPID --simulatorId $UDID --testCommand 'maestro test ./packages/ios-poc/test.yaml' --resultsFilePath './report/result.json'
+npx flashlight-ios-poc ios-test --appId $APPID --simulatorId $UDID --testCommand 'maestro test ./packages/platforms/ios/test.yaml' --resultsFilePath './report/result.json'
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -43,7 +43,7 @@ yarn workspace @perf-profiler/measure start
 Then run the `measure` commmand with:
 
 ```bash
-DEVELOPMENT_MODE=true node packages/measure/dist/server/bin.js measure
+DEVELOPMENT_MODE=true node packages/commands/measure/dist/server/bin.js measure
 ```
 
 ### `test` command
@@ -52,7 +52,7 @@ To run the command locally:
 
 ```
 
-node packages/e2e-performance/dist/bin.js test
+node packages/commands/test/dist/bin.js test
 
 ```
 
@@ -74,7 +74,7 @@ yarn workspace @perf-profiler/web-reporter start
 
 ```
 
-Then in `packages/web-reporter/src/App.tsx`, uncomment the lines to add your own measures:
+Then in `packages/commands/report/src/App.tsx`, uncomment the lines to add your own measures:
 
 ```ts
 // Uncomment with when locally testing

diff --git a/jest.config.js b/jest.config.js
@@ -12,18 +12,18 @@ const commonOptions = {
   setupFiles: ["<rootDir>/jest-setup.ts"],
 };
 
-const WEB_PACKAGES = ["flipper-plugin-android-performance-profiler", "measure", "web-reporter-ui"];
+const WEB_PACKAGES = ["plugins/flipper", "commands/measure", "core/web-reporter-ui"];
 
 const NODE_PACKAGES = [
-  "android-performance-profiler",
-  "appium-helper",
-  "appium-test-cases",
-  "aws-device-farm",
-  "e2e-performance",
-  "eslint-plugin-flashlight-eslint-rules",
-  "reporter",
-  "shell",
-  "web-reporter",
+  "platforms/android",
+  "plugins/appium-helper",
+  "plugins/appium-test-cases",
+  "plugins/aws-device-farm",
+  "commands/test",
+  "plugins/eslint",
+  "core/reporter",
+  "core/shell",
+  "commands/report",
 ];
 
 module.exports = {

diff --git a/lerna.json b/lerna.json
@@ -1,18 +1,18 @@
 {
   "packages": [
-    "./packages/logger",
-    "./packages/shell",
-    "./packages/types",
-    "./packages/android-performance-profiler",
-    "./packages/appium-helper",
-    "./packages/e2e-performance",
-    "./packages/reporter",
-    "./packages/web-reporter-ui",
-    "./packages/web-reporter",
-    "./packages/appium-test-cases",
-    "./packages/aws-device-farm",
-    "./packages/measure",
-    "./packages/ios-poc"
+    "./packages/core/logger",
+    "./packages/core/shell",
+    "./packages/core/types",
+    "./packages/platforms/android",
+    "./packages/plugins/appium-helper",
+    "./packages/commands/test",
+    "./packages/core/reporter",
+    "./packages/core/web-reporter-ui",
+    "./packages/commands/report",
+    "./packages/plugins/appium-test-cases",
+    "./packages/plugins/aws-device-farm",
+    "./packages/commands/measure",
+    "./packages/platforms/ios"
   ],
   "useWorkspaces": false,
   "npmClient": "yarn",

diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
   },
   "license": "MIT",
   "workspaces": [
-    "packages/*",
+    "packages/*/*",
     "examples/*"
   ],
   "bugs": {

diff --git a/packages/measure/.postcssrc → packages/commands/measure/.postcssrc b/packages/measure/.postcssrc → packages/commands/measure/.postcssrc
diff --git a/packages/measure/CHANGELOG.md → packages/commands/measure/CHANGELOG.md b/packages/measure/CHANGELOG.md → packages/commands/measure/CHANGELOG.md
diff --git a/packages/measure/package.json → packages/commands/measure/package.json b/packages/measure/package.json → packages/commands/measure/package.json
diff --git a/...sts__/__snapshots__/measure.test.tsx.snap → ...sts__/__snapshots__/measure.test.tsx.snap b/...sts__/__snapshots__/measure.test.tsx.snap → ...sts__/__snapshots__/measure.test.tsx.snap
diff --git a/...es/measure/src/__tests__/measure.test.tsx → ...ds/measure/src/__tests__/measure.test.tsx b/...es/measure/src/__tests__/measure.test.tsx → ...ds/measure/src/__tests__/measure.test.tsx
diff --git a/...re/src/__tests__/utils/removeCLIColors.ts → ...re/src/__tests__/utils/removeCLIColors.ts b/...re/src/__tests__/utils/removeCLIColors.ts → ...re/src/__tests__/utils/removeCLIColors.ts
diff --git a/.../measure/src/common/useLogSocketEvents.ts → .../measure/src/common/useLogSocketEvents.ts b/.../measure/src/common/useLogSocketEvents.ts → .../measure/src/common/useLogSocketEvents.ts
diff --git a/packages/measure/src/server/ServerApp.tsx → ...commands/measure/src/server/ServerApp.tsx b/packages/measure/src/server/ServerApp.tsx → ...commands/measure/src/server/ServerApp.tsx
diff --git a/.../src/server/ServerSocketConnectionApp.tsx → .../src/server/ServerSocketConnectionApp.tsx b/.../src/server/ServerSocketConnectionApp.tsx → .../src/server/ServerSocketConnectionApp.tsx
diff --git a/packages/measure/src/server/bin.tsx → packages/commands/measure/src/server/bin.tsx b/packages/measure/src/server/bin.tsx → packages/commands/measure/src/server/bin.tsx
diff --git a/...src/server/components/HostAndPortInfo.tsx → ...src/server/components/HostAndPortInfo.tsx b/...src/server/components/HostAndPortInfo.tsx → ...src/server/components/HostAndPortInfo.tsx
diff --git a/packages/measure/src/server/constants.ts → .../commands/measure/src/server/constants.ts b/packages/measure/src/server/constants.ts → .../commands/measure/src/server/constants.ts
diff --git a/...sure/src/server/socket/socketInterface.ts → ...sure/src/server/socket/socketInterface.ts b/...sure/src/server/socket/socketInterface.ts → ...sure/src/server/socket/socketInterface.ts
diff --git a/.../measure/src/server/socket/socketState.ts → .../measure/src/server/socket/socketState.ts b/.../measure/src/server/socket/socketState.ts → .../measure/src/server/socket/socketState.ts
diff --git a/...measure/src/server/useBundleIdControls.ts → ...measure/src/server/useBundleIdControls.ts b/...measure/src/server/useBundleIdControls.ts → ...measure/src/server/useBundleIdControls.ts
diff --git a/...ages/measure/src/webapp/MeasureWebApp.tsx → ...ands/measure/src/webapp/MeasureWebApp.tsx b/...ages/measure/src/webapp/MeasureWebApp.tsx → ...ands/measure/src/webapp/MeasureWebApp.tsx
diff --git a/...rmance-profiler/src/components/AppBar.tsx → .../measure/src/webapp/components/AppBar.tsx b/...rmance-profiler/src/components/AppBar.tsx → .../measure/src/webapp/components/AppBar.tsx
diff --git a/...rc/webapp/components/BundleIdSelector.tsx → ...rc/webapp/components/BundleIdSelector.tsx b/...rc/webapp/components/BundleIdSelector.tsx → ...rc/webapp/components/BundleIdSelector.tsx
diff --git a/...ure/src/webapp/components/SocketState.tsx → ...ure/src/webapp/components/SocketState.tsx b/...ure/src/webapp/components/SocketState.tsx → ...ure/src/webapp/components/SocketState.tsx
diff --git a/...e-profiler/src/components/StartButton.tsx → ...ure/src/webapp/components/StartButton.tsx b/...e-profiler/src/components/StartButton.tsx → ...ure/src/webapp/components/StartButton.tsx
diff --git a/...asure/src/webapp/components/TextField.tsx → ...asure/src/webapp/components/TextField.tsx b/...asure/src/webapp/components/TextField.tsx → ...asure/src/webapp/components/TextField.tsx
diff --git a/packages/web-reporter/src/index.html → ...es/commands/measure/src/webapp/index.html b/packages/web-reporter/src/index.html → ...es/commands/measure/src/webapp/index.html
@@ -8,7 +8,7 @@
   </head>
   <body>
     <style>
-      @import "../../web-reporter-ui/index.css";
+      @import "../../../../core/web-reporter-ui/index.css";
 
       html,
       body,

diff --git a/packages/measure/src/webapp/index.js → ...ages/commands/measure/src/webapp/index.js b/packages/measure/src/webapp/index.js → ...ages/commands/measure/src/webapp/index.js
diff --git a/packages/measure/src/webapp/socket.ts → ...ges/commands/measure/src/webapp/socket.ts b/packages/measure/src/webapp/socket.ts → ...ges/commands/measure/src/webapp/socket.ts
diff --git a/packages/measure/src/webapp/useMeasures.ts → ...ommands/measure/src/webapp/useMeasures.ts b/packages/measure/src/webapp/useMeasures.ts → ...ommands/measure/src/webapp/useMeasures.ts
diff --git a/packages/measure/tailwind.config.js → packages/commands/measure/tailwind.config.js b/packages/measure/tailwind.config.js → packages/commands/measure/tailwind.config.js
diff --git a/packages/e2e-performance/tsconfig.json → packages/commands/measure/tsconfig.json b/packages/e2e-performance/tsconfig.json → packages/commands/measure/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.module.json",
+  "extends": "../../../tsconfig.module.json",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "./dist"

diff --git a/packages/commands/report/.DS_Store b/packages/commands/report/.DS_Store
diff --git a/packages/web-reporter-ui/.postcssrc → packages/commands/report/.postcssrc b/packages/web-reporter-ui/.postcssrc → packages/commands/report/.postcssrc
diff --git a/packages/web-reporter/CHANGELOG.md → packages/commands/report/CHANGELOG.md b/packages/web-reporter/CHANGELOG.md → packages/commands/report/CHANGELOG.md
diff --git a/...eb-reporter/__tests__/writeReport.test.ts → ...ands/report/__tests__/writeReport.test.ts b/...eb-reporter/__tests__/writeReport.test.ts → ...ands/report/__tests__/writeReport.test.ts
diff --git a/packages/web-reporter/openReport.ts → packages/commands/report/openReport.ts b/packages/web-reporter/openReport.ts → packages/commands/report/openReport.ts
diff --git a/packages/web-reporter/package.json → packages/commands/report/package.json b/packages/web-reporter/package.json → packages/commands/report/package.json
diff --git a/packages/web-reporter/src/App.tsx → packages/commands/report/src/App.tsx b/packages/web-reporter/src/App.tsx → packages/commands/report/src/App.tsx
@@ -19,7 +19,7 @@ let testCaseResults: TestCaseResult[] =
 //   require("./example-reports/results1.json"),
 //   require("./example-reports/results2.json"),
 // ];
-// // With videos, you have to run `cp packages/web-reporter/src/example-reports/**/*.mp4 packages/web-reporter/dist`
+// // With videos, you have to run `cp packages/commands/report/src/example-reports/**/*.mp4 packages/commands/report/dist`
 // testCaseResults = [
 //   require("./example-reports/video/results_417dd25e-d901-4b1e-9d43-3b78305a48e2.json"),
 //   require("./example-reports/video/results_c7d5d17d-42ed-4354-8b43-bb26e2d6feee.json"),

diff --git a/...porter/src/example-reports/ios/ios_1.json → ...report/src/example-reports/ios/ios_1.json b/...porter/src/example-reports/ios/ios_1.json → ...report/src/example-reports/ios/ios_1.json
diff --git a/...porter/src/example-reports/ios/ios_2.json → ...report/src/example-reports/ios/ios_2.json b/...porter/src/example-reports/ios/ios_2.json → ...report/src/example-reports/ios/ios_2.json
diff --git a/...eporter/src/example-reports/results1.json → .../report/src/example-reports/results1.json b/...eporter/src/example-reports/results1.json → .../report/src/example-reports/results1.json
diff --git a/...eporter/src/example-reports/results2.json → .../report/src/example-reports/results2.json b/...eporter/src/example-reports/results2.json → .../report/src/example-reports/results2.json
diff --git a/...417dd25e-d901-4b1e-9d43-3b78305a48e2.json → ...417dd25e-d901-4b1e-9d43-3b78305a48e2.json b/...417dd25e-d901-4b1e-9d43-3b78305a48e2.json → ...417dd25e-d901-4b1e-9d43-3b78305a48e2.json
diff --git a/...01-4b1e-9d43-3b78305a48e2_iteration_0.mp4 → ...01-4b1e-9d43-3b78305a48e2_iteration_0.mp4 b/...01-4b1e-9d43-3b78305a48e2_iteration_0.mp4 → ...01-4b1e-9d43-3b78305a48e2_iteration_0.mp4
diff --git a/...01-4b1e-9d43-3b78305a48e2_iteration_1.mp4 → ...01-4b1e-9d43-3b78305a48e2_iteration_1.mp4 b/...01-4b1e-9d43-3b78305a48e2_iteration_1.mp4 → ...01-4b1e-9d43-3b78305a48e2_iteration_1.mp4
diff --git a/...c7d5d17d-42ed-4354-8b43-bb26e2d6feee.json → ...c7d5d17d-42ed-4354-8b43-bb26e2d6feee.json b/...c7d5d17d-42ed-4354-8b43-bb26e2d6feee.json → ...c7d5d17d-42ed-4354-8b43-bb26e2d6feee.json
diff --git a/...ed-4354-8b43-bb26e2d6feee_iteration_0.mp4 → ...ed-4354-8b43-bb26e2d6feee_iteration_0.mp4 b/...ed-4354-8b43-bb26e2d6feee_iteration_0.mp4 → ...ed-4354-8b43-bb26e2d6feee_iteration_0.mp4
diff --git a/...ed-4354-8b43-bb26e2d6feee_iteration_1.mp4 → ...ed-4354-8b43-bb26e2d6feee_iteration_1.mp4 b/...ed-4354-8b43-bb26e2d6feee_iteration_1.mp4 → ...ed-4354-8b43-bb26e2d6feee_iteration_1.mp4
diff --git a/packages/measure/src/webapp/index.html → packages/commands/report/src/index.html b/packages/measure/src/webapp/index.html → packages/commands/report/src/index.html
@@ -8,7 +8,7 @@
   </head>
   <body>
     <style>
-      @import "../../../web-reporter-ui/index.css";
+      @import "../../../core/web-reporter-ui/index.css";
 
       html,
       body,

diff --git a/packages/web-reporter/src/index.js → packages/commands/report/src/index.js b/packages/web-reporter/src/index.js → packages/commands/report/src/index.js
diff --git a/packages/web-reporter/tailwind.config.js → packages/commands/report/tailwind.config.js b/packages/web-reporter/tailwind.config.js → packages/commands/report/tailwind.config.js
diff --git a/packages/web-reporter/tsconfig.json → packages/commands/report/tsconfig.json b/packages/web-reporter/tsconfig.json → packages/commands/report/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.module.json",
+  "extends": "../../../tsconfig.module.json",
   "compilerOptions": {
     "outDir": "./dist"
   },

diff --git a/packages/web-reporter/writeReport.ts → packages/commands/report/writeReport.ts b/packages/web-reporter/writeReport.ts → packages/commands/report/writeReport.ts
diff --git a/packages/e2e-performance/CHANGELOG.md → packages/commands/test/CHANGELOG.md b/packages/e2e-performance/CHANGELOG.md → packages/commands/test/CHANGELOG.md
diff --git a/packages/e2e-performance/package.json → packages/commands/test/package.json b/packages/e2e-performance/package.json → packages/commands/test/package.json
diff --git a/...2e-performance/src/PerformanceMeasurer.ts → .../commands/test/src/PerformanceMeasurer.ts b/...2e-performance/src/PerformanceMeasurer.ts → .../commands/test/src/PerformanceMeasurer.ts
diff --git a/.../e2e-performance/src/PerformanceTester.ts → ...es/commands/test/src/PerformanceTester.ts b/.../e2e-performance/src/PerformanceTester.ts → ...es/commands/test/src/PerformanceTester.ts
diff --git a/...-performance/src/SingleIterationTester.ts → ...ommands/test/src/SingleIterationTester.ts b/...-performance/src/SingleIterationTester.ts → ...ommands/test/src/SingleIterationTester.ts
diff --git a/packages/e2e-performance/src/Trace.ts → packages/commands/test/src/Trace.ts b/packages/e2e-performance/src/Trace.ts → packages/commands/test/src/Trace.ts
diff --git a/...src/__tests__/PerformanceMeasurer.test.ts → ...src/__tests__/PerformanceMeasurer.test.ts b/...src/__tests__/PerformanceMeasurer.test.ts → ...src/__tests__/PerformanceMeasurer.test.ts
diff --git a/...pshots__/PerformanceMeasurer.test.ts.snap → ...pshots__/PerformanceMeasurer.test.ts.snap b/...pshots__/PerformanceMeasurer.test.ts.snap → ...pshots__/PerformanceMeasurer.test.ts.snap
diff --git a/.../src/__tests__/measurePerformance.test.ts → .../src/__tests__/measurePerformance.test.ts b/.../src/__tests__/measurePerformance.test.ts → .../src/__tests__/measurePerformance.test.ts
diff --git a/...performance/src/__tests__/writeResults.ts → ...mmands/test/src/__tests__/writeResults.ts b/...performance/src/__tests__/writeResults.ts → ...mmands/test/src/__tests__/writeResults.ts
diff --git a/packages/e2e-performance/src/bin.ts → packages/commands/test/src/bin.ts b/packages/e2e-performance/src/bin.ts → packages/commands/test/src/bin.ts
diff --git a/...erformance/src/commands/logLevelOption.ts → ...mands/test/src/commands/logLevelOption.ts b/...erformance/src/commands/logLevelOption.ts → ...mands/test/src/commands/logLevelOption.ts
diff --git a/packages/e2e-performance/src/executeAsync.ts → packages/commands/test/src/executeAsync.ts b/packages/e2e-performance/src/executeAsync.ts → packages/commands/test/src/executeAsync.ts
diff --git a/packages/e2e-performance/src/index.ts → packages/commands/test/src/index.ts b/packages/e2e-performance/src/index.ts → packages/commands/test/src/index.ts
diff --git a/...e2e-performance/src/measurePerformance.ts → ...s/commands/test/src/measurePerformance.ts b/...e2e-performance/src/measurePerformance.ts → ...s/commands/test/src/measurePerformance.ts
diff --git a/.../src/utils/test/PerformancePollingMock.ts → .../src/utils/test/PerformancePollingMock.ts b/.../src/utils/test/PerformancePollingMock.ts → .../src/utils/test/PerformancePollingMock.ts
diff --git a/...rmance/src/utils/test/mockChildProcess.ts → ...s/test/src/utils/test/mockChildProcess.ts b/...rmance/src/utils/test/mockChildProcess.ts → ...s/test/src/utils/test/mockChildProcess.ts
diff --git a/...rmance/src/utils/test/mockEmitMeasures.ts → ...s/test/src/utils/test/mockEmitMeasures.ts b/...rmance/src/utils/test/mockEmitMeasures.ts → ...s/test/src/utils/test/mockEmitMeasures.ts
diff --git a/...e/src/utils/test/sample-atrace-output.txt → ...t/src/utils/test/sample-atrace-output.txt b/...e/src/utils/test/sample-atrace-output.txt → ...t/src/utils/test/sample-atrace-output.txt
diff --git a/...rc/utils/test/sample-command-output-1.txt → ...rc/utils/test/sample-command-output-1.txt b/...rc/utils/test/sample-command-output-1.txt → ...rc/utils/test/sample-command-output-1.txt
diff --git a/...rc/utils/test/sample-command-output-2.txt → ...rc/utils/test/sample-command-output-2.txt b/...rc/utils/test/sample-command-output-2.txt → ...rc/utils/test/sample-command-output-2.txt
diff --git a/.../src/utils/test/sample-gfxinfo-output.txt → .../src/utils/test/sample-gfxinfo-output.txt b/.../src/utils/test/sample-gfxinfo-output.txt → .../src/utils/test/sample-gfxinfo-output.txt
diff --git a/packages/e2e-performance/src/writeReport.ts → packages/commands/test/src/writeReport.ts b/packages/e2e-performance/src/writeReport.ts → packages/commands/test/src/writeReport.ts
diff --git a/packages/ios-poc/tsconfig.json → packages/commands/test/tsconfig.json b/packages/ios-poc/tsconfig.json → packages/commands/test/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.module.json",
+  "extends": "../../../tsconfig.module.json",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "./dist"

diff --git a/packages/logger/CHANGELOG.md → packages/core/logger/CHANGELOG.md b/packages/logger/CHANGELOG.md → packages/core/logger/CHANGELOG.md
diff --git a/packages/logger/bin.ts → packages/core/logger/bin.ts b/packages/logger/bin.ts → packages/core/logger/bin.ts
diff --git a/packages/logger/index.ts → packages/core/logger/index.ts b/packages/logger/index.ts → packages/core/logger/index.ts
diff --git a/packages/logger/package.json → packages/core/logger/package.json b/packages/logger/package.json → packages/core/logger/package.json
diff --git a/packages/logger/tsconfig.json → packages/core/logger/tsconfig.json b/packages/logger/tsconfig.json → packages/core/logger/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.module.json",
+  "extends": "../../../tsconfig.module.json",
   "compilerOptions": {
     "outDir": "./dist"
   },

diff --git a/packages/reporter/CHANGELOG.md → packages/core/reporter/CHANGELOG.md b/packages/reporter/CHANGELOG.md → packages/core/reporter/CHANGELOG.md
diff --git a/...ges/android-performance-profiler/index.ts → packages/core/reporter/index.ts b/...ges/android-performance-profiler/index.ts → packages/core/reporter/index.ts
diff --git a/packages/reporter/package.json → packages/core/reporter/package.json b/packages/reporter/package.json → packages/core/reporter/package.json
diff --git a/packages/reporter/src/index.ts → packages/core/reporter/src/index.ts b/packages/reporter/src/index.ts → packages/core/reporter/src/index.ts
diff --git a/...rting/__tests__/averageIterations.test.ts → ...rting/__tests__/averageIterations.test.ts b/...rting/__tests__/averageIterations.test.ts → ...rting/__tests__/averageIterations.test.ts
diff --git a/...porter/src/reporting/averageIterations.ts → ...porter/src/reporting/averageIterations.ts b/...porter/src/reporting/averageIterations.ts → ...porter/src/reporting/averageIterations.ts
diff --git a/packages/reporter/src/reporting/getScore.ts → ...s/core/reporter/src/reporting/getScore.ts b/packages/reporter/src/reporting/getScore.ts → ...s/core/reporter/src/reporting/getScore.ts
diff --git a/packages/reporter/src/reporting/reporting.ts → .../core/reporter/src/reporting/reporting.ts b/packages/reporter/src/reporting/reporting.ts → .../core/reporter/src/reporting/reporting.ts
diff --git a/...reporter/src/utils/sanitizeProcessName.ts → ...reporter/src/utils/sanitizeProcessName.ts b/...reporter/src/utils/sanitizeProcessName.ts → ...reporter/src/utils/sanitizeProcessName.ts
diff --git a/...ndroid-performance-profiler/tsconfig.json → packages/core/reporter/tsconfig.json b/...ndroid-performance-profiler/tsconfig.json → packages/core/reporter/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.module.json",
+  "extends": "../../../tsconfig.module.json",
   "compilerOptions": {
     "outDir": "./dist"
   },

diff --git a/packages/shell/CHANGELOG.md → packages/core/shell/CHANGELOG.md b/packages/shell/CHANGELOG.md → packages/core/shell/CHANGELOG.md
diff --git a/packages/shell/package.json → packages/core/shell/package.json b/packages/shell/package.json → packages/core/shell/package.json
diff --git a/packages/shell/src/index.ts → packages/core/shell/src/index.ts b/packages/shell/src/index.ts → packages/core/shell/src/index.ts
diff --git a/packages/measure/tsconfig.json → packages/core/shell/tsconfig.json b/packages/measure/tsconfig.json → packages/core/shell/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.module.json",
+  "extends": "../../../tsconfig.module.json",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "./dist"

diff --git a/packages/types/CHANGELOG.md → packages/core/types/CHANGELOG.md b/packages/types/CHANGELOG.md → packages/core/types/CHANGELOG.md
diff --git a/packages/types/index.ts → packages/core/types/index.ts b/packages/types/index.ts → packages/core/types/index.ts
diff --git a/packages/types/package.json → packages/core/types/package.json b/packages/types/package.json → packages/core/types/package.json
diff --git a/packages/appium-helper/tsconfig.json → packages/core/types/tsconfig.json b/packages/appium-helper/tsconfig.json → packages/core/types/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.module.json",
+  "extends": "../../../tsconfig.module.json",
   "compilerOptions": {
     "outDir": "./dist"
   },

diff --git a/packages/web-reporter/.postcssrc → packages/core/web-reporter-ui/.postcssrc b/packages/web-reporter/.postcssrc → packages/core/web-reporter-ui/.postcssrc
diff --git a/packages/web-reporter-ui/CHANGELOG.md → packages/core/web-reporter-ui/CHANGELOG.md b/packages/web-reporter-ui/CHANGELOG.md → packages/core/web-reporter-ui/CHANGELOG.md
diff --git a/packages/web-reporter-ui/ReporterView.tsx → ...ges/core/web-reporter-ui/ReporterView.tsx b/packages/web-reporter-ui/ReporterView.tsx → ...ges/core/web-reporter-ui/ReporterView.tsx
diff --git a/...porter-ui/__tests__/ReporterView.test.tsx → ...porter-ui/__tests__/ReporterView.test.tsx b/...porter-ui/__tests__/ReporterView.test.tsx → ...porter-ui/__tests__/ReporterView.test.tsx
@@ -7,8 +7,8 @@ import { getText } from "../utils/testUtils";
 describe("<ReporterView />", () => {
   it("renders the comparison view", () => {
     const testCaseResults: TestCaseResult[] = [
-      require("../../web-reporter/src/example-reports/results1.json"),
-      require("../../web-reporter/src/example-reports/results2.json"),
+      require("../../../commands/report/src/example-reports/results1.json"),
+      require("../../../commands/report/src/example-reports/results2.json"),
     ];
 
     const { asFragment, baseElement } = render(
@@ -44,8 +44,8 @@ describe("<ReporterView />", () => {
 
   it("renders the comparison view with videos", () => {
     const testCaseResults: TestCaseResult[] = [
-      require("../../web-reporter/src/example-reports/video/results_417dd25e-d901-4b1e-9d43-3b78305a48e2.json"),
-      require("../../web-reporter/src/example-reports/video/results_c7d5d17d-42ed-4354-8b43-bb26e2d6feee.json"),
+      require("../../../commands/report/src/example-reports/video/results_417dd25e-d901-4b1e-9d43-3b78305a48e2.json"),
+      require("../../../commands/report/src/example-reports/video/results_c7d5d17d-42ed-4354-8b43-bb26e2d6feee.json"),
     ];
 
     const { asFragment, baseElement } = render(

diff --git a/.../__snapshots__/ReporterView.test.tsx.snap → .../__snapshots__/ReporterView.test.tsx.snap b/.../__snapshots__/ReporterView.test.tsx.snap → .../__snapshots__/ReporterView.test.tsx.snap
diff --git a/packages/web-reporter-ui/index.css → packages/core/web-reporter-ui/index.css b/packages/web-reporter-ui/index.css → packages/core/web-reporter-ui/index.css
diff --git a/packages/web-reporter-ui/index.tsx → packages/core/web-reporter-ui/index.tsx b/packages/web-reporter-ui/index.tsx → packages/core/web-reporter-ui/index.tsx
diff --git a/packages/web-reporter-ui/package.json → packages/core/web-reporter-ui/package.json b/packages/web-reporter-ui/package.json → packages/core/web-reporter-ui/package.json
diff --git a/...web-reporter-ui/src/components/Button.tsx → ...web-reporter-ui/src/components/Button.tsx b/...web-reporter-ui/src/components/Button.tsx → ...web-reporter-ui/src/components/Button.tsx
diff --git a/.../web-reporter-ui/src/components/Chart.tsx → .../web-reporter-ui/src/components/Chart.tsx b/.../web-reporter-ui/src/components/Chart.tsx → .../web-reporter-ui/src/components/Chart.tsx
diff --git a/...eporter-ui/src/components/Collapsible.tsx → ...eporter-ui/src/components/Collapsible.tsx b/...eporter-ui/src/components/Collapsible.tsx → ...eporter-ui/src/components/Collapsible.tsx
diff --git a/...web-reporter-ui/src/components/Header.tsx → ...web-reporter-ui/src/components/Header.tsx b/...web-reporter-ui/src/components/Header.tsx → ...web-reporter-ui/src/components/Header.tsx
diff --git a/...r-ui/src/components/IterationSelector.tsx → ...r-ui/src/components/IterationSelector.tsx b/...r-ui/src/components/IterationSelector.tsx → ...r-ui/src/components/IterationSelector.tsx
diff --git a/...rter-ui/src/components/PageBackground.tsx → ...rter-ui/src/components/PageBackground.tsx b/...rter-ui/src/components/PageBackground.tsx → ...rter-ui/src/components/PageBackground.tsx
diff --git a/.../web-reporter-ui/src/components/Score.tsx → .../web-reporter-ui/src/components/Score.tsx b/.../web-reporter-ui/src/components/Score.tsx → .../web-reporter-ui/src/components/Score.tsx
diff --git a/...eporter-ui/src/components/SimpleTable.tsx → ...eporter-ui/src/components/SimpleTable.tsx b/...eporter-ui/src/components/SimpleTable.tsx → ...eporter-ui/src/components/SimpleTable.tsx
diff --git a/...web-reporter-ui/src/components/Switch.tsx → ...web-reporter-ui/src/components/Switch.tsx b/...web-reporter-ui/src/components/Switch.tsx → ...web-reporter-ui/src/components/Switch.tsx
diff --git a/.../web-reporter-ui/src/components/Table.tsx → .../web-reporter-ui/src/components/Table.tsx b/.../web-reporter-ui/src/components/Table.tsx → .../web-reporter-ui/src/components/Table.tsx
diff --git a/...eporter-ui/src/components/ThreadTable.tsx → ...eporter-ui/src/components/ThreadTable.tsx b/...eporter-ui/src/components/ThreadTable.tsx → ...eporter-ui/src/components/ThreadTable.tsx
diff --git a/...ui/src/components/icons/ArrowDownIcon.tsx → ...ui/src/components/icons/ArrowDownIcon.tsx b/...ui/src/components/icons/ArrowDownIcon.tsx → ...ui/src/components/icons/ArrowDownIcon.tsx
diff --git a/...eb-reporter-ui/src/sections/CPUReport.tsx → ...eb-reporter-ui/src/sections/CPUReport.tsx b/...eb-reporter-ui/src/sections/CPUReport.tsx → ...eb-reporter-ui/src/sections/CPUReport.tsx
diff --git a/...eb-reporter-ui/src/sections/FPSReport.tsx → ...eb-reporter-ui/src/sections/FPSReport.tsx b/...eb-reporter-ui/src/sections/FPSReport.tsx → ...eb-reporter-ui/src/sections/FPSReport.tsx
diff --git a/...eb-reporter-ui/src/sections/RAMReport.tsx → ...eb-reporter-ui/src/sections/RAMReport.tsx b/...eb-reporter-ui/src/sections/RAMReport.tsx → ...eb-reporter-ui/src/sections/RAMReport.tsx
diff --git a/...c/sections/ReportSummary/Explanations.tsx → ...c/sections/ReportSummary/Explanations.tsx b/...c/sections/ReportSummary/Explanations.tsx → ...c/sections/ReportSummary/Explanations.tsx
diff --git a/...ReportSummary/FailedReportSummaryCard.tsx → ...ReportSummary/FailedReportSummaryCard.tsx b/...ReportSummary/FailedReportSummaryCard.tsx → ...ReportSummary/FailedReportSummaryCard.tsx
diff --git a/...ReportSummary/ReportSummary.component.tsx → ...ReportSummary/ReportSummary.component.tsx b/...ReportSummary/ReportSummary.component.tsx → ...ReportSummary/ReportSummary.component.tsx
diff --git a/...tions/ReportSummary/ReportSummaryCard.tsx → ...tions/ReportSummary/ReportSummaryCard.tsx b/...tions/ReportSummary/ReportSummaryCard.tsx → ...tions/ReportSummary/ReportSummaryCard.tsx
diff --git a/...eportSummary/ReportSummaryCardInfoRow.tsx → ...eportSummary/ReportSummaryCardInfoRow.tsx b/...eportSummary/ReportSummaryCardInfoRow.tsx → ...eportSummary/ReportSummaryCardInfoRow.tsx
diff --git a/...reporter-ui/src/sections/VideoSection.tsx → ...reporter-ui/src/sections/VideoSection.tsx b/...reporter-ui/src/sections/VideoSection.tsx → ...reporter-ui/src/sections/VideoSection.tsx
diff --git a/packages/web-reporter-ui/src/theme/colors.ts → .../core/web-reporter-ui/src/theme/colors.ts b/packages/web-reporter-ui/src/theme/colors.ts → .../core/web-reporter-ui/src/theme/colors.ts
diff --git a/packages/web-reporter-ui/tailwind.config.js → ...s/core/web-reporter-ui/tailwind.config.js b/packages/web-reporter-ui/tailwind.config.js → ...s/core/web-reporter-ui/tailwind.config.js
diff --git a/packages/web-reporter-ui/tsconfig.json → packages/core/web-reporter-ui/tsconfig.json b/packages/web-reporter-ui/tsconfig.json → packages/core/web-reporter-ui/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.module.json",
+  "extends": "../../../tsconfig.module.json",
   "compilerOptions": {
     "outDir": "./dist"
   },

diff --git a/...-reporter-ui/utils/reportRawDataExport.ts → ...-reporter-ui/utils/reportRawDataExport.ts b/...-reporter-ui/utils/reportRawDataExport.ts → ...-reporter-ui/utils/reportRawDataExport.ts
diff --git a/...s/web-reporter-ui/utils/roundToDecimal.ts → ...e/web-reporter-ui/utils/roundToDecimal.ts b/...s/web-reporter-ui/utils/roundToDecimal.ts → ...e/web-reporter-ui/utils/roundToDecimal.ts
diff --git a/packages/web-reporter-ui/utils/testUtils.ts → ...s/core/web-reporter-ui/utils/testUtils.ts b/packages/web-reporter-ui/utils/testUtils.ts → ...s/core/web-reporter-ui/utils/testUtils.ts
diff --git a/...eb-reporter-ui/videoCurrentTimeContext.ts → ...eb-reporter-ui/videoCurrentTimeContext.ts b/...eb-reporter-ui/videoCurrentTimeContext.ts → ...eb-reporter-ui/videoCurrentTimeContext.ts
diff --git a/packages/flipper-plugin-android-performance-profiler/tsconfig.json b/packages/flipper-plugin-android-performance-profiler/tsconfig.json
diff --git a/...s/android-performance-profiler/.gitignore → packages/platforms/android/.gitignore b/...s/android-performance-profiler/.gitignore → packages/platforms/android/.gitignore
diff --git a/...android-performance-profiler/CHANGELOG.md → packages/platforms/android/CHANGELOG.md b/...android-performance-profiler/CHANGELOG.md → packages/platforms/android/CHANGELOG.md
diff --git a/...formance-profiler/cpp-profiler/.gitignore → ...platforms/android/cpp-profiler/.gitignore b/...formance-profiler/cpp-profiler/.gitignore → ...platforms/android/cpp-profiler/.gitignore
diff --git a/...ofiler/cpp-profiler/.vscode/settings.json → ...ndroid/cpp-profiler/.vscode/settings.json b/...ofiler/cpp-profiler/.vscode/settings.json → ...ndroid/cpp-profiler/.vscode/settings.json
diff --git a/...ance-profiler/cpp-profiler/CMakeLists.txt → ...forms/android/cpp-profiler/CMakeLists.txt b/...ance-profiler/cpp-profiler/CMakeLists.txt → ...forms/android/cpp-profiler/CMakeLists.txt
diff --git a/...rformance-profiler/cpp-profiler/README.md → .../platforms/android/cpp-profiler/README.md b/...rformance-profiler/cpp-profiler/README.md → .../platforms/android/cpp-profiler/README.md
diff --git a/...pp-profiler/bin/BAMPerfProfiler-arm64-v8a → ...pp-profiler/bin/BAMPerfProfiler-arm64-v8a b/...pp-profiler/bin/BAMPerfProfiler-arm64-v8a → ...pp-profiler/bin/BAMPerfProfiler-arm64-v8a
diff --git a/...-profiler/bin/BAMPerfProfiler-armeabi-v7a → ...-profiler/bin/BAMPerfProfiler-armeabi-v7a b/...-profiler/bin/BAMPerfProfiler-armeabi-v7a → ...-profiler/bin/BAMPerfProfiler-armeabi-v7a
diff --git a/...iler/cpp-profiler/bin/BAMPerfProfiler-x86 → ...roid/cpp-profiler/bin/BAMPerfProfiler-x86 b/...iler/cpp-profiler/bin/BAMPerfProfiler-x86 → ...roid/cpp-profiler/bin/BAMPerfProfiler-x86
diff --git a/...r/cpp-profiler/bin/BAMPerfProfiler-x86_64 → ...d/cpp-profiler/bin/BAMPerfProfiler-x86_64 b/...r/cpp-profiler/bin/BAMPerfProfiler-x86_64 → ...d/cpp-profiler/bin/BAMPerfProfiler-x86_64
diff --git a/...ce-profiler/cpp-profiler/build_all_abi.sh → ...rms/android/cpp-profiler/build_all_abi.sh b/...ce-profiler/cpp-profiler/build_all_abi.sh → ...rms/android/cpp-profiler/build_all_abi.sh
diff --git a/...ce-profiler/cpp-profiler/build_for_abi.sh → ...rms/android/cpp-profiler/build_for_abi.sh b/...ce-profiler/cpp-profiler/build_for_abi.sh → ...rms/android/cpp-profiler/build_for_abi.sh
diff --git a/...-performance-profiler/cpp-profiler/run.sh → ...ges/platforms/android/cpp-profiler/run.sh b/...-performance-profiler/cpp-profiler/run.sh → ...ges/platforms/android/cpp-profiler/run.sh
diff --git a/...ance-profiler/cpp-profiler/src/atrace.cpp → ...forms/android/cpp-profiler/src/atrace.cpp b/...ance-profiler/cpp-profiler/src/atrace.cpp → ...forms/android/cpp-profiler/src/atrace.cpp
diff --git a/...rmance-profiler/cpp-profiler/src/atrace.h → ...atforms/android/cpp-profiler/src/atrace.h b/...rmance-profiler/cpp-profiler/src/atrace.h → ...atforms/android/cpp-profiler/src/atrace.h
diff --git a/...rmance-profiler/cpp-profiler/src/main.cpp → ...atforms/android/cpp-profiler/src/main.cpp b/...rmance-profiler/cpp-profiler/src/main.cpp → ...atforms/android/cpp-profiler/src/main.cpp
diff --git a/...mance-profiler/cpp-profiler/src/utils.cpp → ...tforms/android/cpp-profiler/src/utils.cpp b/...mance-profiler/cpp-profiler/src/utils.cpp → ...tforms/android/cpp-profiler/src/utils.cpp
diff --git a/...ormance-profiler/cpp-profiler/src/utils.h → ...latforms/android/cpp-profiler/src/utils.h b/...ormance-profiler/cpp-profiler/src/utils.h → ...latforms/android/cpp-profiler/src/utils.h
diff --git a/packages/reporter/index.ts → packages/platforms/android/index.ts b/packages/reporter/index.ts → packages/platforms/android/index.ts
diff --git a/...android-performance-profiler/package.json → packages/platforms/android/package.json b/...android-performance-profiler/package.json → packages/platforms/android/package.json
diff --git a/...roid-performance-profiler/src/commands.ts → packages/platforms/android/src/commands.ts b/...roid-performance-profiler/src/commands.ts → packages/platforms/android/src/commands.ts
diff --git a/...e-profiler/src/commands/ScreenRecorder.ts → ...ms/android/src/commands/ScreenRecorder.ts b/...e-profiler/src/commands/ScreenRecorder.ts → ...ms/android/src/commands/ScreenRecorder.ts
diff --git a/...rc/commands/__tests__/cppProfiler.test.ts → ...rc/commands/__tests__/cppProfiler.test.ts b/...rc/commands/__tests__/cppProfiler.test.ts → ...rc/commands/__tests__/cppProfiler.test.ts
diff --git a/..._tests__/detectCurrentAppBundleId.test.ts → ..._tests__/detectCurrentAppBundleId.test.ts b/..._tests__/detectCurrentAppBundleId.test.ts → ..._tests__/detectCurrentAppBundleId.test.ts
diff --git a/...src/commands/__tests__/dumpsys-window.txt → ...src/commands/__tests__/dumpsys-window.txt b/...src/commands/__tests__/dumpsys-window.txt → ...src/commands/__tests__/dumpsys-window.txt
diff --git a/...iler/src/commands/__tests__/long-file.txt → ...roid/src/commands/__tests__/long-file.txt b/...iler/src/commands/__tests__/long-file.txt → ...roid/src/commands/__tests__/long-file.txt
diff --git a/...iler/src/commands/__tests__/shell.test.ts → ...roid/src/commands/__tests__/shell.test.ts b/...iler/src/commands/__tests__/shell.test.ts → ...roid/src/commands/__tests__/shell.test.ts
diff --git a/...commands/atrace/__tests__/pollFpsUsage.ts → ...commands/atrace/__tests__/pollFpsUsage.ts b/...commands/atrace/__tests__/pollFpsUsage.ts → ...commands/atrace/__tests__/pollFpsUsage.ts
diff --git a/...filer/src/commands/atrace/pollFpsUsage.ts → ...droid/src/commands/atrace/pollFpsUsage.ts b/...filer/src/commands/atrace/pollFpsUsage.ts → ...droid/src/commands/atrace/pollFpsUsage.ts
diff --git a/...ance-profiler/src/commands/cppProfiler.ts → ...forms/android/src/commands/cppProfiler.ts b/...ance-profiler/src/commands/cppProfiler.ts → ...forms/android/src/commands/cppProfiler.ts
diff --git a/.../src/commands/cpu/CpuMeasureAggregator.ts → .../src/commands/cpu/CpuMeasureAggregator.ts b/.../src/commands/cpu/CpuMeasureAggregator.ts → .../src/commands/cpu/CpuMeasureAggregator.ts
diff --git a/...pu/__tests__/getCpuStatsByProcess.test.ts → ...pu/__tests__/getCpuStatsByProcess.test.ts b/...pu/__tests__/getCpuStatsByProcess.test.ts → ...pu/__tests__/getCpuStatsByProcess.test.ts
diff --git a/.../src/commands/cpu/getCpuStatsByProcess.ts → .../src/commands/cpu/getCpuStatsByProcess.ts b/.../src/commands/cpu/getCpuStatsByProcess.ts → .../src/commands/cpu/getCpuStatsByProcess.ts
diff --git a/.../src/commands/detectCurrentAppBundleId.ts → .../src/commands/detectCurrentAppBundleId.ts b/.../src/commands/detectCurrentAppBundleId.ts → .../src/commands/detectCurrentAppBundleId.ts
diff --git a/...rformance-profiler/src/commands/getAbi.ts → .../platforms/android/src/commands/getAbi.ts b/...rformance-profiler/src/commands/getAbi.ts → .../platforms/android/src/commands/getAbi.ts
diff --git a/...ormance-profiler/src/commands/getPidId.ts → ...latforms/android/src/commands/getPidId.ts b/...ormance-profiler/src/commands/getPidId.ts → ...latforms/android/src/commands/getPidId.ts
diff --git a/...er/src/commands/gfxInfo/GfxInfoMeasure.ts → ...id/src/commands/gfxInfo/GfxInfoMeasure.ts b/...er/src/commands/gfxInfo/GfxInfoMeasure.ts → ...id/src/commands/gfxInfo/GfxInfoMeasure.ts
diff --git a/...mmands/gfxInfo/__tests__/GfxInfoParser.ts → ...mmands/gfxInfo/__tests__/GfxInfoParser.ts b/...mmands/gfxInfo/__tests__/GfxInfoParser.ts → ...mmands/gfxInfo/__tests__/GfxInfoParser.ts
diff --git a/...mands/gfxInfo/__tests__/GfxInfoSample.txt → ...mands/gfxInfo/__tests__/GfxInfoSample.txt b/...mands/gfxInfo/__tests__/GfxInfoSample.txt → ...mands/gfxInfo/__tests__/GfxInfoSample.txt
diff --git a/...rc/commands/gfxInfo/compareGfxMeasures.ts → ...rc/commands/gfxInfo/compareGfxMeasures.ts b/...rc/commands/gfxInfo/compareGfxMeasures.ts → ...rc/commands/gfxInfo/compareGfxMeasures.ts
diff --git a/...iler/src/commands/gfxInfo/parseGfxInfo.ts → ...roid/src/commands/gfxInfo/parseGfxInfo.ts b/...iler/src/commands/gfxInfo/parseGfxInfo.ts → ...roid/src/commands/gfxInfo/parseGfxInfo.ts
diff --git a/...iler/src/commands/gfxInfo/pollFpsUsage.ts → ...roid/src/commands/gfxInfo/pollFpsUsage.ts b/...iler/src/commands/gfxInfo/pollFpsUsage.ts → ...roid/src/commands/gfxInfo/pollFpsUsage.ts
diff --git a/...r/src/commands/pollPerformanceMeasures.ts → ...d/src/commands/pollPerformanceMeasures.ts b/...r/src/commands/pollPerformanceMeasures.ts → ...d/src/commands/pollPerformanceMeasures.ts
diff --git a/...profiler/src/commands/ram/pollRamUsage.ts → .../android/src/commands/ram/pollRamUsage.ts b/...profiler/src/commands/ram/pollRamUsage.ts → .../android/src/commands/ram/pollRamUsage.ts
diff --git a/...erformance-profiler/src/commands/shell.ts → ...s/platforms/android/src/commands/shell.ts b/...erformance-profiler/src/commands/shell.ts → ...s/platforms/android/src/commands/shell.ts
diff --git a/...android-performance-profiler/src/index.ts → packages/platforms/android/src/index.ts b/...android-performance-profiler/src/index.ts → packages/platforms/android/src/index.ts
diff --git a/...performance-profiler/src/utils/waitFor.ts → ...es/platforms/android/src/utils/waitFor.ts b/...performance-profiler/src/utils/waitFor.ts → ...es/platforms/android/src/utils/waitFor.ts
diff --git a/packages/reporter/tsconfig.json → packages/platforms/android/tsconfig.json b/packages/reporter/tsconfig.json → packages/platforms/android/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.module.json",
+  "extends": "../../../tsconfig.module.json",
   "compilerOptions": {
     "outDir": "./dist"
   },

diff --git a/packages/ios-poc/.gitignore → packages/platforms/ios/.gitignore b/packages/ios-poc/.gitignore → packages/platforms/ios/.gitignore
diff --git a/packages/ios-poc/CHANGELOG.md → packages/platforms/ios/CHANGELOG.md b/packages/ios-poc/CHANGELOG.md → packages/platforms/ios/CHANGELOG.md
diff --git a/packages/ios-poc/Flashlight.tracetemplate → ...es/platforms/ios/Flashlight.tracetemplate b/packages/ios-poc/Flashlight.tracetemplate → ...es/platforms/ios/Flashlight.tracetemplate
diff --git a/packages/ios-poc/README.md → packages/platforms/ios/README.md b/packages/ios-poc/README.md → packages/platforms/ios/README.md
@@ -14,7 +14,7 @@ Requirements:
 
 - Check the results in the web-reporter
   `yarn workspace @perf-profiler/web-reporter build`
-- `node packages/web-reporter/dist/openReport.js report result.json`
+- `node packages/commands/report/dist/openReport.js report result.json`
 
 ## Next steps
 

diff --git a/packages/ios-poc/package.json → packages/platforms/ios/package.json b/packages/ios-poc/package.json → packages/platforms/ios/package.json
diff --git a/packages/ios-poc/src/launchIOS.ts → packages/platforms/ios/src/launchIOS.ts b/packages/ios-poc/src/launchIOS.ts → packages/platforms/ios/src/launchIOS.ts
diff --git a/packages/ios-poc/src/utils/xmlTypes.ts → packages/platforms/ios/src/utils/xmlTypes.ts b/packages/ios-poc/src/utils/xmlTypes.ts → packages/platforms/ios/src/utils/xmlTypes.ts
diff --git a/packages/ios-poc/src/writeReport.ts → packages/platforms/ios/src/writeReport.ts b/packages/ios-poc/src/writeReport.ts → packages/platforms/ios/src/writeReport.ts
diff --git a/packages/ios-poc/test.yaml → packages/platforms/ios/test.yaml b/packages/ios-poc/test.yaml → packages/platforms/ios/test.yaml
diff --git a/packages/shell/tsconfig.json → packages/platforms/ios/tsconfig.json b/packages/shell/tsconfig.json → packages/platforms/ios/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.module.json",
+  "extends": "../../../tsconfig.module.json",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "./dist"

diff --git a/packages/appium-helper/AppiumDriver.ts → ...ges/plugins/appium-helper/AppiumDriver.ts b/packages/appium-helper/AppiumDriver.ts → ...ges/plugins/appium-helper/AppiumDriver.ts
diff --git a/packages/appium-helper/CHANGELOG.md → packages/plugins/appium-helper/CHANGELOG.md b/packages/appium-helper/CHANGELOG.md → packages/plugins/appium-helper/CHANGELOG.md
diff --git a/packages/appium-helper/GestureHandler.ts → ...s/plugins/appium-helper/GestureHandler.ts b/packages/appium-helper/GestureHandler.ts → ...s/plugins/appium-helper/GestureHandler.ts
diff --git a/packages/appium-helper/README.md → packages/plugins/appium-helper/README.md b/packages/appium-helper/README.md → packages/plugins/appium-helper/README.md
diff --git a/packages/appium-helper/index.ts → packages/plugins/appium-helper/index.ts b/packages/appium-helper/index.ts → packages/plugins/appium-helper/index.ts
diff --git a/packages/appium-helper/package.json → packages/plugins/appium-helper/package.json b/packages/appium-helper/package.json → packages/plugins/appium-helper/package.json
diff --git a/packages/appium-test-cases/tsconfig.json → packages/plugins/appium-helper/tsconfig.json b/packages/appium-test-cases/tsconfig.json → packages/plugins/appium-helper/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.module.json",
+  "extends": "../../../tsconfig.module.json",
   "compilerOptions": {
     "outDir": "./dist"
   },

diff --git a/packages/appium-test-cases/CHANGELOG.md → ...es/plugins/appium-test-cases/CHANGELOG.md b/packages/appium-test-cases/CHANGELOG.md → ...es/plugins/appium-test-cases/CHANGELOG.md
diff --git a/packages/appium-test-cases/index.ts → packages/plugins/appium-test-cases/index.ts b/packages/appium-test-cases/index.ts → packages/plugins/appium-test-cases/index.ts
diff --git a/packages/appium-test-cases/package.json → ...es/plugins/appium-test-cases/package.json b/packages/appium-test-cases/package.json → ...es/plugins/appium-test-cases/package.json
diff --git a/packages/types/tsconfig.json → ...s/plugins/appium-test-cases/tsconfig.json b/packages/types/tsconfig.json → ...s/plugins/appium-test-cases/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.module.json",
+  "extends": "../../../tsconfig.module.json",
   "compilerOptions": {
     "outDir": "./dist"
   },

diff --git a/packages/aws-device-farm/CHANGELOG.md → ...ages/plugins/aws-device-farm/CHANGELOG.md b/packages/aws-device-farm/CHANGELOG.md → ...ages/plugins/aws-device-farm/CHANGELOG.md
diff --git a/packages/aws-device-farm/package.json → ...ages/plugins/aws-device-farm/package.json b/packages/aws-device-farm/package.json → ...ages/plugins/aws-device-farm/package.json
diff --git a/packages/aws-device-farm/src/TMP_FOLDER.ts → ...plugins/aws-device-farm/src/TMP_FOLDER.ts b/packages/aws-device-farm/src/TMP_FOLDER.ts → ...plugins/aws-device-farm/src/TMP_FOLDER.ts
diff --git a/.../__snapshots__/createTestSpecFile.ts.snap → .../__snapshots__/createTestSpecFile.ts.snap b/.../__snapshots__/createTestSpecFile.ts.snap → .../__snapshots__/createTestSpecFile.ts.snap
diff --git a/...-farm/src/__tests__/createTestSpecFile.ts → ...-farm/src/__tests__/createTestSpecFile.ts b/...-farm/src/__tests__/createTestSpecFile.ts → ...-farm/src/__tests__/createTestSpecFile.ts
diff --git a/...ws-device-farm/src/__tests__/sampletsfile → ...ws-device-farm/src/__tests__/sampletsfile b/...ws-device-farm/src/__tests__/sampletsfile → ...ws-device-farm/src/__tests__/sampletsfile
diff --git a/packages/aws-device-farm/src/bin.ts → packages/plugins/aws-device-farm/src/bin.ts b/packages/aws-device-farm/src/bin.ts → packages/plugins/aws-device-farm/src/bin.ts
diff --git a/packages/aws-device-farm/src/buildYmlSpec.ts → ...ugins/aws-device-farm/src/buildYmlSpec.ts b/packages/aws-device-farm/src/buildYmlSpec.ts → ...ugins/aws-device-farm/src/buildYmlSpec.ts
diff --git a/...rm/src/commands/__tests__/checkResults.ts → ...rm/src/commands/__tests__/checkResults.ts b/...rm/src/commands/__tests__/checkResults.ts → ...rm/src/commands/__tests__/checkResults.ts
diff --git a/...m/src/commands/__tests__/results.json.zip → ...m/src/commands/__tests__/results.json.zip b/...m/src/commands/__tests__/results.json.zip → ...m/src/commands/__tests__/results.json.zip
diff --git a/...-device-farm/src/commands/checkResults.ts → ...-device-farm/src/commands/checkResults.ts b/...-device-farm/src/commands/checkResults.ts → ...-device-farm/src/commands/checkResults.ts
diff --git a/.../commands/createDefaultNodeTestPackage.ts → .../commands/createDefaultNodeTestPackage.ts b/.../commands/createDefaultNodeTestPackage.ts → .../commands/createDefaultNodeTestPackage.ts
diff --git a/...s/aws-device-farm/src/commands/runTest.ts → ...s/aws-device-farm/src/commands/runTest.ts b/...s/aws-device-farm/src/commands/runTest.ts → ...s/aws-device-farm/src/commands/runTest.ts
diff --git a/...aws-device-farm/src/commands/uploadApk.ts → ...aws-device-farm/src/commands/uploadApk.ts b/...aws-device-farm/src/commands/uploadApk.ts → ...aws-device-farm/src/commands/uploadApk.ts
diff --git a/...aws-device-farm/src/createTestSpecFile.ts → ...aws-device-farm/src/createTestSpecFile.ts b/...aws-device-farm/src/createTestSpecFile.ts → ...aws-device-farm/src/createTestSpecFile.ts
diff --git a/packages/aws-device-farm/src/index.ts → ...ages/plugins/aws-device-farm/src/index.ts b/packages/aws-device-farm/src/index.ts → ...ages/plugins/aws-device-farm/src/index.ts
diff --git a/...e-farm/src/repositories/BaseRepository.ts → ...e-farm/src/repositories/BaseRepository.ts b/...e-farm/src/repositories/BaseRepository.ts → ...e-farm/src/repositories/BaseRepository.ts
diff --git a/...evice-farm/src/repositories/devicePool.ts → ...evice-farm/src/repositories/devicePool.ts b/...evice-farm/src/repositories/devicePool.ts → ...evice-farm/src/repositories/devicePool.ts
diff --git a/...aws-device-farm/src/repositories/index.ts → ...aws-device-farm/src/repositories/index.ts b/...aws-device-farm/src/repositories/index.ts → ...aws-device-farm/src/repositories/index.ts
diff --git a/...s-device-farm/src/repositories/project.ts → ...s-device-farm/src/repositories/project.ts b/...s-device-farm/src/repositories/project.ts → ...s-device-farm/src/repositories/project.ts
diff --git a/.../aws-device-farm/src/repositories/test.ts → .../aws-device-farm/src/repositories/test.ts b/.../aws-device-farm/src/repositories/test.ts → .../aws-device-farm/src/repositories/test.ts
diff --git a/...ws-device-farm/src/repositories/upload.ts → ...ws-device-farm/src/repositories/upload.ts b/...ws-device-farm/src/repositories/upload.ts → ...ws-device-farm/src/repositories/upload.ts
diff --git a/...aws-device-farm/src/utils/downloadFile.ts → ...aws-device-farm/src/utils/downloadFile.ts b/...aws-device-farm/src/utils/downloadFile.ts → ...aws-device-farm/src/utils/downloadFile.ts
diff --git a/packages/aws-device-farm/src/utils/unzip.ts → ...lugins/aws-device-farm/src/utils/unzip.ts b/packages/aws-device-farm/src/utils/unzip.ts → ...lugins/aws-device-farm/src/utils/unzip.ts
diff --git a/...s/aws-device-farm/src/utils/uploadFile.ts → ...s/aws-device-farm/src/utils/uploadFile.ts b/...s/aws-device-farm/src/utils/uploadFile.ts → ...s/aws-device-farm/src/utils/uploadFile.ts
diff --git a/...ages/aws-device-farm/src/zipTestFolder.ts → ...gins/aws-device-farm/src/zipTestFolder.ts b/...ages/aws-device-farm/src/zipTestFolder.ts → ...gins/aws-device-farm/src/zipTestFolder.ts
diff --git a/packages/aws-device-farm/tsconfig.json → ...ges/plugins/aws-device-farm/tsconfig.json b/packages/aws-device-farm/tsconfig.json → ...ges/plugins/aws-device-farm/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.module.json",
+  "extends": "../../../tsconfig.module.json",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "./dist"

diff --git a/...ules/__tests__/no-flatlist-import.spec.ts → ...lint/__tests__/no-flatlist-import.spec.ts b/...ules/__tests__/no-flatlist-import.spec.ts → ...lint/__tests__/no-flatlist-import.spec.ts
diff --git a/...t-plugin-flashlight-eslint-rules/index.js → packages/plugins/eslint/index.js b/...t-plugin-flashlight-eslint-rules/index.js → packages/plugins/eslint/index.js
diff --git a/...ugin-flashlight-eslint-rules/package.json → packages/plugins/eslint/package.json b/...ugin-flashlight-eslint-rules/package.json → packages/plugins/eslint/package.json
diff --git a/...-eslint-rules/rules/no-flatlist-import.ts → ...lugins/eslint/rules/no-flatlist-import.ts b/...-eslint-rules/rules/no-flatlist-import.ts → ...lugins/eslint/rules/no-flatlist-import.ts
diff --git a/...gin-flashlight-eslint-rules/tsconfig.json → packages/plugins/eslint/tsconfig.json b/...gin-flashlight-eslint-rules/tsconfig.json → packages/plugins/eslint/tsconfig.json
diff --git a/...n-android-performance-profiler/.gitignore → packages/plugins/flipper/.gitignore b/...n-android-performance-profiler/.gitignore → packages/plugins/flipper/.gitignore
diff --git a/...roid-performance-profiler/babel.config.js → packages/plugins/flipper/babel.config.js b/...roid-performance-profiler/babel.config.js → packages/plugins/flipper/babel.config.js
diff --git a/...android-performance-profiler/package.json → packages/plugins/flipper/package.json b/...android-performance-profiler/package.json → packages/plugins/flipper/package.json
@@ -21,7 +21,7 @@
   "scripts": {
     "lint": "flipper-pkg lint",
     "prepack": "flipper-pkg lint && flipper-pkg bundle",
-    "copy:cpp": "cp -R ../android-performance-profiler/cpp-profiler/bin dist/bin",
+    "copy:cpp": "cp -R ../../platforms/android/cpp-profiler/bin dist/bin",
     "copy:css": "yarn workspace @perf-profiler/web-reporter-ui tailwindcss -i ./index.css -o ../flipper-plugin-android-performance-profiler/dist/index.css --minify",
     "prebundle": "mkdir -p dist && yarn copy:cpp && yarn copy:css",
     "build": "yarn prebundle && flipper-pkg bundle",

diff --git a/...nce-profiler/src/__tests__/Plugin.test.ts → ...gins/flipper/src/__tests__/Plugin.test.ts b/...nce-profiler/src/__tests__/Plugin.test.ts → ...gins/flipper/src/__tests__/Plugin.test.ts
diff --git a/...tests__/__snapshots__/Plugin.test.ts.snap → ...tests__/__snapshots__/Plugin.test.ts.snap b/...tests__/__snapshots__/Plugin.test.ts.snap → ...tests__/__snapshots__/Plugin.test.ts.snap
diff --git a/.../measure/src/webapp/components/AppBar.tsx → ...plugins/flipper/src/components/AppBar.tsx b/.../measure/src/webapp/components/AppBar.tsx → ...plugins/flipper/src/components/AppBar.tsx
diff --git a/...filer/src/components/BundleIdSelector.tsx → ...ipper/src/components/BundleIdSelector.tsx b/...filer/src/components/BundleIdSelector.tsx → ...ipper/src/components/BundleIdSelector.tsx
diff --git a/...ure/src/webapp/components/StartButton.tsx → ...ns/flipper/src/components/StartButton.tsx b/...ure/src/webapp/components/StartButton.tsx → ...ns/flipper/src/components/StartButton.tsx
diff --git a/...nce-profiler/src/components/TextField.tsx → ...gins/flipper/src/components/TextField.tsx b/...nce-profiler/src/components/TextField.tsx → ...gins/flipper/src/components/TextField.tsx
diff --git a/...ndroid-performance-profiler/src/index.css → packages/plugins/flipper/src/index.css b/...ndroid-performance-profiler/src/index.css → packages/plugins/flipper/src/index.css
diff --git a/...ndroid-performance-profiler/src/index.tsx → packages/plugins/flipper/src/index.tsx b/...ndroid-performance-profiler/src/index.tsx → packages/plugins/flipper/src/index.tsx
@@ -1,12 +1,16 @@
 import React, { useEffect, useState } from "react";
 import { DevicePluginClient, Dialog, createState } from "flipper-plugin";
-import { Button, ReporterView, setThemeAtRandom } from "@perf-profiler/web-reporter-ui";
+import {
+  Button,
+  ReporterView,
+  setThemeAtRandom,
+  getThemeColorPalette,
+} from "@perf-profiler/web-reporter-ui";
 import { BundleIdSelector } from "./components/BundleIdSelector";
 import { StartButton } from "./components/StartButton";
 import { useMeasures } from "./useMeasures";
 import { Delete } from "@mui/icons-material";
 import fs from "fs";
-import { getThemeColorPalette } from "@perf-profiler/web-reporter-ui/dist/src/theme/colors";
 import { AppBar } from "./components/AppBar";
 
 setThemeAtRandom();

diff --git a/...-performance-profiler/src/useMeasures.tsx → packages/plugins/flipper/src/useMeasures.tsx b/...-performance-profiler/src/useMeasures.tsx → packages/plugins/flipper/src/useMeasures.tsx
diff --git a/packages/plugins/flipper/tsconfig.json b/packages/plugins/flipper/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../../tsconfig.module.json",
+  "include": ["src/**/*.ts*"]
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -11,19 +11,19 @@
     "skipLibCheck": true
   },
   "references": [
-    { "path": "./packages/shell" },
-    { "path": "./packages/logger" },
-    { "path": "./packages/types" },
-    { "path": "./packages/android-performance-profiler" },
-    { "path": "./packages/appium-helper" },
-    { "path": "./packages/e2e-performance" },
-    { "path": "./packages/reporter" },
-    { "path": "./packages/web-reporter-ui" },
-    { "path": "./packages/web-reporter" },
-    { "path": "./packages/appium-test-cases" },
-    { "path": "./packages/aws-device-farm" },
-    { "path": "./packages/ios-poc" },
-    { "path": "./packages/measure" },
+    { "path": "./packages/core/shell" },
+    { "path": "./packages/core/logger" },
+    { "path": "./packages/core/types" },
+    { "path": "./packages/platforms/android" },
+    { "path": "./packages/plugins/appium-helper" },
+    { "path": "./packages/commands/test" },
+    { "path": "./packages/core/reporter" },
+    { "path": "./packages/core/web-reporter-ui" },
+    { "path": "./packages/commands/report" },
+    { "path": "./packages/plugins/appium-test-cases" },
+    { "path": "./packages/plugins/aws-device-farm" },
+    { "path": "./packages/platforms/ios" },
+    { "path": "./packages/commands/measure" },
     { "path": "./examples/cli" },
     { "path": "./examples/e2e" }
   ],

diff --git a/website/docs/test/running programatically.md b/website/docs/test/running programatically.md
@@ -13,7 +13,7 @@ _Feel free to try this out using [our example APK](https://github.com/bamlab/fla
 #### 2. Create a TS script including an e2e performance test
 
 You can use any TS/JS based e2e framework (or just simple `adb shell` commands).  
-Here's an example using our own [Appium Helper](https://github.com/bamlab/flashlight/tree/main/packages/appium-helper) (install it with `yarn add @bam.tech/appium-helper`)
+Here's an example using our own [Appium Helper](https://github.com/bamlab/flashlight/tree/main/packages/plugins/appium-helper) (install it with `yarn add @bam.tech/appium-helper`)
 
 ```ts
 import { AppiumDriver } from "@bam.tech/appium-helper";