diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 6525ab1e1d..0000000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,229 +0,0 @@
-# Javascript Node CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-javascript/ for more details
-#
-version: 2
-jobs:
-  remix-ide-chrome:
-    docker:
-      # specify the version you desire here
-      - image: circleci/node:10.18.0-browsers
-
-      # Specify service dependencies here if necessary
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-    resource_class: xlarge
-      # - image: circleci/mongo:3.4.4
-    environment:
-      - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
-      - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
-    working_directory: ~/remix-project
-
-    parallelism: 20
-    steps:
-      - checkout
-      - run: npm install
-      - run: npm run lint
-      - run:
-          name: Download Compatible JAVA Version for Selenium
-          command: |
-            java -version
-            sudo apt-get purge --auto-remove java-common
-            sudo apt-get update
-            sudo apt-get install openjdk-8-jdk
-            java -version
-      - run:
-          name: Download Selenium
-          command: ./node_modules/.bin/selenium-standalone install --config=../remix-project/apps/remix-ide/seleniumConfig.js
-      - run:
-          name: Start Selenium
-          command: ./node_modules/.bin/selenium-standalone start --config=../remix-project/apps/remix-ide/seleniumConfig.js
-          background: true
-      - run: ./apps/remix-ide/ci/browser_tests_chrome.sh
-      - store_test_results:
-          path: ./apps/remix-ide/reports/tests
-      - store_artifacts:
-          path: ./apps/remix-ide/reports/screenshots
-
-  remix-ide-firefox:
-    docker:
-      # specify the version you desire here
-      - image: circleci/node:10.18.0-browsers
-
-      # Specify service dependencies here if necessary
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-    resource_class: xlarge
-      # - image: circleci/mongo:3.4.4
-    environment:
-      - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
-      - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
-    working_directory: ~/remix-project
-
-    parallelism: 20
-    steps:
-      - checkout
-      - run: npm install
-      - run: npm run lint
-      - run:
-          name: Download Selenium
-          command: ./node_modules/.bin/selenium-standalone install --config=../remix-project/apps/remix-ide/seleniumConfig.js
-      - run:
-          name: Start Selenium
-          command: ./node_modules/.bin/selenium-standalone start --config=../remix-project/apps/remix-ide/seleniumConfig.js
-          background: true
-      - run:
-          name: Download Latest Firefox
-          command: sudo apt-get purge -y firefox && wget https://sourceforge.net/projects/ubuntuzilla/files/mozilla/apt/pool/main/f/firefox-mozilla-build/firefox-mozilla-build_73.0.1-0ubuntu1_amd64.deb
-      - run:
-          name: Install Firefox
-          command: sudo dpkg -i firefox-mozilla-build_73.0.1-0ubuntu1_amd64.deb
-      - run: ./apps/remix-ide/ci/browser_tests_firefox.sh
-      - store_test_results:
-          path: ./apps/remix-ide/reports/tests
-      - store_artifacts:
-          path: ./apps/remix-ide/reports/screenshots
-
-  remix-ide-run-deploy:
-    docker:
-      # specify the version you desire here
-      - image: circleci/node:10.18.0-browsers
-
-      # Specify service dependencies here if necessary
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-    resource_class: xlarge
-      # - image: circleci/mongo:3.4.4
-    environment:
-      - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
-      - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
-    working_directory: ~/remix-project
-
-    steps:
-      - checkout
-      - run: npm install
-      - run: npm run lint
-      - run:
-          name: Download Selenium
-          command: ./node_modules/.bin/selenium-standalone install --config=../remix-project/apps/remix-ide/seleniumConfig.js
-      - run:
-          name: Start Selenium
-          command: ./node_modules/.bin/selenium-standalone start --config=../remix-project/apps/remix-ide/seleniumConfig.js
-          background: true
-      - run: ./apps/remix-ide/ci/browser_tests_run_deploy.sh
-      - store_artifacts:
-          path: ./apps/remix-ide/reports/screenshots
-
-
-  deploy-remix-live:
-    docker:
-      # specify the version you desire here
-      - image: circleci/node:10.18.0-browsers
-
-      # Specify service dependencies here if necessary
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-    resource_class: xlarge
-      # - image: circleci/mongo:3.4.4
-    environment:
-      - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
-      - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
-    working_directory: ~/remix-project
-
-    steps:
-      - checkout
-      - run: npm install
-      - run: npm run lint
-      - run: 
-          name: Deploy
-          command: |
-            if [ "${CIRCLE_BRANCH}" == "remix_live" ]; then
-              ./apps/remix-ide/ci/deploy_from_travis_remix-live.sh;
-            fi
-      - store_artifacts:
-          path: ./apps/remix-ide/reports/screenshots
-
-  publish-docker:
-    docker:
-      # specify the version you desire here
-      - image: circleci/node:10.19.0-buster
-
-      # Specify service dependencies here if necessary
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-    resource_class: xlarge
-      # - image: circleci/mongo:3.4.4
-    environment:
-      - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
-      - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
-    working_directory: ~/remix-ide
-
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run: npm install
-      - run: npm run build
-      - run: ./ci/build_and_publish_docker_images.sh
-
-  deploy-remix-alpha:
-    docker:
-      # specify the version you desire here
-      - image: circleci/node:10.18.0-browsers
-
-      # Specify service dependencies here if necessary
-      # CircleCI maintains a library of pre-built images
-    resource_class: xlarge
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-      # - image: circleci/mongo:3.4.4
-    environment:
-      - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
-      - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
-    working_directory: ~/remix-project
-
-    steps:
-      - checkout
-      - run: npm install
-      - run: npm run lint
-      - run: 
-          name: Deploy
-          command: |
-            if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              ./apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh;
-            fi
-      - store_artifacts:
-          path: ./apps/remix-ide/reports/screenshots
-
-workflows:
-  version: 2
-  build_all:
-    jobs:
-      - remix-ide-chrome
-      - remix-ide-firefox
-      - remix-ide-run-deploy
-      - publish-docker:
-          requires:
-            - remix-ide-chrome
-            - remix-ide-firefox
-            - remix-ide-run-deploy
-      - deploy-remix-live:          
-          requires:
-            - remix-ide-chrome
-            - remix-ide-firefox
-            - remix-ide-run-deploy
-          filters:
-            branches:
-              only: remix_live
-      - deploy-remix-alpha:          
-          requires:
-            - remix-ide-chrome
-            - remix-ide-firefox
-            - remix-ide-run-deploy
-          filters:
-            branches:
-              only: master
diff --git a/.env b/.env
deleted file mode 100644
index c03ce830c2..0000000000
--- a/.env
+++ /dev/null
@@ -1,3 +0,0 @@
-gist_token=<token>
-account_passphrase=<passphrase>
-account_password=<password>
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 5668ec15a0..0000000000
--- a/.gitignore
+++ /dev/null
@@ -1,43 +0,0 @@
-
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-
-# compiled output
-/dist
-/tmp
-/out-tsc
-
-# dependencies
-/node_modules
-
-# IDEs and editors
-/.idea
-.project
-.classpath
-.c9/
-*.launch
-.settings/
-*.sublime-workspace
-
-# IDE - VSCode
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-
-# misc
-/.sass-cache
-/connect.lock
-/coverage
-/libpeerconnection.log
-npm-debug.log
-yarn-error.log
-testem.log
-/typings
-
-# System Files
-.DS_Store
-contracts
-TODO
-.tern-port
-temp_publish_docker
diff --git a/apps/remix-ide/.babelrc b/apps/remix-ide/.babelrc
new file mode 100644
index 0000000000..1320b9a327
--- /dev/null
+++ b/apps/remix-ide/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["@babel/preset-env"]
+}
diff --git a/apps/remix-ide/.circleci/config.yml b/apps/remix-ide/.circleci/config.yml
index d5d503ebd6..993c26cc09 100644
--- a/apps/remix-ide/.circleci/config.yml
+++ b/apps/remix-ide/.circleci/config.yml
@@ -7,7 +7,7 @@ jobs:
   remix-ide-chrome:
     docker:
       # specify the version you desire here
