diff --git a/src/FilterLists.Web.V2/src/App.tsx b/src/FilterLists.Web.V2/src/App.tsx
index d41e9f416..dbd1fff01 100644
--- a/src/FilterLists.Web.V2/src/App.tsx
+++ b/src/FilterLists.Web.V2/src/App.tsx
@@ -1,7 +1,7 @@
 import { Layout, Menu } from 'antd';
 import React from 'react';
 
-import { AllListsTable } from './modules';
+import { AllListsTable } from './components';
 
 const { Header, Content, Footer } = Layout;
 
diff --git a/src/FilterLists.Web.V2/src/components/Description.tsx b/src/FilterLists.Web.V2/src/components/Description.tsx
new file mode 100644
index 000000000..a2862dbf7
--- /dev/null
+++ b/src/FilterLists.Web.V2/src/components/Description.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+
+interface Props {
+  description: string;
+  descriptionSourceUrl: string;
+};
+
+export const Description = (props: Props): JSX.Element =>
+  props.description
+    ? <blockquote cite={props.description}>{props.description}</blockquote>
+    : <p>{props.description}</p>;
\ No newline at end of file
diff --git a/src/FilterLists.Web.V2/src/modules/allListsTable/AllListsTable.module.css b/src/FilterLists.Web.V2/src/components/allListsTable/AllListsTable.module.css
similarity index 100%
rename from src/FilterLists.Web.V2/src/modules/allListsTable/AllListsTable.module.css
rename to src/FilterLists.Web.V2/src/components/allListsTable/AllListsTable.module.css
diff --git a/src/FilterLists.Web.V2/src/modules/allListsTable/AllListsTable.tsx b/src/FilterLists.Web.V2/src/components/allListsTable/AllListsTable.tsx
similarity index 89%
rename from src/FilterLists.Web.V2/src/modules/allListsTable/AllListsTable.tsx
rename to src/FilterLists.Web.V2/src/components/allListsTable/AllListsTable.tsx
index bbd87ecaa..17017b9d6 100644
--- a/src/FilterLists.Web.V2/src/modules/allListsTable/AllListsTable.tsx
+++ b/src/FilterLists.Web.V2/src/components/allListsTable/AllListsTable.tsx
@@ -1,12 +1,12 @@
 import { Table } from 'antd';
 import React from 'react';
 
-import { Description, LanguageCloud, SubscribeButton, TagCloud } from '../../shared';
+import { Description, LanguageCloud, ListDetails, TagCloud } from '..';
+import { Language } from '../../interfaces/Language';
+import { List } from '../../interfaces/List';
+import { Tag } from '../../interfaces/Tag';
 import { nameof } from '../../utils';
 import styles from './AllListsTable.module.css';
-import { Language } from './Language';
-import { List } from './List';
-import { Tag } from './Tag';
 
 interface State {
   lists: List[];
@@ -90,8 +90,7 @@ export class AllListsTable extends React.Component<{}, State> {
           title="Description"
           dataIndex={nameof<List>("description")}
           className={styles.nogrow}
-          render={(text: string, record: List) =>
-            <Description desriptionSourceUrl={record.descriptionSourceUrl} desription={text} />} />
+          render={(_text: string, record: List) => <Description {...record} />} />
         <Table.Column<List>
           title="Software"
           dataIndex={nameof<List>("syntaxId")}
@@ -117,13 +116,12 @@ export class AllListsTable extends React.Component<{}, State> {
             tagIds
               ? <TagCloud tags={this.state.tags.filter((t: Tag) => tagIds.includes(t.id))} />
               : null} />
-        <Table.Column<List> title="Subscribe"
+        <Table.Column<List> title="Details"
           dataIndex={nameof<List>("viewUrl")}
           width={123}
           className={styles.nogrow}
           fixed={this.state.isNarrowWindow ? undefined : "right"}
-          render={(text: string, record: List, index: number) =>
-            <SubscribeButton key={index} viewUrl={text} viewUrlMirrors={record.viewUrlMirrors} name={record.name} />} />
+          render={(_text: string, record: List) => <ListDetails list={record} />} />
       </Table>
     );
   }
