diff --git a/src/App.js b/src/App.js
index 85810b4..6c17967 100644
--- a/src/App.js
+++ b/src/App.js
@@ -5,7 +5,7 @@ import TopBar from './TopBar';
 import VideoPlayer from './VideoPlayer';
 import VideoInfo from './VideoInfo';
 import VideoList from './VideoList';
-import Suggestion from './areainfo/Suggestion';
+import Suggestion from './Suggestion';
 import { ReactHeight } from 'react-height';
 import './css/App.css';
 
@@ -60,7 +60,9 @@ class App extends React.Component {
 						xs="12"
 						lg={this.state.isInfoToggled ? { span: 5, order: 1 } : { span: 3, order: 1 }}
 						className="p-0 p-xs-0"
-						style={window.innerWidth < 992 ? { 'overflow': "auto", 'display': 'fixed', 'maxHeight': this.state.playerHeight * 1.4 + 'px' } : { 'overflow': "auto", 'maxHeight': `${this.state.playerHeight}px` }}>
+						style={window.innerWidth < 992 ? 
+						{ 'overflow': "auto", 'display': 'fixed', 'maxHeight': this.state.playerHeight * 1.4 + 'px' } : 
+						{ 'overflow': "auto", 'maxHeight': `${this.state.playerHeight}px` }}>
 						{/* true = style for xs ;; false = style for lg */}
 						<div className="d-flex justify-content-center">
 							<Button
diff --git a/src/areainfo/Suggestion.js b/src/Suggestion.js
similarity index 77%
rename from src/areainfo/Suggestion.js
rename to src/Suggestion.js
index 926b7e5..11dc7ed 100644
--- a/src/areainfo/Suggestion.js
+++ b/src/Suggestion.js
@@ -1,12 +1,12 @@
 import React, { Component } from 'react';
 import { Row } from 'react-bootstrap'; 
 import { Switch, Route } from 'react-router';
-import Random from '../reccomenders/Random';
-import Related from '../reccomenders/Related';
-import Search from '../reccomenders/Search';
-import fvitali from '../reccomenders/fvitali';
-import popGlobaleAssoluta from '../reccomenders/popGlobaleAssoluta';
-import Recent from '../reccomenders/Recent';
+import Random from './reccomenders/Random';
+import Related from './reccomenders/Related';
+import Search from './reccomenders/Search';
+import fvitali from './reccomenders/fvitali';
+import popGlobaleAssoluta from './reccomenders/popGlobaleAssoluta';
+import Recent from './reccomenders/Recent';
 
 // and so on..
 
diff --git a/src/VideoInfo.js b/src/VideoInfo.js
index 6ed6231..4fcc0fb 100644
--- a/src/VideoInfo.js
+++ b/src/VideoInfo.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import Wikipedia from './areainfo/Wikipedia';
+import Wikipedia from './Wikipedia';
 import { Card, Tabs, Tab } from 'react-bootstrap';
 import {Link} from 'react-router-dom';
 import axios from 'axios';
@@ -99,7 +99,7 @@ class VideoInfo extends React.Component {
                                 <b>Description: </b><Linkify>{VideoDetails.snippet.description}</Linkify><br />
                                 <b>Tags: </b>{VideoDetails.snippet.tags ?
                                     VideoDetails.snippet.tags.map((tag,i) => 
-                                    ( <span><Link key={i} to={{pathname: '/search/' + tag}}>{tag}</Link>{" "}</span> )) 
+                                    ( <span key={i}><Link to={{pathname: '/search/' + tag}}>{tag}</Link>{" "}</span> )) 
                                     : ""}
                             </p>
                         </Tab>
@@ -137,9 +137,9 @@ class VideoInfo extends React.Component {
                         </Tab>
                         <Tab className="text-white" eventKey="wikipedia" title="Wikipedia">
                             <Wikipedia 
-                            title={'undefined' !== typeof this.props.location.state ? this.props.location.state.title: undefined}
+                            title={this.props.location.state.title}
                             title2={ytclear(this.state.VideoDetails.snippet.title).split('-')[1]}
-                            artist={'undefined' !== typeof this.props.location.state ? this.props.location.state.artist: undefined}
+                            artist={this.props.location.state.artist}
                             artist2={ytclear(this.state.VideoDetails.snippet.title).split('-')[0]}
                             key={this.props.videoId}
                             videoId={this.props.videoId}
diff --git a/src/areainfo/Wikipedia.js b/src/Wikipedia.js
similarity index 100%
rename from src/areainfo/Wikipedia.js
rename to src/Wikipedia.js
diff --git a/src/reccomenders/Search.js b/src/reccomenders/Search.js
index eb7ab69..df1e1cc 100644
--- a/src/reccomenders/Search.js
+++ b/src/reccomenders/Search.js
@@ -13,9 +13,7 @@ class Search extends React.Component {
     }
 
     // static getDerivedStateFromProps(nextProps, prevState) {
-    //     if (nextProps.match.params.query !== prevState.query)
-    //         return { query: nextProps.match.params.query };
-    //     return null;
+
     // }
 
     componentDidMount() {