diff --git a/src/components/Accordion.tsx b/src/components/Accordion/Accordion.tsx
similarity index 100%
rename from src/components/Accordion.tsx
rename to src/components/Accordion/Accordion.tsx
diff --git a/src/components/Accordion/AccordionIcon.tsx b/src/components/Accordion/AccordionIcon.tsx
new file mode 100644
index 0000000..25d5e4c
--- /dev/null
+++ b/src/components/Accordion/AccordionIcon.tsx
@@ -0,0 +1,36 @@
+import React from "react";
+import styled from "styled-components";
+import { colors } from "../../theme/colors";
+
+interface AccordionIconProps {
+  open: boolean;
+}
+
+const Icon = styled.div<AccordionIconProps>`
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: ${(p) => p.open ? colors.orange1 : colors.blue1};
+  color: ${colors.white};
+  min-width: 40px;
+  max-width: 40px;
+  min-height: 40px;
+  max-height: 40px;
+  margin: 0.2em;
+  font-size: 40px;
+
+  ${(p) => p.open && (`
+    span {
+      transform: rotate(45deg);
+    }
+  `)}
+
+`;
+
+const AccordionIcon: React.FC<AccordionIconProps> = ({ open } ) => (
+  <Icon open={open}>
+    <span>+</span>
+  </Icon>
+);
+
+export default AccordionIcon;
diff --git a/src/components/Accordion/index.ts b/src/components/Accordion/index.ts
deleted file mode 100644
index 6f6532e..0000000
--- a/src/components/Accordion/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import Accordion from "../Accordion";
-export default Accordion;
diff --git a/src/components/AccordionIcon/AccordionIcon.scss b/src/components/AccordionIcon/AccordionIcon.scss
deleted file mode 100644
index 7933042..0000000
--- a/src/components/AccordionIcon/AccordionIcon.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-@import "../../assets/scss/globals";
-
-
-.accordion-icon {
-  display: flex;
-  background-color: color(blue1);
-  color: color(white1);
-  align-items: center;
-  justify-content: center;
-  min-width: 40px;
-  max-width: 40px;
-  min-height: 40px;
-  max-height: 40px;
-  margin: 0.2em;
-  font-size: 40px;
-
-  &.open {
-    background-color: color(orange1);
-  }
-}
-
-.accordion-text {
-  &.open {
-    -webkit-transform: rotate(45deg);
-    -moz-transform: rotate(45deg);
-    -o-transform: rotate(45deg);
-    transform: rotate(45deg);
-  }
-}
diff --git a/src/components/AccordionIcon/AccordionIcon.tsx b/src/components/AccordionIcon/AccordionIcon.tsx
deleted file mode 100644
index 753a7ad..0000000
--- a/src/components/AccordionIcon/AccordionIcon.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from "react";
-import "./AccordionIcon.scss";
-
-export interface AccordionIconProps {
-  open: boolean;
-}
-export interface AccordionIconState {}
-
-class AccordionIcon extends React.Component<AccordionIconProps, AccordionIconState> {
-  render() {
-    const { open } = this.props;
-    return (
-      <div className={`accordion-icon ${open ? "open" : ""}`}>
-        <div className={`accordion-text ${open ? "open" : ""}`}>+</div>
-      </div>
-    );
-  }
-}
-
-export default AccordionIcon;
diff --git a/src/components/AccordionIcon/index.ts b/src/components/AccordionIcon/index.ts
deleted file mode 100644
index bc97054..0000000
--- a/src/components/AccordionIcon/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import AccordionIcon from "./AccordionIcon";
-export default AccordionIcon;
diff --git a/src/components/JsonLD/JsonLD.tsx b/src/components/JsonLD.tsx
similarity index 100%
rename from src/components/JsonLD/JsonLD.tsx
rename to src/components/JsonLD.tsx
diff --git a/src/components/JsonLD/index.ts b/src/components/JsonLD/index.ts
deleted file mode 100644
index e9b2e76..0000000
--- a/src/components/JsonLD/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import JsonLD from "./JsonLD";
-export default JsonLD;
diff --git a/src/components/PageLink/PageLink.tsx b/src/components/PageLink.tsx
similarity index 96%
rename from src/components/PageLink/PageLink.tsx
rename to src/components/PageLink.tsx
index 3a445fb..306d0f1 100644
--- a/src/components/PageLink/PageLink.tsx
+++ b/src/components/PageLink.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import styled from "styled-components";
-import TextAnchor from "../TextAnchor";
+import TextAnchor from "./TextAnchor";
 import { colors } from "@theme/colors";
 
 interface PageLinkProps {
diff --git a/src/components/PageLink/index.ts b/src/components/PageLink/index.ts
deleted file mode 100644
index 118b0a5..0000000
--- a/src/components/PageLink/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import PageLink from "./PageLink";
-export default PageLink;
diff --git a/src/components/index.tsx b/src/components/index.tsx
index 2bf19f6..3538c91 100644
--- a/src/components/index.tsx
+++ b/src/components/index.tsx
@@ -8,4 +8,4 @@ export { default as CTASection } from "./Sections/CTASection";
 export { default as TextSection } from "./Sections/TextSection";
 export { default as FullWidthSection } from "./Sections/FullWidthSection";
 export { default as InfoBox } from "./InfoBox";
-export { default as Accordion } from "./Accordion";
+export { default as Accordion } from "./Accordion/Accordion";
diff --git a/src/views/CorporatePage/CorporatePageView.tsx b/src/views/CorporatePage/CorporatePageView.tsx
index 34e3e92..797bca7 100644
--- a/src/views/CorporatePage/CorporatePageView.tsx
+++ b/src/views/CorporatePage/CorporatePageView.tsx
@@ -1,7 +1,6 @@
 import React from "react";
 import CorporatePageHero from "./CorporatePageHero";
-import PageLink from "@components/PageLink";
-import { CTASection, TextSection } from "@components/index";
+import { CTASection, TextSection, PageLink } from "@components/index";
 
 const CorporatePageView: React.FC = () => (
   <>
diff --git a/src/views/FreshmenPage/FreshmenPageView.tsx b/src/views/FreshmenPage/FreshmenPageView.tsx
index fc4cc80..9795e05 100644
--- a/src/views/FreshmenPage/FreshmenPageView.tsx
+++ b/src/views/FreshmenPage/FreshmenPageView.tsx
@@ -1,9 +1,8 @@
 import React from "react";
 import styled from "styled-components";
 import FreshmenPageHero from "./FreshmenPageHero";
-import PageLink from "@components/PageLink";
 import Anchor from "@components/Anchor";
-import { CTASection, TextSection, InfoBox } from "@components/index";
+import { CTASection, TextSection, InfoBox, PageLink } from "@components/index";
 
 const KippariImage = styled.img`
   max-width:100%;
diff --git a/src/views/GuildPage/GuildPageView.tsx b/src/views/GuildPage/GuildPageView.tsx
index 0c5592b..99129c6 100644
--- a/src/views/GuildPage/GuildPageView.tsx
+++ b/src/views/GuildPage/GuildPageView.tsx
@@ -1,9 +1,8 @@
 import React from "react";
 import styled from "styled-components";
-import PageLink from "@components/PageLink";
 import TextAnchor from "@components/TextAnchor";
 import Anchor from "@components/Anchor";
-import { CTASection, TextSection, InfoBox, Accordion } from "@components/index";
+import { CTASection, TextSection, InfoBox, Accordion, PageLink } from "@components/index";
 import GuildPageHero from "./GuildPageHero";
 import FullWidthSection from "@components/Sections/FullWidthSection";
 import { colors } from "@theme/colors";
diff --git a/src/views/StudiesPage/StudiesPageView.tsx b/src/views/StudiesPage/StudiesPageView.tsx
index 22ab147..ab41073 100644
--- a/src/views/StudiesPage/StudiesPageView.tsx
+++ b/src/views/StudiesPage/StudiesPageView.tsx
@@ -1,7 +1,5 @@
 import React from "react";
-import PageLink from "@components/PageLink";
-import Anchor from "@components/Anchor";
-import { CTASection, TextSection } from "@components/index";
+import { CTASection, TextSection, PageLink } from "@components/index";
 import StudiesPageHero from "./StudiesPageHero";
 
 const StudiesPageView: React.FC = () => (