-      - image: circleci/node:10.18.0-browsers
+      - image: circleci/node:9.11.2-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -41,7 +41,7 @@ jobs:
   remix-ide-firefox:
     docker:
       # specify the version you desire here
-      - image: circleci/node:10.18.0-browsers
+      - image: circleci/node:9.11.2-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -81,7 +81,7 @@ jobs:
   remix-ide-run-deploy:
     docker:
       # specify the version you desire here
-      - image: circleci/node:10.18.0-browsers
+      - image: circleci/node:9.11.2-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -113,7 +113,7 @@ jobs:
   deploy-remix-live:
     docker:
       # specify the version you desire here
-      - image: circleci/node:10.18.0-browsers
+      - image: circleci/node:9.11.2-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -139,10 +139,33 @@ jobs:
       - store_artifacts:
           path: ./reports/screenshots
 
+  publish-docker:
+    docker:
+      # specify the version you desire here
+      - image: circleci/node:10.19.0-buster
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+    resource_class: xlarge
+      # - image: circleci/mongo:3.4.4
+    environment:
+      - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
+      - COMMIT_AUTHOR: "Circle CI"
+      - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
+    working_directory: ~/remix-ide
+
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run: npm install
+      - run: npm run build
+      - run: ./ci/build_and_publish_docker_images.sh
+
   deploy-remix-alpha:
     docker:
       # specify the version you desire here
-      - image: circleci/node:10.18.0-browsers
+      - image: circleci/node:9.11.2-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -175,6 +198,11 @@ workflows:
       - remix-ide-chrome
       - remix-ide-firefox
       - remix-ide-run-deploy
+      - publish-docker:
+          requires:
+            - remix-ide-chrome
+            - remix-ide-firefox
+            - remix-ide-run-deploy
       - deploy-remix-live:          
           requires:
             - remix-ide-chrome
