diff --git a/stories/client-report/framework/Footer.stories.js b/stories/client-report/framework/Footer.stories.js
deleted file mode 100644
index 1b5dd0e..0000000
--- a/stories/client-report/framework/Footer.stories.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react'
-import Footer from '../../../codebases/compdem/client-report/src/components/framework/Footer'
-
-import '../../../codebases/compdem/client-report/src/index.css'
-
-export default {
-  title: 'Client-Report/Footer',
-  component: Footer,
-}
-
-const Template = (args) => <Footer {...args} />
-
-export const Default = Template.bind({})
-Default.args = {}
diff --git a/stories/client-report/framework/heading.stories.js b/stories/client-report/framework/heading.stories.js
deleted file mode 100644
index 167e1e4..0000000
--- a/stories/client-report/framework/heading.stories.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react'
-import Heading from '../../../codebases/compdem/client-report/src/components/framework/heading'
-import { getConversation } from '../../../.storybook/utils'
-
-import '../../../codebases/compdem/client-report/src/index.css';
-
-export default {
-  title: 'Client-Report/Heading',
-  component: Heading,
-}
-
-const Template = (args) => <Heading {...args} />
-
-export const Default = Template.bind({})
-Default.args = {
-  conversation: getConversation(),
-}
diff --git a/stories/client-report/framework/legend.stories.js b/stories/client-report/framework/legend.stories.js
deleted file mode 100644
index b03fecd..0000000
--- a/stories/client-report/framework/legend.stories.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react'
-import Legend from '../../../codebases/compdem/client-report/src/components/framework/legend'
-import { getVoteColors } from '../../../.storybook/utils'
-
-import '../../../codebases/compdem/client-report/src/index.css';
-
-export default {
-  title: 'Client-Report/Legend',
-  component: Legend,
-}
-
-const Template = (args) => <Legend {...args} />
-
-export const Default = Template.bind({})
-Default.args = {
-  voteColors: getVoteColors(),
-}
diff --git a/stories/client-report/framework/logoLargeShort.stories.js b/stories/client-report/framework/logoLargeShort.stories.js
deleted file mode 100644
index 14c5d73..0000000
--- a/stories/client-report/framework/logoLargeShort.stories.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react'
-import LogoLargeShort from '../../../codebases/compdem/client-report/src/components/framework/logoLargeShort'
-
-import '../../../codebases/compdem/client-report/src/index.css';
-
-export default {
-  title: 'Client-Report/LogoLargeShort',
-  component: LogoLargeShort,
-}
-
-const Template = (args) => <LogoLargeShort {...args} />
-
-export const Default = Template.bind({})
-Default.args = {}
diff --git a/stories/client-report/framework/logoSmallLong.stories.js b/stories/client-report/framework/logoSmallLong.stories.js
deleted file mode 100644
index dbcabc4..0000000
--- a/stories/client-report/framework/logoSmallLong.stories.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react'
-import LogoSmallLong from '../../../codebases/compdem/client-report/src/components/framework/logoSmallLong'
-
-import '../../../codebases/compdem/client-report/src/index.css';
-
-export default {
-  title: 'Client-Report/LogoSmallLong',
-  component: LogoSmallLong,
-}
-
-const Template = (args) => <LogoSmallLong {...args} />
-
-export const Default = Template.bind({})
-Default.args = {}
diff --git a/stories/client-report/barChart.stories.js b/stories/compdem/client-report/BarChart.stories.js
similarity index 72%
rename from stories/client-report/barChart.stories.js
rename to stories/compdem/client-report/BarChart.stories.js
index 05dcd97..dbf7060 100644
--- a/stories/client-report/barChart.stories.js
+++ b/stories/compdem/client-report/BarChart.stories.js
@@ -1,12 +1,11 @@
 import React from 'react'
-import BarChart from '../../codebases/compdem/client-report/src/components/barChart'
-import { getMath } from '../../.storybook/utils'
-import { svgDecorator } from '../../.storybook/decorators'
+import BarChart from '../../../codebases/compdem/client-report/src/components/barChart'
+import { getMath } from '../../../.storybook/utils'
+import { svgDecorator } from '../../../.storybook/decorators'
 
 const mathResults = getMath()
 
 export default {
-  title: 'Client-Report/BarChart',
   component: BarChart,
   decorators: [svgDecorator],
 }
