diff --git a/src/App.tsx b/src/App.tsx
index 64991b34..7db2fe63 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,7 +1,7 @@
 import React, {useState, useEffect} from 'react'
 import './App.css'
 
-import Header from './Header/Header'
+import Header from './components/Header/Header'
 import Main from './Main/Main'
 
 function App() {
diff --git a/src/Button/Button.css b/src/components/Button/Button.css
similarity index 100%
rename from src/Button/Button.css
rename to src/components/Button/Button.css
diff --git a/src/Button/Button.tsx b/src/components/Button/Button.tsx
similarity index 86%
rename from src/Button/Button.tsx
rename to src/components/Button/Button.tsx
index 41a12343..1b4fd941 100644
--- a/src/Button/Button.tsx
+++ b/src/components/Button/Button.tsx
@@ -1,9 +1,9 @@
 import React from 'react'
 import './Button.css'
 
-import New from '../../assets/new.svg'
-import Menu from '../../assets/menu.svg'
-import Link from '../../assets/link.svg'
+import New from '../../../assets/new'
+import Menu from '../../../assets/menu'
+import Link from '../../../assets/link'
 
 interface Props {
     type: string
diff --git a/src/Header/Header.css b/src/components/Header/Header.css
similarity index 100%
rename from src/Header/Header.css
rename to src/components/Header/Header.css
diff --git a/src/Header/Header.tsx b/src/components/Header/Header.tsx
similarity index 100%
rename from src/Header/Header.tsx
rename to src/components/Header/Header.tsx
diff --git a/src/WeaponGrid/WeaponGrid.css b/src/components/WeaponGrid/WeaponGrid.css
similarity index 100%
rename from src/WeaponGrid/WeaponGrid.css
rename to src/components/WeaponGrid/WeaponGrid.css
diff --git a/src/WeaponGrid/WeaponGrid.tsx b/src/components/WeaponGrid/WeaponGrid.tsx
similarity index 100%
rename from src/WeaponGrid/WeaponGrid.tsx
rename to src/components/WeaponGrid/WeaponGrid.tsx
diff --git a/src/WeaponGridMainhand/WeaponGridMainhand.css b/src/components/WeaponGridMainhand/WeaponGridMainhand.css
similarity index 91%
rename from src/WeaponGridMainhand/WeaponGridMainhand.css
rename to src/components/WeaponGridMainhand/WeaponGridMainhand.css
index 49380e25..748da59a 100644
--- a/src/WeaponGridMainhand/WeaponGridMainhand.css
+++ b/src/components/WeaponGridMainhand/WeaponGridMainhand.css
@@ -22,4 +22,8 @@
     color: #c9c9c9;
     height: 20px;
     width: 20px;
+}
+
+.WeaponGridMainhand:hover .icon {
+    color: #555;
 }
\ No newline at end of file
diff --git a/src/WeaponGridMainhand/WeaponGridMainhand.tsx b/src/components/WeaponGridMainhand/WeaponGridMainhand.tsx
similarity index 100%
rename from src/WeaponGridMainhand/WeaponGridMainhand.tsx
rename to src/components/WeaponGridMainhand/WeaponGridMainhand.tsx
diff --git a/src/WeaponGridUnit/WeaponGridUnit.css b/src/components/WeaponGridUnit/WeaponGridUnit.css
similarity index 91%
rename from src/WeaponGridUnit/WeaponGridUnit.css
rename to src/components/WeaponGridUnit/WeaponGridUnit.css
index ce0ac131..73e031c6 100644
--- a/src/WeaponGridUnit/WeaponGridUnit.css
+++ b/src/components/WeaponGridUnit/WeaponGridUnit.css
@@ -21,4 +21,8 @@
     color: #c9c9c9;
     height: 20px;
     width: 20px;
+}
+
+.WeaponGridUnit:hover .icon {
+    color: #555;
 }
\ No newline at end of file
diff --git a/src/WeaponGridUnit/WeaponGridUnit.tsx b/src/components/WeaponGridUnit/WeaponGridUnit.tsx
similarity index 100%
rename from src/WeaponGridUnit/WeaponGridUnit.tsx
rename to src/components/WeaponGridUnit/WeaponGridUnit.tsx
diff --git a/src/routes/New/New.tsx b/src/routes/New/New.tsx
index 64296130..1c43900a 100644
--- a/src/routes/New/New.tsx
+++ b/src/routes/New/New.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import WeaponGrid from '../../WeaponGrid/WeaponGrid'
+import WeaponGrid from '../../components/WeaponGrid/WeaponGrid'
 
 const New = () => (
     <div>
diff --git a/src/routes/Party/Party.tsx b/src/routes/Party/Party.tsx
index 503bbeac..4070ba04 100644
--- a/src/routes/Party/Party.tsx
+++ b/src/routes/Party/Party.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import {withRouter} from 'react-router'
+import { withRouter } from 'react-router'
 
 class Party extends React.Component {
     render() {