diff --git a/package.json b/package.json
index 03b93312..7a886410 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
   "scripts": {
     "start": "yarn build:watch",
     "build": "yarn build:tsc && yarn build:dist",
-    "build:tsc": "tsc && cp -R ./fonts/ ./dist/fonts/ && cp ./src/styles.scss ./dist/src/styles.scss && cp ./src/common/components/modal/styles.scss ./dist/src/common/components/modal/styles.scss ",
+    "build:tsc": "tsc && cp -R ./fonts/ ./dist/fonts/ && cp ./src/styles.scss ./dist/src/styles.scss && cp ./src/components/modal/styles.scss ./dist/src/components/modal/styles.scss",
     "build:dist": "cross-env NODE_ENV=production webpack",
     "build:watch": "tsc -w",
     "lint": "eslint src/**/*.{ts,tsx} stories/**/*.tsx --fix",
diff --git a/src/config/colors.js b/src/config/colors.js
deleted file mode 100644
index 8732685f..00000000
--- a/src/config/colors.js
+++ /dev/null
@@ -1,27 +0,0 @@
-module.exports = {
-  white: '#FFF',
-  black: '#000',
-  skeleton: '#DEDEDE',
-  gray: '#8692A6',
-  gray2: '#F5F5F5',
-  gray3: '#BDBDBD',
-  gray4: '#696F79',
-  gray5: '#EFEFEF',
-  gray6: '#C7C7C7',
-  gray7: '#918e8e',
-  gray8: '#292929',
-  linkYellow: '#FFC01F',
-  blue: 'rgba(50, 130, 246, 0.8)',
-  // intent colors
-  default: '#8692A6',
-  primary: '#3282f6',
-  success: '#44C73B',
-  warning: '#C79C3B',
-  danger: '#BC2D00',
-  // charts
-  chartGreen: '#219653',
-  chartViolet: '#9B51E0',
-
-  // overlay
-  whiteOverlay: 'rgba(255,255,255,0.1)',
-};
diff --git a/src/masa-react-env.d.ts b/src/masa-react-env.d.ts
deleted file mode 100644
index 1500e414..00000000
--- a/src/masa-react-env.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { MetaMaskInpageProvider } from '@metamask/providers';
-
-declare global {
-  interface Window {
-    ethereum?: MetaMaskInpageProvider;
-  }
-}
diff --git a/src/modules.d.ts b/src/modules.d.ts
index e69de29b..1500e414 100644
--- a/src/modules.d.ts
+++ b/src/modules.d.ts
@@ -0,0 +1,7 @@
+import { MetaMaskInpageProvider } from '@metamask/providers';
+
+declare global {
+  interface Window {
+    ethereum?: MetaMaskInpageProvider;
+  }
+}
diff --git a/tsconfig.json b/tsconfig.json
index c8d5bc32..00a29c4f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,6 +4,7 @@
     "src"
   ],
   "compilerOptions": {
+    "target": "ES2015",
     "module": "ESNext",
     "lib": [
       "DOM",
@@ -16,7 +17,7 @@
     "sourceMap": true,
     // match output dir to input dir. e.g. dist/index instead of dist/src/index
     "rootDir": "./src",
-    "outDir": "./dist",
+    "outDir": "./dist/src",
     // stricter type-checking for stronger correctness. Recommended by TS
     "strict": true,
     // linter checks for common issues