diff --git a/src/client/components/perspectives/sampo/FullTextSearch.js b/src/client/components/main_layout/FullTextSearch.js
similarity index 92%
rename from src/client/components/perspectives/sampo/FullTextSearch.js
rename to src/client/components/main_layout/FullTextSearch.js
index 3ff59b38210361b38a1eec0b9045b35ba09de588..f7582bf04c8405054f94b9f5fe6118d2fe63907f 100644
--- a/src/client/components/perspectives/sampo/FullTextSearch.js
+++ b/src/client/components/main_layout/FullTextSearch.js
@@ -2,8 +2,8 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { Route, Redirect } from 'react-router-dom'
 import { makeStyles } from '@material-ui/core/styles'
-import PerspectiveTabs from '../../main_layout/PerspectiveTabs'
-import ReactVirtualizedTable from '../../facet_results/ReactVirtualizedTable'
+import PerspectiveTabs from './PerspectiveTabs'
+import ReactVirtualizedTable from '../facet_results/ReactVirtualizedTable'
 import CalendarViewDayIcon from '@material-ui/icons/CalendarViewDay'
 
 const useStyles = makeStyles(theme => ({
diff --git a/src/client/components/perspectives/sampo/InstanceHomePage.js b/src/client/components/main_layout/InstanceHomePage.js
similarity index 96%
rename from src/client/components/perspectives/sampo/InstanceHomePage.js
rename to src/client/components/main_layout/InstanceHomePage.js
index 889df5169a3a2527ae29077b62a0270950d51bbc..9c8e566771151e1b27eccd286df69c3694e60a75 100644
--- a/src/client/components/perspectives/sampo/InstanceHomePage.js
+++ b/src/client/components/main_layout/InstanceHomePage.js
@@ -5,14 +5,14 @@ import Paper from '@material-ui/core/Paper'
 import Typography from '@material-ui/core/Typography'
 import CircularProgress from '@material-ui/core/CircularProgress'
 import purple from '@material-ui/core/colors/purple'
-import PerspectiveTabs from '../../main_layout/PerspectiveTabs'
-import InstanceHomePageTable from '../../main_layout/InstanceHomePageTable'
-import { getLocalIDFromAppLocation, createURIfromLocalID } from '../../../helpers/helpers'
+import PerspectiveTabs from './PerspectiveTabs'
+import InstanceHomePageTable from './InstanceHomePageTable'
+import { getLocalIDFromAppLocation, createURIfromLocalID } from '../../helpers/helpers'
 import { Route, Redirect } from 'react-router-dom'
 import { has } from 'lodash'
 // const ApexChart = lazy(() => import('../../facet_results/ApexChart'))
-const Network = lazy(() => import('../../facet_results/Network'))
-const Export = lazy(() => import('../../facet_results/Export'))
+const Network = lazy(() => import('../facet_results/Network'))
+const Export = lazy(() => import('../facet_results/Export'))
 
 const styles = () => ({
   root: {
diff --git a/src/client/components/perspectives/sampo/InstanceHomePage.stories.js b/src/client/components/main_layout/InstanceHomePage.stories.js
similarity index 87%
rename from src/client/components/perspectives/sampo/InstanceHomePage.stories.js
rename to src/client/components/main_layout/InstanceHomePage.stories.js
index 6fe2747a730ba065be44f025402089efb18ff239..c37c136f3ab6c72b80a2964d81937d53dbcbd656 100644
--- a/src/client/components/perspectives/sampo/InstanceHomePage.stories.js
+++ b/src/client/components/main_layout/InstanceHomePage.stories.js
@@ -3,7 +3,7 @@ import { useSelector } from 'react-redux'
 import { useLocation } from 'react-router-dom'
 import InstanceHomePage, { InstanceHomePageComponent } from './InstanceHomePage'
 import { data, sparqlQuery } from './InstanceHomePage.testData.js'
-const { default: perspective } = await import('../../../configs/sampo/perspective_configs/search_perspectives/perspective1.json')
+const { default: perspective } = await import('../../configs/sampo/perspective_configs/search_perspectives/perspective1.json')
 
 export default {
   component: InstanceHomePageComponent,
diff --git a/src/client/components/perspectives/sampo/InstanceHomePage.testData.js b/src/client/components/main_layout/InstanceHomePage.testData.js
similarity index 100%
rename from src/client/components/perspectives/sampo/InstanceHomePage.testData.js
rename to src/client/components/main_layout/InstanceHomePage.testData.js
diff --git a/src/client/components/perspectives/sampo/KnowledgeGraphMetadataTable.js b/src/client/components/main_layout/KnowledgeGraphMetadataTable.js
similarity index 100%
rename from src/client/components/perspectives/sampo/KnowledgeGraphMetadataTable.js
rename to src/client/components/main_layout/KnowledgeGraphMetadataTable.js
diff --git a/src/client/components/perspectives/sampo/TopBar.js b/src/client/components/main_layout/TopBar.js
similarity index 97%
rename from src/client/components/perspectives/sampo/TopBar.js
rename to src/client/components/main_layout/TopBar.js
index 5adb7747a52b4c474a8f8c6644af2c28473d96ab..ba27a133346e61b7e5bec8a32bfa11e5ed5a9abc 100644
--- a/src/client/components/perspectives/sampo/TopBar.js
+++ b/src/client/components/main_layout/TopBar.js
@@ -11,12 +11,12 @@ import { makeStyles } from '@material-ui/core/styles'
 import MoreIcon from '@material-ui/icons/MoreVert'
 import Button from '@material-ui/core/Button'
 import { Link, NavLink } from 'react-router-dom'
-import TopBarSearchField from '../../main_layout/TopBarSearchField'
-import TopBarInfoButton from '../../main_layout/TopBarInfoButton'
-import TopBarLanguageButton from '../../main_layout/TopBarLanguageButton'
+import TopBarSearchField from './TopBarSearchField'
+import TopBarInfoButton from './TopBarInfoButton'
+import TopBarLanguageButton from './TopBarLanguageButton'
 import Divider from '@material-ui/core/Divider'
 import { has } from 'lodash'
-import secoLogo from '../../../img/logos/seco-logo-48x50.png'
+import secoLogo from '../../img/logos/seco-logo-48x50.png'
 
 const useStyles = makeStyles(theme => ({
   grow: {
diff --git a/src/client/components/perspectives/sampo/TopBar.stories.js b/src/client/components/main_layout/TopBar.stories.js
similarity index 100%
rename from src/client/components/perspectives/sampo/TopBar.stories.js
rename to src/client/components/main_layout/TopBar.stories.js
diff --git a/src/client/containers/SemanticPortal.js b/src/client/containers/SemanticPortal.js
index 9c7d2f0c9058dfdc483420a53972b042d601e8df..ae386d47d6bde0aae79e11901cded458f2cf2e4a 100644
--- a/src/client/containers/SemanticPortal.js
+++ b/src/client/containers/SemanticPortal.js
@@ -71,26 +71,26 @@ const perspectiveConfigOnlyInfoPages = await createPerspectiveConfigOnlyInfoPage
   portalID,
   onlyInstancePagePerspectives: perspectives.onlyInstancePages
 })
+const apexChartsConfig = await import(`../configs/${portalID}/ApexCharts/ApexChartsConfig`)
+const leafletConfig = await import(`../configs/${portalID}/Leaflet/LeafletConfig`)
+const networkConfig = await import(`../configs/${portalID}/Cytoscape.js/NetworkConfig`)
 // ** portal configuration end **
 
 // ** Import general components **
+const TopBar = lazy(() => import('../components/main_layout/TopBar'))
 const InfoHeader = lazy(() => import('../components/main_layout/InfoHeader'))
 const TextPage = lazy(() => import('../components/main_layout/TextPage'))
 const Message = lazy(() => import('../components/main_layout/Message'))
+const InstanceHomePage = lazy(() => import('../components/main_layout/InstanceHomePage'))
+const FullTextSearch = lazy(() => import('../components/main_layout/FullTextSearch'))
 const FacetBar = lazy(() => import('../components/facet_bar/FacetBar'))
 const FacetResults = lazy(() => import('../components/facet_results/FacetResults'))
 // ** General components end **
 
 // ** Import portal specific components **
-const apexChartsConfig = await import(`../configs/${portalID}/ApexCharts/ApexChartsConfig`)
-const leafletConfig = await import(`../configs/${portalID}/Leaflet/LeafletConfig`)
-const networkConfig = await import(`../configs/${portalID}/Cytoscape.js/NetworkConfig`)
-const TopBar = lazy(() => import(`../components/perspectives/${portalID}/TopBar`))
 const Main = lazy(() => import(`../components/perspectives/${portalID}/Main`))
-const FullTextSearch = lazy(() => import(`../components/perspectives/${portalID}/FullTextSearch`))
 const ClientFSPerspective = lazy(() => import(`../components/perspectives/${portalID}/client_fs/ClientFSPerspective`))
 const ClientFSMain = lazy(() => import(`../components/perspectives/${portalID}/client_fs/ClientFSMain`))
-const InstanceHomePage = lazy(() => import(`../components/perspectives/${portalID}/InstanceHomePage`))
 const Footer = lazy(() => import(`../components/perspectives/${portalID}/Footer`))
 const KnowledgeGraphMetadataTable = lazy(() => import(`../components/perspectives/${portalID}/KnowledgeGraphMetadataTable`))
 // ** Portal specific components end **