diff --git a/stories/client-report/beeswarm.stories.js b/stories/compdem/client-report/Beeswarm.stories.js
similarity index 75%
rename from stories/client-report/beeswarm.stories.js
rename to stories/compdem/client-report/Beeswarm.stories.js
index 00da8c8..ada3971 100644
--- a/stories/client-report/beeswarm.stories.js
+++ b/stories/compdem/client-report/Beeswarm.stories.js
@@ -1,13 +1,13 @@
 import React from 'react'
-import Beeswarm from '../../codebases/compdem/client-report/src/components/beeswarm/beeswarm'
-import { getMath, getConversation, getExtremity } from '../../.storybook/utils'
+import Beeswarm from '../../../codebases/compdem/client-report/src/components/beeswarm/beeswarm'
+import { getMath, getConversation, getExtremity } from '../../../.storybook/utils'
 
-import '../../codebases/compdem/client-report/src/index.css';
+import '../../../codebases/compdem/client-report/src/index.css';
 
 const mathResult = getMath()
 
 export default {
-  title: 'Client-Report/Beeswarm (not working)',
+  title: 'compdem/client-report/Beeswarm (not working)',
   component: Beeswarm,
 }
 
diff --git a/stories/client-report/overview.stories.js b/stories/compdem/client-report/Overview.stories.js
similarity index 68%
rename from stories/client-report/overview.stories.js
rename to stories/compdem/client-report/Overview.stories.js
index 205764f..9030017 100644
--- a/stories/client-report/overview.stories.js
+++ b/stories/compdem/client-report/Overview.stories.js
@@ -1,11 +1,10 @@
 import React from 'react'
-import Overview from '../../codebases/compdem/client-report/src/components/overview'
-import { getMath, getConversation } from '../../.storybook/utils'
+import Overview from '../../../codebases/compdem/client-report/src/components/overview'
+import { getMath, getConversation } from '../../../.storybook/utils'
 
-import '../../codebases/compdem/client-report/src/index.css';
+import '../../../codebases/compdem/client-report/src/index.css';
 
 export default {
-  title: 'Client-Report/Overview',
   component: Overview,
 }
 
diff --git a/stories/client-report/framework/checkbox.stories.js b/stories/compdem/client-report/framework/Checkbox.stories.js
similarity index 53%
rename from stories/client-report/framework/checkbox.stories.js
rename to stories/compdem/client-report/framework/Checkbox.stories.js
index ecc8718..26aff49 100644
--- a/stories/client-report/framework/checkbox.stories.js
+++ b/stories/compdem/client-report/framework/Checkbox.stories.js
@@ -1,11 +1,11 @@
 import React from 'react'
-import Checkbox from '../../../codebases/compdem/client-report/src/components/framework/checkbox'
-import settings from '../../../codebases/compdem/client-report/src/settings'
+import Checkbox from '../../../../codebases/compdem/client-report/src/components/framework/checkbox'
+import settings from '../../../../codebases/compdem/client-report/src/settings'
 
-import '../../../codebases/compdem/client-report/src/index.css';
+import '../../../../codebases/compdem/client-report/src/index.css';
 
 export default {
-  title: 'Client-Report/Checkbox (buggy)',
+  title: 'compdem/client-report/framework/Checkbox (buggy)',
   component: Checkbox,
 }
 
