diff --git a/src/FilterLists.Web.V2/src/App.tsx b/src/FilterLists.Web.V2/src/App.tsx
index e655c23b2..4764e2006 100644
--- a/src/FilterLists.Web.V2/src/App.tsx
+++ b/src/FilterLists.Web.V2/src/App.tsx
@@ -13,12 +13,11 @@ const App: React.FC = () => {
           theme="dark"
           mode="horizontal"
           style={{ lineHeight: '64px' }}
-        >
-        </Menu>
+        />
       </Header>
       <Content style={{ padding: '0 50px' }}>
         <div style={{ background: '#fff', padding: 24, minHeight: 280 }}>
-          <AllListsTable></AllListsTable>
+          <AllListsTable />
         </div>
       </Content>
       <Footer style={{ textAlign: 'center' }}>©2019 Collin M. Barrett</Footer>
diff --git a/src/FilterLists.Web.V2/src/modules/allListsTable/AllListsTable.tsx b/src/FilterLists.Web.V2/src/modules/allListsTable/AllListsTable.tsx
index 7e70bb905..9aaf3d782 100644
--- a/src/FilterLists.Web.V2/src/modules/allListsTable/AllListsTable.tsx
+++ b/src/FilterLists.Web.V2/src/modules/allListsTable/AllListsTable.tsx
@@ -1,6 +1,6 @@
 import { Table } from 'antd';
 import * as React from "react";
-import { SubscribeButton } from '../../shared/';
+import { SubscribeButton } from '../../shared';
 import { nameof } from '../../utils';
 import './AllListsTable.css';
 import { List } from './List';
diff --git a/src/FilterLists.Web.V2/src/shared/buttons/index.ts b/src/FilterLists.Web.V2/src/shared/buttons/index.ts
new file mode 100644
index 000000000..a551734b5
--- /dev/null
+++ b/src/FilterLists.Web.V2/src/shared/buttons/index.ts
@@ -0,0 +1,3 @@
+import { SubscribeButton } from './subscribe';
+
+export { SubscribeButton }
\ No newline at end of file
diff --git a/src/FilterLists.Web.V2/src/shared/SubscribeButton.css b/src/FilterLists.Web.V2/src/shared/buttons/subscribe/SubscribeButton.css
similarity index 100%
rename from src/FilterLists.Web.V2/src/shared/SubscribeButton.css
rename to src/FilterLists.Web.V2/src/shared/buttons/subscribe/SubscribeButton.css
diff --git a/src/FilterLists.Web.V2/src/shared/SubscribeButton.tsx b/src/FilterLists.Web.V2/src/shared/buttons/subscribe/SubscribeButton.tsx
similarity index 100%
rename from src/FilterLists.Web.V2/src/shared/SubscribeButton.tsx
rename to src/FilterLists.Web.V2/src/shared/buttons/subscribe/SubscribeButton.tsx
diff --git a/src/FilterLists.Web.V2/src/shared/buttons/subscribe/index.ts b/src/FilterLists.Web.V2/src/shared/buttons/subscribe/index.ts
new file mode 100644
index 000000000..08f333155
--- /dev/null
+++ b/src/FilterLists.Web.V2/src/shared/buttons/subscribe/index.ts
@@ -0,0 +1,3 @@
+import { SubscribeButton } from './SubscribeButton';
+
+export { SubscribeButton }
\ 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
index 08f333155..fc3bfe9e8 100644
--- a/src/FilterLists.Web.V2/src/shared/index.ts
+++ b/src/FilterLists.Web.V2/src/shared/index.ts
@@ -1,3 +1,3 @@
-import { SubscribeButton } from './SubscribeButton';
+import { SubscribeButton } from './buttons';
 
 export { SubscribeButton }
\ No newline at end of file