diff --git a/gatsby-node.js b/gatsby-node.js
index d697e86d1..9df8b50f4 100644
--- a/gatsby-node.js
+++ b/gatsby-node.js
@@ -15,7 +15,7 @@ exports.createPages = async ({ graphql, actions }) => {
 
   // Create pages for all assets
   const assetDetailsTemplate = path.resolve(
-    'src/components/templates/AssetDetails/index.tsx'
+    'src/components/templates/AssetDetails.tsx'
   )
 
   const result = await graphql(`
diff --git a/src/components/molecules/JobDetailsDialog.tsx b/src/components/molecules/JobDetailsDialog.tsx
index a2b30750d..b302c7ab1 100644
--- a/src/components/molecules/JobDetailsDialog.tsx
+++ b/src/components/molecules/JobDetailsDialog.tsx
@@ -1,8 +1,8 @@
-import React from 'react'
+import React, { ReactElement } from 'react'
 import { ComputeItem } from '@oceanprotocol/react'
 import BaseDialog from '../atoms/BaseDialog'
 import styles from './JobDetailsDialog.module.css'
-import MetaItem from '../templates/AssetDetails/MetaItem'
+import MetaItem from '../organisms/AssetContent/MetaItem'
 import Time from '../atoms/Time'
 import shortid from 'shortid'
 import { Link } from 'gatsby'
@@ -15,7 +15,7 @@ export default function JobDetailsDialog({
   computeItem: ComputeItem | undefined
   isOpen: boolean
   onClose: () => void
-}) {
+}): ReactElement {
   if (!computeItem) return null
 
   const { attributes } = computeItem.ddo.findServiceByType('metadata')
diff --git a/src/components/templates/AssetDetails/MetaFull.module.css b/src/components/organisms/AssetContent/MetaFull.module.css
similarity index 100%
rename from src/components/templates/AssetDetails/MetaFull.module.css
rename to src/components/organisms/AssetContent/MetaFull.module.css
diff --git a/src/components/templates/AssetDetails/MetaFull.tsx b/src/components/organisms/AssetContent/MetaFull.tsx
similarity index 100%
rename from src/components/templates/AssetDetails/MetaFull.tsx
rename to src/components/organisms/AssetContent/MetaFull.tsx
diff --git a/src/components/templates/AssetDetails/MetaItem.module.css b/src/components/organisms/AssetContent/MetaItem.module.css
similarity index 100%
rename from src/components/templates/AssetDetails/MetaItem.module.css
rename to src/components/organisms/AssetContent/MetaItem.module.css
diff --git a/src/components/templates/AssetDetails/MetaItem.tsx b/src/components/organisms/AssetContent/MetaItem.tsx
similarity index 80%
rename from src/components/templates/AssetDetails/MetaItem.tsx
rename to src/components/organisms/AssetContent/MetaItem.tsx
index 391045c67..30c7f89d2 100644
--- a/src/components/templates/AssetDetails/MetaItem.tsx
+++ b/src/components/organisms/AssetContent/MetaItem.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { ReactElement } from 'react'
 import styles from './MetaItem.module.css'
 
 export default function MetaItem({
@@ -7,7 +7,7 @@ export default function MetaItem({
 }: {
   title: string
   content: any
-}) {
+}): ReactElement {
   return (
     <div className={styles.metaItem}>
       <h3 className={styles.title}>{title}</h3>
diff --git a/src/components/templates/AssetDetails/MetaSecondary.module.css b/src/components/organisms/AssetContent/MetaSecondary.module.css
similarity index 100%
rename from src/components/templates/AssetDetails/MetaSecondary.module.css
rename to src/components/organisms/AssetContent/MetaSecondary.module.css
diff --git a/src/components/templates/AssetDetails/MetaSecondary.tsx b/src/components/organisms/AssetContent/MetaSecondary.tsx
similarity index 100%
rename from src/components/templates/AssetDetails/MetaSecondary.tsx
rename to src/components/organisms/AssetContent/MetaSecondary.tsx
diff --git a/src/components/templates/AssetDetails/RatingAction.module.css b/src/components/organisms/AssetContent/RatingAction.module.css
similarity index 100%
rename from src/components/templates/AssetDetails/RatingAction.module.css
rename to src/components/organisms/AssetContent/RatingAction.module.css
diff --git a/src/components/templates/AssetDetails/RatingAction.tsx b/src/components/organisms/AssetContent/RatingAction.tsx
similarity index 95%
rename from src/components/templates/AssetDetails/RatingAction.tsx
rename to src/components/organisms/AssetContent/RatingAction.tsx
index fce02d567..47847f486 100644
--- a/src/components/templates/AssetDetails/RatingAction.tsx
+++ b/src/components/organisms/AssetContent/RatingAction.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect, ReactElement } from 'react'
 import { toast } from 'react-toastify'
 import Rating from '../../atoms/Rating'
 import rateAsset from '../../../utils/rateAsset'
@@ -13,7 +13,7 @@ export default function RatingAction({
 }: {
   did: DID | string
   onVote: () => void
-}) {
+}): ReactElement {
   const { web3, account } = useWeb3()
   const [rating, setRating] = useState<number>(0)
   const [isloading, setIsLoading] = useState(false)
diff --git a/src/components/templates/AssetDetails/AssetContent.module.css b/src/components/organisms/AssetContent/index.module.css
similarity index 100%
rename from src/components/templates/AssetDetails/AssetContent.module.css
rename to src/components/organisms/AssetContent/index.module.css
diff --git a/src/components/templates/AssetDetails/AssetContent.tsx b/src/components/organisms/AssetContent/index.tsx
similarity index 95%
rename from src/components/templates/AssetDetails/AssetContent.tsx
rename to src/components/organisms/AssetContent/index.tsx
index aac2b96c6..2606bd145 100644
--- a/src/components/templates/AssetDetails/AssetContent.tsx
+++ b/src/components/organisms/AssetContent/index.tsx
@@ -6,10 +6,10 @@ import { Link } from 'gatsby'
 import Markdown from '../../atoms/Markdown'
 import Tags from '../../atoms/Tags'
 import MetaFull from './MetaFull'
-import Compute from '../../organisms/Compute'
-import Consume from '../../organisms/Consume'
+import Compute from '../Compute'
+import Consume from '../Consume'
 import MetaSecondary from './MetaSecondary'
-import styles from './AssetContent.module.css'
+import styles from './index.module.css'
 
 export interface AssetContentProps {
   metadata: MetaDataMarket
diff --git a/src/components/templates/AssetDetails/index.tsx b/src/components/templates/AssetDetails.tsx
similarity index 89%
rename from src/components/templates/AssetDetails/index.tsx
rename to src/components/templates/AssetDetails.tsx
index 8a2e05c28..20d9c6b11 100644
--- a/src/components/templates/AssetDetails/index.tsx
+++ b/src/components/templates/AssetDetails.tsx
@@ -1,7 +1,7 @@
 import React, { ReactElement } from 'react'
 import { PageProps, graphql } from 'gatsby'
-import Layout from '../../../components/Layout'
-import AssetContent from './AssetContent'
+import Layout from '../Layout'
+import AssetContent from '../organisms/AssetContent'
 
 export default function AssetDetailsTemplate(props: PageProps): ReactElement {
   const { asset } = props.data as any
diff --git a/src/pages/asset/index.tsx b/src/pages/asset/index.tsx
index 6ce312f48..b0196cafc 100644
--- a/src/pages/asset/index.tsx
+++ b/src/pages/asset/index.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, ReactElement } from 'react'
 import { Router } from '@reach/router'
-import AssetContent from '../../components/templates/AssetDetails/AssetContent'
+import AssetContent from '../../components/organisms/AssetContent'
 import Layout from '../../components/Layout'
 import { PageProps } from 'gatsby'
 import { MetaDataMarket, ServiceMetaDataMarket } from '../../@types/MetaData'