diff --git a/remix-debugger/README.md b/src/app/debugger/remix-debugger/README.md
similarity index 100%
rename from remix-debugger/README.md
rename to src/app/debugger/remix-debugger/README.md
diff --git a/remix-debugger/assets/css/font-awesome.min.css b/src/app/debugger/remix-debugger/assets/css/font-awesome.min.css
similarity index 100%
rename from remix-debugger/assets/css/font-awesome.min.css
rename to src/app/debugger/remix-debugger/assets/css/font-awesome.min.css
diff --git a/remix-debugger/assets/fonts/FontAwesome.otf b/src/app/debugger/remix-debugger/assets/fonts/FontAwesome.otf
similarity index 100%
rename from remix-debugger/assets/fonts/FontAwesome.otf
rename to src/app/debugger/remix-debugger/assets/fonts/FontAwesome.otf
diff --git a/remix-debugger/assets/fonts/fontawesome-webfont.eot b/src/app/debugger/remix-debugger/assets/fonts/fontawesome-webfont.eot
similarity index 100%
rename from remix-debugger/assets/fonts/fontawesome-webfont.eot
rename to src/app/debugger/remix-debugger/assets/fonts/fontawesome-webfont.eot
diff --git a/remix-debugger/assets/fonts/fontawesome-webfont.svg b/src/app/debugger/remix-debugger/assets/fonts/fontawesome-webfont.svg
similarity index 100%
rename from remix-debugger/assets/fonts/fontawesome-webfont.svg
rename to src/app/debugger/remix-debugger/assets/fonts/fontawesome-webfont.svg
diff --git a/remix-debugger/assets/fonts/fontawesome-webfont.ttf b/src/app/debugger/remix-debugger/assets/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from remix-debugger/assets/fonts/fontawesome-webfont.ttf
rename to src/app/debugger/remix-debugger/assets/fonts/fontawesome-webfont.ttf
diff --git a/remix-debugger/assets/fonts/fontawesome-webfont.woff b/src/app/debugger/remix-debugger/assets/fonts/fontawesome-webfont.woff
similarity index 100%
rename from remix-debugger/assets/fonts/fontawesome-webfont.woff
rename to src/app/debugger/remix-debugger/assets/fonts/fontawesome-webfont.woff
diff --git a/remix-debugger/assets/fonts/fontawesome-webfont.woff2 b/src/app/debugger/remix-debugger/assets/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from remix-debugger/assets/fonts/fontawesome-webfont.woff2
rename to src/app/debugger/remix-debugger/assets/fonts/fontawesome-webfont.woff2
diff --git a/remix-debugger/ci/browser_tests.sh b/src/app/debugger/remix-debugger/ci/browser_tests.sh
similarity index 100%
rename from remix-debugger/ci/browser_tests.sh
rename to src/app/debugger/remix-debugger/ci/browser_tests.sh
diff --git a/remix-debugger/ci/deploy_from_travis.sh b/src/app/debugger/remix-debugger/ci/deploy_from_travis.sh
similarity index 100%
rename from remix-debugger/ci/deploy_from_travis.sh
rename to src/app/debugger/remix-debugger/ci/deploy_from_travis.sh
diff --git a/remix-debugger/ci/deploy_key.enc b/src/app/debugger/remix-debugger/ci/deploy_key.enc
similarity index 100%
rename from remix-debugger/ci/deploy_key.enc
rename to src/app/debugger/remix-debugger/ci/deploy_key.enc
diff --git a/remix-debugger/ci/sauceDisconnect.js b/src/app/debugger/remix-debugger/ci/sauceDisconnect.js
similarity index 100%
rename from remix-debugger/ci/sauceDisconnect.js
rename to src/app/debugger/remix-debugger/ci/sauceDisconnect.js
diff --git a/remix-debugger/findClient.js b/src/app/debugger/remix-debugger/findClient.js
similarity index 100%
rename from remix-debugger/findClient.js
rename to src/app/debugger/remix-debugger/findClient.js
diff --git a/remix-debugger/index.html b/src/app/debugger/remix-debugger/index.html
similarity index 100%
rename from remix-debugger/index.html
rename to src/app/debugger/remix-debugger/index.html
diff --git a/remix-debugger/index.js b/src/app/debugger/remix-debugger/index.js
similarity index 100%
rename from remix-debugger/index.js
rename to src/app/debugger/remix-debugger/index.js
diff --git a/remix-debugger/nightwatch.js b/src/app/debugger/remix-debugger/nightwatch.js
similarity index 100%
rename from remix-debugger/nightwatch.js
rename to src/app/debugger/remix-debugger/nightwatch.js
diff --git a/remix-debugger/package.json b/src/app/debugger/remix-debugger/package.json
similarity index 100%
rename from remix-debugger/package.json
rename to src/app/debugger/remix-debugger/package.json
diff --git a/remix-debugger/runNode.sh b/src/app/debugger/remix-debugger/runNode.sh
similarity index 100%
rename from remix-debugger/runNode.sh
rename to src/app/debugger/remix-debugger/runNode.sh
diff --git a/remix-debugger/src/ui/BasicPanel.js b/src/app/debugger/remix-debugger/src/ui/BasicPanel.js
similarity index 100%
rename from remix-debugger/src/ui/BasicPanel.js
rename to src/app/debugger/remix-debugger/src/ui/BasicPanel.js
diff --git a/remix-debugger/src/ui/ButtonNavigator.js b/src/app/debugger/remix-debugger/src/ui/ButtonNavigator.js
similarity index 100%
rename from remix-debugger/src/ui/ButtonNavigator.js
rename to src/app/debugger/remix-debugger/src/ui/ButtonNavigator.js
diff --git a/remix-debugger/src/ui/CalldataPanel.js b/src/app/debugger/remix-debugger/src/ui/CalldataPanel.js
similarity index 100%
rename from remix-debugger/src/ui/CalldataPanel.js
rename to src/app/debugger/remix-debugger/src/ui/CalldataPanel.js
diff --git a/remix-debugger/src/ui/CallstackPanel.js b/src/app/debugger/remix-debugger/src/ui/CallstackPanel.js
similarity index 100%
rename from remix-debugger/src/ui/CallstackPanel.js
rename to src/app/debugger/remix-debugger/src/ui/CallstackPanel.js
diff --git a/remix-debugger/src/ui/CodeListView.js b/src/app/debugger/remix-debugger/src/ui/CodeListView.js
similarity index 100%
rename from remix-debugger/src/ui/CodeListView.js
rename to src/app/debugger/remix-debugger/src/ui/CodeListView.js
diff --git a/remix-debugger/src/ui/DropdownPanel.js b/src/app/debugger/remix-debugger/src/ui/DropdownPanel.js
similarity index 100%
rename from remix-debugger/src/ui/DropdownPanel.js
rename to src/app/debugger/remix-debugger/src/ui/DropdownPanel.js
diff --git a/remix-debugger/src/ui/Ethdebugger.js b/src/app/debugger/remix-debugger/src/ui/Ethdebugger.js
similarity index 100%
rename from remix-debugger/src/ui/Ethdebugger.js
rename to src/app/debugger/remix-debugger/src/ui/Ethdebugger.js
diff --git a/remix-debugger/src/ui/FullStoragesChanges.js b/src/app/debugger/remix-debugger/src/ui/FullStoragesChanges.js
similarity index 100%
rename from remix-debugger/src/ui/FullStoragesChanges.js
rename to src/app/debugger/remix-debugger/src/ui/FullStoragesChanges.js
diff --git a/remix-debugger/src/ui/MemoryPanel.js b/src/app/debugger/remix-debugger/src/ui/MemoryPanel.js
similarity index 100%
rename from remix-debugger/src/ui/MemoryPanel.js
rename to src/app/debugger/remix-debugger/src/ui/MemoryPanel.js
diff --git a/remix-debugger/src/ui/Slider.js b/src/app/debugger/remix-debugger/src/ui/Slider.js
similarity index 100%
rename from remix-debugger/src/ui/Slider.js
rename to src/app/debugger/remix-debugger/src/ui/Slider.js
diff --git a/remix-debugger/src/ui/SolidityLocals.js b/src/app/debugger/remix-debugger/src/ui/SolidityLocals.js
similarity index 100%
rename from remix-debugger/src/ui/SolidityLocals.js
rename to src/app/debugger/remix-debugger/src/ui/SolidityLocals.js
diff --git a/remix-debugger/src/ui/SolidityState.js b/src/app/debugger/remix-debugger/src/ui/SolidityState.js
similarity index 100%
rename from remix-debugger/src/ui/SolidityState.js
rename to src/app/debugger/remix-debugger/src/ui/SolidityState.js
diff --git a/remix-debugger/src/ui/SolidityTypeFormatter.js b/src/app/debugger/remix-debugger/src/ui/SolidityTypeFormatter.js
similarity index 100%
rename from remix-debugger/src/ui/SolidityTypeFormatter.js
rename to src/app/debugger/remix-debugger/src/ui/SolidityTypeFormatter.js
diff --git a/remix-debugger/src/ui/StackPanel.js b/src/app/debugger/remix-debugger/src/ui/StackPanel.js
similarity index 100%
rename from remix-debugger/src/ui/StackPanel.js
rename to src/app/debugger/remix-debugger/src/ui/StackPanel.js
diff --git a/remix-debugger/src/ui/StepDetail.js b/src/app/debugger/remix-debugger/src/ui/StepDetail.js
similarity index 100%
rename from remix-debugger/src/ui/StepDetail.js
rename to src/app/debugger/remix-debugger/src/ui/StepDetail.js
diff --git a/remix-debugger/src/ui/StepManager.js b/src/app/debugger/remix-debugger/src/ui/StepManager.js
similarity index 100%
rename from remix-debugger/src/ui/StepManager.js
rename to src/app/debugger/remix-debugger/src/ui/StepManager.js
diff --git a/remix-debugger/src/ui/StoragePanel.js b/src/app/debugger/remix-debugger/src/ui/StoragePanel.js
similarity index 100%
rename from remix-debugger/src/ui/StoragePanel.js
rename to src/app/debugger/remix-debugger/src/ui/StoragePanel.js
diff --git a/remix-debugger/src/ui/TreeView.js b/src/app/debugger/remix-debugger/src/ui/TreeView.js
similarity index 100%
rename from remix-debugger/src/ui/TreeView.js
rename to src/app/debugger/remix-debugger/src/ui/TreeView.js
diff --git a/remix-debugger/src/ui/TxBrowser.js b/src/app/debugger/remix-debugger/src/ui/TxBrowser.js
similarity index 100%
rename from remix-debugger/src/ui/TxBrowser.js
rename to src/app/debugger/remix-debugger/src/ui/TxBrowser.js
diff --git a/remix-debugger/src/ui/VmDebugger.js b/src/app/debugger/remix-debugger/src/ui/VmDebugger.js
similarity index 100%
rename from remix-debugger/src/ui/VmDebugger.js
rename to src/app/debugger/remix-debugger/src/ui/VmDebugger.js
diff --git a/remix-debugger/src/ui/styles/basicStyles.js b/src/app/debugger/remix-debugger/src/ui/styles/basicStyles.js
similarity index 100%
rename from remix-debugger/src/ui/styles/basicStyles.js
rename to src/app/debugger/remix-debugger/src/ui/styles/basicStyles.js
diff --git a/remix-debugger/src/ui/styles/dropdownPanel.js b/src/app/debugger/remix-debugger/src/ui/styles/dropdownPanel.js
similarity index 100%
rename from remix-debugger/src/ui/styles/dropdownPanel.js
rename to src/app/debugger/remix-debugger/src/ui/styles/dropdownPanel.js
diff --git a/remix-debugger/src/ui/styles/sliderStyles.js b/src/app/debugger/remix-debugger/src/ui/styles/sliderStyles.js
similarity index 100%
rename from remix-debugger/src/ui/styles/sliderStyles.js
rename to src/app/debugger/remix-debugger/src/ui/styles/sliderStyles.js
diff --git a/remix-debugger/src/ui/styles/treeView.js b/src/app/debugger/remix-debugger/src/ui/styles/treeView.js
similarity index 100%
rename from remix-debugger/src/ui/styles/treeView.js
rename to src/app/debugger/remix-debugger/src/ui/styles/treeView.js
diff --git a/remix-debugger/test-browser/resources/insertTestWeb3.js b/src/app/debugger/remix-debugger/test-browser/resources/insertTestWeb3.js
similarity index 100%
rename from remix-debugger/test-browser/resources/insertTestWeb3.js
rename to src/app/debugger/remix-debugger/test-browser/resources/insertTestWeb3.js
diff --git a/remix-debugger/test-browser/resources/testWeb3.json b/src/app/debugger/remix-debugger/test-browser/resources/testWeb3.json
similarity index 100%
rename from remix-debugger/test-browser/resources/testWeb3.json
rename to src/app/debugger/remix-debugger/test-browser/resources/testWeb3.json
diff --git a/remix-debugger/test-browser/test/init.js b/src/app/debugger/remix-debugger/test-browser/test/init.js
similarity index 100%
rename from remix-debugger/test-browser/test/init.js
rename to src/app/debugger/remix-debugger/test-browser/test/init.js
diff --git a/remix-debugger/test-browser/test/sauce.js b/src/app/debugger/remix-debugger/test-browser/test/sauce.js
similarity index 100%
rename from remix-debugger/test-browser/test/sauce.js
rename to src/app/debugger/remix-debugger/test-browser/test/sauce.js
diff --git a/remix-debugger/test-browser/test/vmdebugger.js b/src/app/debugger/remix-debugger/test-browser/test/vmdebugger.js
similarity index 100%
rename from remix-debugger/test-browser/test/vmdebugger.js
rename to src/app/debugger/remix-debugger/test-browser/test/vmdebugger.js