diff --git a/stories/compdem/client-report/framework/Footer.stories.js b/stories/compdem/client-report/framework/Footer.stories.js
new file mode 100644
index 0000000..85b099b
--- /dev/null
+++ b/stories/compdem/client-report/framework/Footer.stories.js
@@ -0,0 +1,13 @@
+import React from 'react'
+import Footer from '../../../../codebases/compdem/client-report/src/components/framework/Footer'
+
+import '../../../../codebases/compdem/client-report/src/index.css'
+
+export default {
+  component: Footer,
+}
+
+const Template = (args) => <Footer {...args} />
+
+export const Default = Template.bind({})
+Default.args = {}
diff --git a/stories/compdem/client-report/framework/Heading.stories.js b/stories/compdem/client-report/framework/Heading.stories.js
new file mode 100644
index 0000000..51003ad
--- /dev/null
+++ b/stories/compdem/client-report/framework/Heading.stories.js
@@ -0,0 +1,16 @@
+import React from 'react'
+import Heading from '../../../../codebases/compdem/client-report/src/components/framework/heading'
+import { getConversation } from '../../../../.storybook/utils'
+
+import '../../../../codebases/compdem/client-report/src/index.css';
+
+export default {
+  component: Heading,
+}
+
+const Template = (args) => <Heading {...args} />
+
+export const Default = Template.bind({})
+Default.args = {
+  conversation: getConversation(),
+}
diff --git a/stories/compdem/client-report/framework/Legend.stories.js b/stories/compdem/client-report/framework/Legend.stories.js
new file mode 100644
index 0000000..b979fdc
--- /dev/null
+++ b/stories/compdem/client-report/framework/Legend.stories.js
@@ -0,0 +1,16 @@
+import React from 'react'
+import Legend from '../../../../codebases/compdem/client-report/src/components/framework/legend'
+import { getVoteColors } from '../../../../.storybook/utils'
+
+import '../../../../codebases/compdem/client-report/src/index.css';
+
+export default {
+  component: Legend,
+}
+
+const Template = (args) => <Legend {...args} />
+
+export const Default = Template.bind({})
+Default.args = {
+  voteColors: getVoteColors(),
+}
diff --git a/stories/compdem/client-report/framework/LogoLargeShort.stories.js b/stories/compdem/client-report/framework/LogoLargeShort.stories.js
new file mode 100644
index 0000000..ece1ec8
--- /dev/null
+++ b/stories/compdem/client-report/framework/LogoLargeShort.stories.js
@@ -0,0 +1,13 @@
+import React from 'react'
+import LogoLargeShort from '../../../../codebases/compdem/client-report/src/components/framework/logoLargeShort'
+
+import '../../../../codebases/compdem/client-report/src/index.css';
+
+export default {
+  component: LogoLargeShort,
+}
+
+const Template = (args) => <LogoLargeShort {...args} />
+
+export const Default = Template.bind({})
+Default.args = {}
diff --git a/stories/compdem/client-report/framework/LogoSmallLong.stories.js b/stories/compdem/client-report/framework/LogoSmallLong.stories.js
new file mode 100644
index 0000000..2088f12
--- /dev/null
+++ b/stories/compdem/client-report/framework/LogoSmallLong.stories.js
@@ -0,0 +1,13 @@
+import React from 'react'
+import LogoSmallLong from '../../../../codebases/compdem/client-report/src/components/framework/logoSmallLong'
+
+import '../../../../codebases/compdem/client-report/src/index.css';
+
+export default {
+  component: LogoSmallLong,
+}
+
+const Template = (args) => <LogoSmallLong {...args} />
+
+export const Default = Template.bind({})
+Default.args = {}
diff --git a/stories/client-report/lists/BarChartCompact.stories.js b/stories/compdem/client-report/lists/BarChartCompact.stories.js
similarity index 82%
rename from stories/client-report/lists/BarChartCompact.stories.js
rename to stories/compdem/client-report/lists/BarChartCompact.stories.js
index 0b13f40..e4910f8 100644
--- a/stories/client-report/lists/BarChartCompact.stories.js
+++ b/stories/compdem/client-report/lists/BarChartCompact.stories.js
@@ -1,12 +1,11 @@
 import React from 'react'
 
-import { BarChartCompact } from '../../../codebases/compdem/client-report/src/components/lists/commentList.js'
+import { BarChartCompact } from '../../../../codebases/compdem/client-report/src/components/lists/commentList.js'
 
-import participationData from '../../../.storybook/data/3ntrtcehas-participation-init.json'
+import participationData from '../../../../.storybook/data/3ntrtcehas-participation-init.json'
 const pcaData = JSON.parse(participationData.pca)
 
 export default {
-  title: 'Client-Report/BarChartCompact',
   component: BarChartCompact,
 }
 
diff --git a/stories/client-report/lists/CommentRow.stories.js b/stories/compdem/client-report/lists/CommentRow.stories.js
similarity index 99%
rename from stories/client-report/lists/CommentRow.stories.js
rename to stories/compdem/client-report/lists/CommentRow.stories.js
index 1c265c2..fa38660 100644
--- a/stories/client-report/lists/CommentRow.stories.js
+++ b/stories/compdem/client-report/lists/CommentRow.stories.js
@@ -1,12 +1,11 @@
 import React from 'react'
 
-import { CommentRow } from '../../../codebases/compdem/client-report/src/components/lists/commentList.js'
+import { CommentRow } from '../../../../codebases/compdem/client-report/src/components/lists/commentList.js'
 
-import participationData from '../../../.storybook/data/3ntrtcehas-participation-init.json'
+import participationData from '../../../../.storybook/data/3ntrtcehas-participation-init.json'
 const pcaData = JSON.parse(participationData.pca)
 
 export default {
-  title: 'Client-Report/CommentRow',
   component: CommentRow,
 }