diff --git a/.dockerignore b/apps/remix-ide/.dockerignore
similarity index 100%
rename from .dockerignore
rename to apps/remix-ide/.dockerignore
diff --git a/apps/remix-ide/.env b/apps/remix-ide/.env
index b08c745d22..c03ce830c2 100644
--- a/apps/remix-ide/.env
+++ b/apps/remix-ide/.env
@@ -1,3 +1,3 @@
-gist_token = <token>
-account_passphrase = <passphrase>
-account_password = <password>
\ No newline at end of file
+gist_token=<token>
+account_passphrase=<passphrase>
+account_password=<password>
diff --git a/apps/remix-ide/.gitignore b/apps/remix-ide/.gitignore
index b324da238e..5668ec15a0 100644
--- a/apps/remix-ide/.gitignore
+++ b/apps/remix-ide/.gitignore
@@ -1,14 +1,43 @@
-.idea
-.vscode
-build
-node_modules
-docs/_build
-reports
-soljson.js
-soljson.js.*
-npm-debug.log*
-remix
+
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+
+# dependencies
+/node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+
+# System Files
 .DS_Store
 contracts
 TODO
 .tern-port
+temp_publish_docker
diff --git a/Dockerfile b/apps/remix-ide/Dockerfile
similarity index 100%
rename from Dockerfile
rename to apps/remix-ide/Dockerfile
diff --git a/Dockerfile.dev b/apps/remix-ide/Dockerfile.dev
similarity index 100%
rename from Dockerfile.dev
rename to apps/remix-ide/Dockerfile.dev
diff --git a/assets/img/deployAndRun.webp b/apps/remix-ide/assets/img/deployAndRun.webp
similarity index 100%
rename from assets/img/deployAndRun.webp
rename to apps/remix-ide/assets/img/deployAndRun.webp
diff --git a/assets/img/fileManager.webp b/apps/remix-ide/assets/img/fileManager.webp
similarity index 100%
rename from assets/img/fileManager.webp
rename to apps/remix-ide/assets/img/fileManager.webp
diff --git a/assets/img/ipfs.webp b/apps/remix-ide/assets/img/ipfs.webp
similarity index 100%
rename from assets/img/ipfs.webp
rename to apps/remix-ide/assets/img/ipfs.webp
diff --git a/assets/img/localPlugin.webp b/apps/remix-ide/assets/img/localPlugin.webp
similarity index 100%
rename from assets/img/localPlugin.webp
rename to apps/remix-ide/assets/img/localPlugin.webp
diff --git a/assets/img/pluginManager.webp b/apps/remix-ide/assets/img/pluginManager.webp
similarity index 100%
rename from assets/img/pluginManager.webp
rename to apps/remix-ide/assets/img/pluginManager.webp
diff --git a/assets/img/remixLogo.webp b/apps/remix-ide/assets/img/remixLogo.webp
similarity index 100%
rename from assets/img/remixLogo.webp
rename to apps/remix-ide/assets/img/remixLogo.webp
diff --git a/assets/img/settings.webp b/apps/remix-ide/assets/img/settings.webp
similarity index 100%
rename from assets/img/settings.webp
rename to apps/remix-ide/assets/img/settings.webp
diff --git a/assets/img/solidity.webp b/apps/remix-ide/assets/img/solidity.webp
similarity index 100%
rename from assets/img/solidity.webp
rename to apps/remix-ide/assets/img/solidity.webp
diff --git a/assets/img/staticAnalysis.webp b/apps/remix-ide/assets/img/staticAnalysis.webp
similarity index 100%
rename from assets/img/staticAnalysis.webp
rename to apps/remix-ide/assets/img/staticAnalysis.webp
diff --git a/assets/img/swarm.webp b/apps/remix-ide/assets/img/swarm.webp
similarity index 100%
rename from assets/img/swarm.webp
rename to apps/remix-ide/assets/img/swarm.webp
diff --git a/assets/img/unitTesting.webp b/apps/remix-ide/assets/img/unitTesting.webp
similarity index 100%
rename from assets/img/unitTesting.webp
rename to apps/remix-ide/assets/img/unitTesting.webp
diff --git a/assets/js/editor/darkTheme.js b/apps/remix-ide/assets/js/editor/darkTheme.js
similarity index 100%
rename from assets/js/editor/darkTheme.js
rename to apps/remix-ide/assets/js/editor/darkTheme.js
diff --git a/build.yaml b/apps/remix-ide/build.yaml
similarity index 100%
rename from build.yaml
rename to apps/remix-ide/build.yaml
diff --git a/apps/remix-ide/ci/browser_tests_chrome.sh b/apps/remix-ide/ci/browser_tests_chrome.sh
index 39480fe668..6ee9b74c55 100755
--- a/apps/remix-ide/ci/browser_tests_chrome.sh
+++ b/apps/remix-ide/ci/browser_tests_chrome.sh
@@ -22,7 +22,9 @@ setupRemixd
 sleep 5
 
 TESTFILES=$(circleci tests glob "./apps/remix-ide/test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
-npm run nightwatch_local_chrome $TESTFILES
+for TESTFILE in $TESTFILES; do
+    ./node_modules/.bin/nightwatch --config nightwatch.js --env chrome $TESTFILE || TEST_EXITCODE=1
+done
 
 echo "$TEST_EXITCODE"
 if [ "$TEST_EXITCODE" -eq 1 ]
diff --git a/apps/remix-ide/ci/browser_tests_firefox.sh b/apps/remix-ide/ci/browser_tests_firefox.sh
index 393daedf93..5e49e4a29d 100755
--- a/apps/remix-ide/ci/browser_tests_firefox.sh
+++ b/apps/remix-ide/ci/browser_tests_firefox.sh
@@ -22,11 +22,12 @@ setupRemixd
 sleep 5
 
 TESTFILES=$(circleci tests glob "./apps/remix-ide/test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
-npm run nightwatch_local_firefox $TESTFILES
+for TESTFILE in $TESTFILES; do
+    ./node_modules/.bin/nightwatch --config nightwatch.js --env firefox $TESTFILE || TEST_EXITCODE=1
+done
 
 echo "$TEST_EXITCODE"
 if [ "$TEST_EXITCODE" -eq 1 ]
 then
   exit 1
 fi
-
diff --git a/ci/build_and_publish_docker_images.sh b/apps/remix-ide/ci/build_and_publish_docker_images.sh
similarity index 100%
rename from ci/build_and_publish_docker_images.sh
rename to apps/remix-ide/ci/build_and_publish_docker_images.sh
diff --git a/docker-compose.yaml b/apps/remix-ide/docker-compose.yaml
similarity index 100%
rename from docker-compose.yaml
rename to apps/remix-ide/docker-compose.yaml
diff --git a/nginx.conf b/apps/remix-ide/nginx.conf
similarity index 100%
rename from nginx.conf
rename to apps/remix-ide/nginx.conf
diff --git a/package-lock.json b/apps/remix-ide/package-lock.json
similarity index 100%
rename from package-lock.json
rename to apps/remix-ide/package-lock.json
diff --git a/apps/remix-ide/package.json b/apps/remix-ide/package.json
index aae986a183..f21b7f82e3 100644
--- a/apps/remix-ide/package.json
+++ b/apps/remix-ide/package.json
@@ -1,6 +1,6 @@
 {
   "name": "remix-ide",
-  "version": "v0.10.1",
+  "version": "v0.10.2",
   "description": "Extendable Web IDE for Ethereum",
   "devDependencies": {
     "@babel/core": "^7.4.5",
@@ -49,20 +49,20 @@
     "minixhr": "^3.2.2",
     "mkdirp": "^0.5.1",
     "nanohtml": "^1.6.3",
-    "nightwatch": "^1.3.5",
+    "nightwatch": "^0.9.20",
     "notify-error": "^1.2.0",
     "npm-link-local": "^1.1.0",
     "npm-merge-driver": "^2.3.5",
     "npm-run-all": "^4.0.2",
     "onchange": "^3.2.1",
-    "remix-analyzer": "0.5.2",
-    "remix-debug": "0.4.4",
-    "remix-lib": "0.4.29",
-    "remix-simulator": "0.1.9-beta.5",
-    "remix-solidity": "0.3.30",
+    "remix-analyzer": "0.5.3",
+    "remix-debug": "0.4.5",
+    "remix-lib": "0.4.30",
+    "remix-simulator": "0.1.9-beta.6",
+    "remix-solidity": "0.3.31",
     "remix-tabs": "1.0.48",
-    "remix-tests": "0.1.33",
-    "remixd": "0.1.8-alpha.10",
+    "remix-tests": "0.1.34",
+    "remixd": "0.2.3-alpha.1",
     "request": "^2.83.0",
     "rimraf": "^2.6.1",
     "selenium-standalone": "^6.17.0",
@@ -79,9 +79,8 @@
     "yo-yoify": "^3.7.3"
   },
   "dependencies": {
-    "@remixproject/engine": "^0.2.3",
+    "@remixproject/engine": "^0.2.5",
     "http-server": "^0.11.1",
-    "remixd": "0.1.8-alpha.10",
     "standard": "^8.5.0"
   },
   "repository": {
@@ -166,6 +165,7 @@
     "nightwatch_local_firefox": "nightwatch --config nightwatch.js --env firefox",
     "nightwatch_local_chrome": "nightwatch --config nightwatch.js --env chrome",
     "nightwatch_local_ballot": "nightwatch ./test-browser/tests/ballot.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_usingWorker": "nightwatch ./test-browser/tests/usingWebWorker.test.js --config nightwatch.js --env chrome ",
     "nightwatch_local_libraryDeployment": "nightwatch ./test-browser/tests/libraryDeployment.test.js --config nightwatch.js --env chrome ",
     "nightwatch_local_solidityImport": "nightwatch ./test-browser/tests/solidityImport.test.js --config nightwatch.js --env chrome ",
     "nightwatch_local_recorder": "nightwatch ./test-browser/tests/recorder.test.js --config nightwatch.js --env chrome ",
@@ -185,7 +185,9 @@
     "nightwatch_local_fileExplorer": "nightwatch ./test-browser/tests/fileExplorer.test.js --config nightwatch.js --env chrome ",
     "nightwatch_local_debugger": "nightwatch ./test-browser/tests/debugger.test.js --config nightwatch.js --env chrome ",
     "nightwatch_local_editor": "nightwatch ./test-browser/tests/editor.test.js --config nightwatch.js --env chrome ",
-    
+    "nightwatch_local_compiler": "nightwatch ./test-browser/tests/compiler_api.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_txListener": "nightwatch ./test-browser/tests/txListener.test.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_fileManager": "nightwatch ./test-browser/tests/fileManager_api.test.js --config nightwatch.js --env chrome ",
     "nightwatch_local_runAndDeploy": "nightwatch ./test-browser/tests/runAndDeploy.js --config nightwatch.js --env chrome-runAndDeploy ",
     "onchange": "onchange build/app.js -- npm-run-all lint",
     "prepublish": "mkdirp build; npm-run-all -ls downloadsolc_root build",
@@ -201,4 +203,4 @@
     "reinstall": "rm ./node-modules/ -rf; rm package-lock.json; rm ./build/ -rf; npm install; npm run build",
     "ganache-cli": "npx ganache-cli"
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/tabs/debugger/debuggerUI/vmDebugger/FunctionPanel.js b/apps/remix-ide/src/app/tabs/debugger/debuggerUI/vmDebugger/FunctionPanel.js
similarity index 100%
rename from src/app/tabs/debugger/debuggerUI/vmDebugger/FunctionPanel.js
rename to apps/remix-ide/src/app/tabs/debugger/debuggerUI/vmDebugger/FunctionPanel.js
diff --git a/apps/remix-ide/test-browser/commands/getInstalledPlugins.js b/apps/remix-ide/test-browser/commands/getInstalledPlugins.js
index be21c5b2ee..b595bdaea4 100644
--- a/apps/remix-ide/test-browser/commands/getInstalledPlugins.js
+++ b/apps/remix-ide/test-browser/commands/getInstalledPlugins.js
@@ -3,26 +3,23 @@ const EventEmitter = require('events')
 class GetInstalledPlugins extends EventEmitter {
   command (cb) {
     const browser = this.api
-    const plugins = []
 
-    browser.click('*[data-id="remixIdeIconPanel"]')
-    .waitForElementPresent('[plugin]:not([plugin=""])')
-    .elements('css selector', '[plugin]:not([plugin=""])', (res) => {
-      res.value.forEach(function (jsonWebElement) {
-        const jsonWebElementId = jsonWebElement.ELEMENT || jsonWebElement[Object.keys(jsonWebElement)[0]]
-
-        browser.elementIdAttribute(jsonWebElementId, 'plugin', (jsonElement) => {
-          const attribute = jsonElement.value
+    browser.waitForElementPresent('[plugin]:not([plugin=""]')
+    .perform((done) => {
+      browser.execute(() => {
+        const pluginNames = []
+        const plugins = document.querySelectorAll('[plugin]:not([plugin=""]')
 
-          plugins.push(attribute)
+        plugins.forEach(plugin => {
+          pluginNames.push(plugin.getAttribute('plugin'))
         })
+        return pluginNames
+      }, [], (result) => {
+        done()
+        cb(result.value)
+        this.emit('complete')
       })
     })
-    .perform((done) => {
-      done()
-      cb(plugins)
-      this.emit('complete')
-    })
     return this
   }
 }
diff --git a/test-browser/commands/noWorkerErrorFor.js b/apps/remix-ide/test-browser/commands/noWorkerErrorFor.js
similarity index 100%
rename from test-browser/commands/noWorkerErrorFor.js
rename to apps/remix-ide/test-browser/commands/noWorkerErrorFor.js
diff --git a/test-browser/tests/compiler_api.test.js b/apps/remix-ide/test-browser/tests/compiler_api.test.js
similarity index 100%
rename from test-browser/tests/compiler_api.test.js
rename to apps/remix-ide/test-browser/tests/compiler_api.test.js
diff --git a/test-browser/tests/fileManager_api.test.js b/apps/remix-ide/test-browser/tests/fileManager_api.test.js
similarity index 100%
rename from test-browser/tests/fileManager_api.test.js
rename to apps/remix-ide/test-browser/tests/fileManager_api.test.js
diff --git a/test-browser/tests/txListener.test.js b/apps/remix-ide/test-browser/tests/txListener.test.js
similarity index 100%
rename from test-browser/tests/txListener.test.js
rename to apps/remix-ide/test-browser/tests/txListener.test.js
diff --git a/test-browser/tests/usingWebWorker.test.js b/apps/remix-ide/test-browser/tests/usingWebWorker.test.js
similarity index 100%
rename from test-browser/tests/usingWebWorker.test.js
rename to apps/remix-ide/test-browser/tests/usingWebWorker.test.js
diff --git a/ci/browser_tests_firefox.sh b/ci/browser_tests_firefox.sh
deleted file mode 100755
index 90def58992..0000000000
--- a/ci/browser_tests_firefox.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-setupRemixd () {
-  mkdir remixdSharedfolder
-  cd contracts
-  echo 'sharing folder: '
-  echo $PWD
-  ./../node_modules/.bin/remixd -s $PWD --remix-ide http://127.0.0.1:8080 &
-  cd ..
-}
-
-BUILD_ID=${CIRCLE_BUILD_NUM:-${TRAVIS_JOB_NUMBER}}
-echo "$BUILD_ID"
-TEST_EXITCODE=0
-
-npm run ganache-cli &
-npm run serve &
-setupRemixd
-
-sleep 5
-
-TESTFILES=$(circleci tests glob "./test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
-for TESTFILE in $TESTFILES; do
-    ./node_modules/.bin/nightwatch --config nightwatch.js --env firefox $TESTFILE || TEST_EXITCODE=1
-done
-
-echo "$TEST_EXITCODE"
-if [ "$TEST_EXITCODE" -eq 1 ]
-then
-  exit 1
-fi
diff --git a/contracts/folder1/contract_chrome.sol b/contracts/folder1/contract_chrome.sol
deleted file mode 100644
index 04f9b2eb26..0000000000
--- a/contracts/folder1/contract_chrome.sol
+++ /dev/null
@@ -1 +0,0 @@
-contract test2 { function get () returns (uint) { return 11; }}
\ No newline at end of file
diff --git a/contracts/folder1/contract_chrome_toremove.sol b/contracts/folder1/contract_chrome_toremove.sol
deleted file mode 100644
index 04f9b2eb26..0000000000
--- a/contracts/folder1/contract_chrome_toremove.sol
+++ /dev/null
@@ -1 +0,0 @@
-contract test2 { function get () returns (uint) { return 11; }}
\ No newline at end of file
diff --git a/package.json b/package.json
deleted file mode 100644
index f87dbf850e..0000000000
--- a/package.json
+++ /dev/null
@@ -1,253 +0,0 @@
-{
-  "name": "remix-project",
-  "version": "0.0.0",
-  "license": "MIT",
-  "description": "Ethereum Remix Monorepo",
-  "keywords": [
-    "ethereum",
-    "solidity",
-    "compiler"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/ethereum/remix-project.git"
-  },
-  "author": "@yann300",
-  "bugs": {
-    "url": "https://github.com/ethereum/remix-project/issues"
-  },
-  "homepage": "https://github.com/ethereum/remix-project#readme",
-  "bin": {
-    "remix-ide": "./apps/remix-ide/bin/remix-ide"
-  },
-  "scripts": {
-    "nx": "nx",
-    "start": "nx start",
-    "serve": "nx serve",
-    "build": "nx build",
-    "build:libs": "nx run-many --target=build --parallel=false --with-deps=true --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver",
-    "test": "nx test",
-    "test:libs": "nx run-many --target=test --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver",
-    "lint": "nx lint",
-    "lint:libs": "nx run-many --target=lint --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver",
-    "e2e": "nx e2e",
-    "affected:apps": "nx affected:apps",
-    "affected:libs": "nx affected:libs",
-    "affected:build": "nx affected:build",
-    "affected:e2e": "nx affected:e2e",
-    "affected:test": "nx affected:test",
-    "affected:lint": "nx affected:lint",
-    "affected:dep-graph": "nx affected:dep-graph",
-    "affected": "nx affected",
-    "format": "nx format:write",
-    "format:write": "nx format:write",
-    "format:check": "nx format:check",
-    "update": "nx migrate latest",
-    "workspace-schematic": "nx workspace-schematic",
-    "dep-graph": "nx dep-graph",
-    "help": "nx help",
-    "setupremix": "npm run linkremixdebug && npm run linkremixlib && npm run linkremixsolidity && npm run linkremixanalyzer && npm run linkremixtests && npm run linkremixsimulator",
-    "pullremix": "git clone https://github.com/ethereum/remix",
-    "linkremixlib": "cd node_modules && rm -rf remix-lib && ln -s ../../remix/remix-lib remix-lib && cd ..",
-    "linkremixsolidity": "cd node_modules && rm -rf remix-solidity && ln -s ../../remix/remix-solidity remix-solidity && cd ..",
-    "linkremixtests": "cd node_modules && rm -rf remix-tests && ln -s ../../remix/remix-tests remix-tests && cd ..",
-    "linkremixdebug": "cd node_modules && rm -rf remix-debug && ln -s ../../remix/remix-debug remix-debug && cd ..",
-    "linkremixanalyzer": "cd node_modules && rm -rf remix-analyzer && ln -s ../../remix/remix-analyzer remix-analyzer && cd ..",
-    "linkremixsimulator": "cd node_modules && rm -rf remix-simulator && ln -s ../../remix/remix-simulator remix-simulator && cd ..",
-    "build_debugger": "browserify apps/remix-ide/src/app/debugger/remix-debugger/index.js -o apps/remix-ide/src/app/debugger/remix-debugger/build/app.js",
-    "browsertest": "sleep 5 && npm run nightwatch_local",
-    "csslint": "csslint --ignore=order-alphabetical --errors='errors,duplicate-properties,empty-rules' --exclude-list='apps/remix-ide/assets/css/font-awesome.min.css' apps/remix-ide/assets/css/",
-    "downloadsolc_root": "wget --no-check-certificate https://solc-bin.ethereum.org/bin/soljson-v0.6.6+commit.6c089d02.js -O soljson.js",
-    "make-mock-compiler": "node apps/remix-ide/ci/makeMockCompiler.js",
-    "minify": "uglifyjs --in-source-map inline --source-map-inline -c warnings=false",
-    "nightwatch_parallel": "nightwatch -e chrome,firefox --config apps/remix-ide/nightwatch.js",
-    "nightwatch_local_firefox": "nightwatch --config apps/remix-ide/nightwatch.js --env firefox",
-    "nightwatch_local_chrome": "nightwatch --config apps/remix-ide/nightwatch.js --env chrome",
-    "nightwatch_local_ballot": "nightwatch ./apps/remix-ide/test-browser/tests/ballot.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
-    "nightwatch_local_libraryDeployment": "nightwatch ./apps/remix-ide/test-browser/tests/libraryDeployment.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
-    "nightwatch_local_solidityImport": "nightwatch ./apps/remix-ide/test-browser/tests/solidityImport.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
-    "nightwatch_local_recorder": "nightwatch ./apps/remix-ide/test-browser/tests/recorder.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
-    "nightwatch_local_transactionExecution": "nightwatch ./apps/remix-ide/test-browser/tests/transactionExecution.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
-    "nightwatch_local_staticAnalysis": "nightwatch ./apps/remix-ide/test-browser/tests/staticAnalysis.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
-    "nightwatch_local_signingMessage": "nightwatch ./apps/remix-ide/test-browser/tests/signingMessage.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
-    "nightwatch_local_specialFunctions": "nightwatch ./apps/remix-ide/test-browser/tests/specialFunctions.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
-    "nightwatch_local_solidityUnitTests": "nightwatch ./apps/remix-ide/test-browser/tests/solidityUnittests.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
-    "nightwatch_local_remixd": "nightwatch ./apps/remix-ide/test-browser/tests/remixd.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
-    "nightwatch_local_terminal": "nightwatch ./apps/remix-ide/test-browser/tests/terminal.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
-    "nightwatch_local_gist": "nightwatch ./apps/remix-ide/test-browser/tests/gist.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
-    "nightwatch_local_workspace": "nightwatch ./apps/remix-ide/test-browser/tests/workspace.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
-    "nightwatch_local_defaultLayout": "nightwatch ./apps/remix-ide/test-browser/tests/defaultLayout.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
-    "nightwatch_local_pluginManager": "nightwatch ./apps/remix-ide/test-browser/tests/pluginManager.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
-    "nightwatch_local_publishContract": "nightwatch ./apps/remix-ide/test-browser/tests/publishContract.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
-    "nightwatch_local_generalSettings": "nightwatch ./apps/remix-ide/test-browser/tests/generalSettings.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
-    "nightwatch_local_fileExplorer": "nightwatch ./apps/remix-ide/test-browser/tests/fileExplorer.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
-    "nightwatch_local_debugger": "nightwatch ./apps/remix-ide/test-browser/tests/debugger.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
-    "nightwatch_local_editor": "nightwatch ./apps/remix-ide/test-browser/tests/editor.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
-    "nightwatch_local_runAndDeploy": "nightwatch ./apps/remix-ide/test-browser/tests/runAndDeploy.js --config apps/remix-ide/nightwatch.js --env chrome-runAndDeploy ",
-    "onchange": "onchange apps/remix-ide/build/app.js -- npm-run-all lint",
-    "prepublish": "mkdirp build; npm-run-all -ls downloadsolc_root build",
-    "remixd": "remixd -s ./apps/remix-ide/contracts --remix-ide http://127.0.0.1:4200",
-    "selenium": "selenium-standalone start",
-    "selenium-install": "selenium-standalone install",
-    "sourcemap": "exorcist --root ../ apps/remix-ide/build/app.js.map > apps/remix-ide/build/app.js",
-    "test-browser": "npm-run-all -lpr selenium downloadsolc_root make-mock-compiler serve browsertest",
-    "watch": "watchify apps/remix-ide/src/index.js -dv -p browserify-reload -o apps/remix-ide/build/app.js --exclude solc",
-    "reinstall": "rm ./node-modules/ -rf; rm package-lock.json; rm ./build/ -rf; npm install; npm run build",
-    "ganache-cli": "npx ganache-cli"
-  },
-  "browserify": {
-    "transform": [
-      [
-        "babelify",
-        {
-          "sourceMapsAbsolute": false,
-          "sourceMaps": true,
-          "plugins": [
-            [
-              "module:fast-async",
-              {
-                "runtimePattern": null,
-                "compiler": {
-                  "es7": true,
-                  "noRuntime": true,
-                  "promises": true,
-                  "wrapAwait": true
-                }
-              }
-            ],
-            [
-              "module:babel-plugin-yo-yoify"
-            ],
-            [
-              "module:@babel/plugin-transform-object-assign"
-            ]
-          ],
-          "presets": [
-            "@babel/preset-env"
-          ]
-        }
-      ]
-    ]
-  },
-  "dependencies": {
-    "@remixproject/engine": "^0.2.3",
-    "@types/tape": "^4.2.33",
-    "ansi-gray": "^0.1.1",
-    "change-case": "^4.1.1",
-    "color-support": "^1.1.3",
-    "ethereumjs-block": "^2.2.2",
-    "ethereumjs-tx": "^2.1.2",
-    "ethereumjs-vm": "4.1.3",
-    "http-server": "^0.11.1",
-    "time-stamp": "^2.2.0",
-    "winston": "^3.3.3"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.4.5",
-    "@babel/plugin-transform-modules-amd": "^7.10.4",
-    "@babel/plugin-transform-modules-commonjs": "^7.10.4",
-    "@babel/plugin-transform-object-assign": "^7.2.0",
-    "@babel/plugin-transform-runtime": "^7.10.4",
-    "@babel/polyfill": "^7.4.4",
-    "@babel/preset-env": "^7.10.4",
-    "@babel/preset-es2015": "^7.0.0-beta.53",
-    "@babel/preset-es2017": "latest",
-    "@babel/preset-stage-0": "^7.0.0",
-    "@babel/register": "^7.4.4",
-    "@fortawesome/fontawesome-free": "^5.8.1",
-    "@nrwl/cypress": "9.2.4",
-    "@nrwl/eslint-plugin-nx": "^9.4.4",
-    "@nrwl/jest": "9.4.5",
-    "@nrwl/linter": "^9.3.0",
-    "@nrwl/node": "^9.4.5",
-    "@nrwl/react": "9.2.4",
-    "@nrwl/web": "9.2.4",
-    "@nrwl/workspace": "9.2.4",
-    "@resolver-engine/imports": "^0.3.0",
-    "@types/chai": "^4.2.11",
-    "@types/mocha": "^7.0.2",
-    "@types/node": "~8.9.4",
-    "@types/react": "16.9.17",
-    "@types/react-dom": "16.9.4",
-    "@types/react-router-dom": "5.1.3",
-    "@typescript-eslint/eslint-plugin": "^3.3.0",
-    "@typescript-eslint/parser": "^3.3.0",
-    "ace-mode-move": "0.0.1",
-    "ace-mode-solidity": "^0.1.0",
-    "ace-mode-zokrates": "^1.0.0",
-    "async": "^2.1.2",
-    "babel-eslint": "^10.0.0",
-    "babel-plugin-add-module-exports": "^1.0.2",
-    "babel-plugin-fast-async": "^6.1.2",
-    "babel-plugin-module-resolver": "^4.0.0",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-plugin-yo-yoify": "^2.0.0",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-typescript": "^7.0.0-alpha.19",
-    "babelify": "^10.0.0",
-    "brace": "^0.8.0",
-    "browserify": "^16.2.3",
-    "browserify-reload": "^1.0.3",
-    "component-type": "^1.2.1",
-    "copy-text-to-clipboard": "^1.0.4",
-    "csjs-inject": "^1.0.1",
-    "csslint": "^1.0.2",
-    "cypress": "^4.1.0",
-    "deep-equal": "^1.0.1",
-    "dotenv": "^8.2.0",
-    "eslint": "6.8.0",
-    "eslint-config-prettier": "^6.11.0",
-    "ethereumjs-util": "^6.2.0",
-    "ethers": "^4.0.27",
-    "events": "^3.0.0",
-    "execr": "^1.0.1",
-    "exorcist": "^0.4.0",
-    "exports-loader": "^1.1.0",
-    "fast-async": "^7.0.6",
-    "fast-levenshtein": "^2.0.6",
-    "ganache-cli": "^6.8.1",
-    "gists": "^1.0.1",
-    "ipfs-mini": "^1.1.5",
-    "is-electron": "^2.2.0",
-    "javascript-serialize": "^1.6.1",
-    "jest": "25.2.3",
-    "jquery": "^3.3.1",
-    "js-base64": "^2.1.9",
-    "js-beautify": "1.6.14",
-    "minixhr": "^3.2.2",
-    "mkdirp": "^0.5.1",
-    "mocha": "^8.0.1",
-    "nanohtml": "^1.6.3",
-    "nightwatch": "^1.3.5",
-    "notify-error": "^1.2.0",
-    "npm-install-version": "^6.0.2",
-    "npm-link-local": "^1.1.0",
-    "npm-merge-driver": "^2.3.5",
-    "npm-run-all": "^4.0.2",
-    "nyc": "^13.3.0",
-    "onchange": "^3.2.1",
-    "prettier": "1.19.1",
-    "remix-tabs": "1.0.48",
-    "remixd": "0.2.3-alpha.1",
-    "request": "^2.83.0",
-    "rimraf": "^2.6.1",
-    "selenium-standalone": "^6.17.0",
-    "semver": "^6.1.2",
-    "solc": "^0.6.0",
-    "swarmgw": "^0.3.1",
-    "tap-spec": "^5.0.0",
-    "tape": "^4.13.3",
-    "ts-jest": "25.2.1",
-    "ts-node": "~7.0.0",
-    "tslint": "~6.0.0",
-    "typescript": "~3.8.3",
-    "uglify-js": "^2.8.16",
-    "vm-browserify": "0.0.4",
-    "watchify": "^3.9.0",
-    "web3": "1.2.4",
-    "webworkify": "^1.2.1",
-    "yo-yo": "github:ioedeveloper/yo-yo",
-    "yo-yoify": "^3.7.3",
-    "webworkify-webpack": "^2.1.5"
-  }
-}