diff --git a/src/FilterLists.Web.V2/src/modules/allListsTable/index.ts b/src/FilterLists.Web.V2/src/components/allListsTable/index.ts
similarity index 100%
rename from src/FilterLists.Web.V2/src/modules/allListsTable/index.ts
rename to src/FilterLists.Web.V2/src/components/allListsTable/index.ts
diff --git a/src/FilterLists.Web.V2/src/shared/buttons/index.ts b/src/FilterLists.Web.V2/src/components/buttons/index.ts
similarity index 100%
rename from src/FilterLists.Web.V2/src/shared/buttons/index.ts
rename to src/FilterLists.Web.V2/src/components/buttons/index.ts
diff --git a/src/FilterLists.Web.V2/src/shared/buttons/subscribe/SubscribeButton.module.css b/src/FilterLists.Web.V2/src/components/buttons/subscribe/SubscribeButton.module.css
similarity index 100%
rename from src/FilterLists.Web.V2/src/shared/buttons/subscribe/SubscribeButton.module.css
rename to src/FilterLists.Web.V2/src/components/buttons/subscribe/SubscribeButton.module.css
diff --git a/src/FilterLists.Web.V2/src/shared/buttons/subscribe/SubscribeButton.tsx b/src/FilterLists.Web.V2/src/components/buttons/subscribe/SubscribeButton.tsx
similarity index 100%
rename from src/FilterLists.Web.V2/src/shared/buttons/subscribe/SubscribeButton.tsx
rename to src/FilterLists.Web.V2/src/components/buttons/subscribe/SubscribeButton.tsx
diff --git a/src/FilterLists.Web.V2/src/shared/buttons/subscribe/index.ts b/src/FilterLists.Web.V2/src/components/buttons/subscribe/index.ts
similarity index 100%
rename from src/FilterLists.Web.V2/src/shared/buttons/subscribe/index.ts
rename to src/FilterLists.Web.V2/src/components/buttons/subscribe/index.ts
diff --git a/src/FilterLists.Web.V2/src/components/index.ts b/src/FilterLists.Web.V2/src/components/index.ts
new file mode 100644
index 000000000..a14e1b807
--- /dev/null
+++ b/src/FilterLists.Web.V2/src/components/index.ts
@@ -0,0 +1,8 @@
+import { AllListsTable } from './allListsTable';
+import { SubscribeButton } from './buttons';
+import { Description } from './Description';
+import { LanguageCloud } from './languageCloud';
+import { ListDetails } from './listDetails';
+import { TagCloud } from './tagCloud';
+
+export { SubscribeButton, Description, LanguageCloud, TagCloud, AllListsTable, ListDetails };
diff --git a/src/FilterLists.Web.V2/src/shared/languageCloud/LanguageCloud.module.css b/src/FilterLists.Web.V2/src/components/languageCloud/LanguageCloud.module.css
similarity index 100%
rename from src/FilterLists.Web.V2/src/shared/languageCloud/LanguageCloud.module.css
rename to src/FilterLists.Web.V2/src/components/languageCloud/LanguageCloud.module.css
diff --git a/src/FilterLists.Web.V2/src/shared/languageCloud/LanguageCloud.tsx b/src/FilterLists.Web.V2/src/components/languageCloud/LanguageCloud.tsx
similarity index 100%
rename from src/FilterLists.Web.V2/src/shared/languageCloud/LanguageCloud.tsx
rename to src/FilterLists.Web.V2/src/components/languageCloud/LanguageCloud.tsx
diff --git a/src/FilterLists.Web.V2/src/shared/languageCloud/index.ts b/src/FilterLists.Web.V2/src/components/languageCloud/index.ts
similarity index 100%
rename from src/FilterLists.Web.V2/src/shared/languageCloud/index.ts
rename to src/FilterLists.Web.V2/src/components/languageCloud/index.ts
diff --git a/src/FilterLists.Web.V2/src/components/listDetails/ListDetails.tsx b/src/FilterLists.Web.V2/src/components/listDetails/ListDetails.tsx
new file mode 100644
index 000000000..9f1f7d79d
--- /dev/null
+++ b/src/FilterLists.Web.V2/src/components/listDetails/ListDetails.tsx
@@ -0,0 +1,39 @@
+import { Button, Drawer } from 'antd';
+import React from 'react';
+
+import { Description } from '..';
+import { List } from '../../interfaces/List';
+
+interface State {
+  visible: boolean;
+}
+
+interface Props {
+  list: List;
+};
+
+export class ListDetails extends React.Component<Props, State> {
+  constructor(props: any) {
+    super(props);
+    this.state = {
+      visible: false
+    };
+  }
+
+  render() {
+    return (
+      <span>
+        <Button
+          type="primary"
+          onClick={() => this.setState({ visible: true, })}>
+          Details
+          </Button>
+        <Drawer
+          visible={this.state.visible}
+          onClose={() => this.setState({ visible: false, })}>
+          <Description {...this.props.list} />
+        </Drawer>
+      </span>
+    )
+  }
+}
\ No newline at end of file
diff --git a/src/FilterLists.Web.V2/src/components/listDetails/index.ts b/src/FilterLists.Web.V2/src/components/listDetails/index.ts
new file mode 100644
index 000000000..d1f027755
--- /dev/null
+++ b/src/FilterLists.Web.V2/src/components/listDetails/index.ts
@@ -0,0 +1,3 @@
+import { ListDetails } from './ListDetails';
+
+export { ListDetails };
diff --git a/src/FilterLists.Web.V2/src/shared/tagCloud/TagCloud.module.css b/src/FilterLists.Web.V2/src/components/tagCloud/TagCloud.module.css
similarity index 100%
rename from src/FilterLists.Web.V2/src/shared/tagCloud/TagCloud.module.css
rename to src/FilterLists.Web.V2/src/components/tagCloud/TagCloud.module.css
diff --git a/src/FilterLists.Web.V2/src/shared/tagCloud/TagCloud.tsx b/src/FilterLists.Web.V2/src/components/tagCloud/TagCloud.tsx
similarity index 100%
rename from src/FilterLists.Web.V2/src/shared/tagCloud/TagCloud.tsx
rename to src/FilterLists.Web.V2/src/components/tagCloud/TagCloud.tsx
diff --git a/src/FilterLists.Web.V2/src/shared/tagCloud/index.ts b/src/FilterLists.Web.V2/src/components/tagCloud/index.ts
similarity index 100%
rename from src/FilterLists.Web.V2/src/shared/tagCloud/index.ts
rename to src/FilterLists.Web.V2/src/components/tagCloud/index.ts
diff --git a/src/FilterLists.Web.V2/src/modules/allListsTable/Language.ts b/src/FilterLists.Web.V2/src/interfaces/Language.ts
similarity index 100%
rename from src/FilterLists.Web.V2/src/modules/allListsTable/Language.ts
rename to src/FilterLists.Web.V2/src/interfaces/Language.ts
diff --git a/src/FilterLists.Web.V2/src/modules/allListsTable/List.ts b/src/FilterLists.Web.V2/src/interfaces/List.ts
similarity index 100%
rename from src/FilterLists.Web.V2/src/modules/allListsTable/List.ts
rename to src/FilterLists.Web.V2/src/interfaces/List.ts
diff --git a/src/FilterLists.Web.V2/src/modules/allListsTable/Tag.ts b/src/FilterLists.Web.V2/src/interfaces/Tag.ts
similarity index 100%
rename from src/FilterLists.Web.V2/src/modules/allListsTable/Tag.ts
rename to src/FilterLists.Web.V2/src/interfaces/Tag.ts
diff --git a/src/FilterLists.Web.V2/src/modules/index.ts b/src/FilterLists.Web.V2/src/modules/index.ts
deleted file mode 100644
index 5b656626f..000000000
--- a/src/FilterLists.Web.V2/src/modules/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { AllListsTable } from './allListsTable';
-
-export { AllListsTable }
\ No newline at end of file
diff --git a/src/FilterLists.Web.V2/src/shared/Description.tsx b/src/FilterLists.Web.V2/src/shared/Description.tsx
deleted file mode 100644
index 4b030b5f0..000000000
--- a/src/FilterLists.Web.V2/src/shared/Description.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-
-interface Props {
-  desription: string;
-  desriptionSourceUrl: string;
-};
-
-export const Description = (props: Props): JSX.Element =>
-  props.desriptionSourceUrl
-    ? <blockquote cite={props.desriptionSourceUrl}>{props.desription}</blockquote>
-    : <p>{props.desription}</p>;
\ No newline at end of file
diff --git a/src/FilterLists.Web.V2/src/shared/index.ts b/src/FilterLists.Web.V2/src/shared/index.ts
deleted file mode 100644
index ee6d73771..000000000
--- a/src/FilterLists.Web.V2/src/shared/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { SubscribeButton } from './buttons';
-import { Description } from './Description';
-import { LanguageCloud } from './languageCloud';
-import { TagCloud } from './tagCloud';
-
-export { SubscribeButton, Description, LanguageCloud, TagCloud };