diff --git a/client/src/client-only-routes/ShowProfileOrFourOhFour.js b/client/src/client-only-routes/ShowProfileOrFourOhFour.js
index 0b6b49cbe0..e164c727e4 100644
--- a/client/src/client-only-routes/ShowProfileOrFourOhFour.js
+++ b/client/src/client-only-routes/ShowProfileOrFourOhFour.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { isEmpty } from 'lodash-es';
 
-import Loader from '../components/helpers/Loader';
+import Loader from '../components/helpers/loader';
 import {
   userByNameSelector,
   userProfileFetchStateSelector,
diff --git a/client/src/client-only-routes/ShowUnsubscribed.js b/client/src/client-only-routes/ShowUnsubscribed.js
index 9bfcf9788e..e0cf948ab0 100644
--- a/client/src/client-only-routes/ShowUnsubscribed.js
+++ b/client/src/client-only-routes/ShowUnsubscribed.js
@@ -5,7 +5,7 @@ import Helmet from 'react-helmet';
 import { useTranslation } from 'react-i18next';
 
 import envData from '../../../config/env.json';
-import FullWidthRow from '../components/helpers/FullWidthRow';
+import FullWidthRow from '../components/helpers/full-width-row';
 import { Spacer } from '../components/helpers';
 
 const { apiLocation } = envData;
diff --git a/client/src/components/Donation/DonateForm.js b/client/src/components/Donation/DonateForm.js
index 4b78137620..295bff1365 100644
--- a/client/src/components/Donation/DonateForm.js
+++ b/client/src/components/Donation/DonateForm.js
@@ -20,7 +20,7 @@ import {
   defaultDonation,
   modalDefaultDonation
 } from '../../../../config/donation-settings';
-import Spacer from '../helpers/Spacer';
+import Spacer from '../helpers/spacer';
 import PaypalButton from './PaypalButton';
 import DonateCompletion from './DonateCompletion';
 import {
diff --git a/client/src/components/Footer/index.js b/client/src/components/Footer/index.js
index 32ed7e099a..79117fb496 100644
--- a/client/src/components/Footer/index.js
+++ b/client/src/components/Footer/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
-import Link from '../helpers/Link';
+import Link from '../helpers/link';
 import './footer.css';
 
 const propTypes = {
diff --git a/client/src/components/Intro/index.js b/client/src/components/Intro/index.js
index 69c2934ba5..1eb4bb88df 100644
--- a/client/src/components/Intro/index.js
+++ b/client/src/components/Intro/index.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Link, Spacer, Loader, FullWidthRow } from '../helpers';
 import { randomQuote } from '../../utils/get-words';
-import CurrentChallengeLink from '../helpers/CurrentChallengeLink';
+import CurrentChallengeLink from '../helpers/current-challenge-link';
 import IntroDescription from './components/IntroDescription';
 import { Trans, useTranslation } from 'react-i18next';
 
diff --git a/client/src/components/helpers/Spacer.js b/client/src/components/helpers/Spacer.js
deleted file mode 100644
index 385b819937..0000000000
--- a/client/src/components/helpers/Spacer.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-const styles = { padding: '15px 0', height: '1px' };
-
-const Comp = props => <div className='spacer' style={styles} {...props} />;
-
-const Spacer = ({ size = 1 }) =>
-  size === 1 ? (
-    <Comp />
-  ) : (
-    '#'
-      .repeat(size)
-      .split('')
-      .map((_, i) => <Comp key={`spacer_${i}`} />)
-  );
-
-Spacer.propTypes = {
-  size: PropTypes.number
-};
-
-export default Spacer;
diff --git a/client/src/components/helpers/__snapshots__/Loader.test.js.snap b/client/src/components/helpers/__snapshots__/loader.test.tsx.snap
similarity index 100%
rename from client/src/components/helpers/__snapshots__/Loader.test.js.snap
rename to client/src/components/helpers/__snapshots__/loader.test.tsx.snap
diff --git a/client/src/components/helpers/AvatarRenderer.js b/client/src/components/helpers/avatar-renderer.tsx
similarity index 63%
rename from client/src/components/helpers/AvatarRenderer.js
rename to client/src/components/helpers/avatar-renderer.tsx
index 21246ee786..ad40555154 100644
--- a/client/src/components/helpers/AvatarRenderer.js
+++ b/client/src/components/helpers/avatar-renderer.tsx
@@ -1,22 +1,26 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Image } from '@freecodecamp/react-bootstrap';
 import DefaultAvatar from '../../assets/icons/DefaultAvatar';
 import { defaultUserImage } from '../../../../config/misc';
-import { borderColorPicker } from '../helpers';
+import { borderColorPicker } from '.';
 import { useTranslation } from 'react-i18next';
 
-const propTypes = {
-  isDonating: PropTypes.bool,
-  isTopContributor: PropTypes.bool,
-  picture: PropTypes.any.isRequired,
-  userName: PropTypes.string.isRequired
-};
+interface AvatarRendererProps {
+  isDonating?: boolean;
+  isTopContributor?: boolean;
+  picture: string;
+  userName: string;
+}
 
-function AvatarRenderer({ picture, userName, isDonating, isTopContributor }) {
+function AvatarRenderer({
+  picture,
+  userName,
+  isDonating,
+  isTopContributor
+}: AvatarRendererProps): JSX.Element {
   const { t } = useTranslation();
-  let borderColor = borderColorPicker(isDonating, isTopContributor);
-  let isPlaceHolderImage =
+  const borderColor: string = borderColorPicker(isDonating, isTopContributor);
+  const isPlaceHolderImage =
     /example.com|identicon.org/.test(picture) || picture === defaultUserImage;
 
   return (
@@ -35,6 +39,5 @@ function AvatarRenderer({ picture, userName, isDonating, isTopContributor }) {
   );
 }
 
-AvatarRenderer.propTypes = propTypes;
 AvatarRenderer.displayName = 'AvatarRenderer';
 export default AvatarRenderer;
diff --git a/client/src/components/helpers/borderColorPicker.js b/client/src/components/helpers/border-color-picker.ts
similarity index 64%
rename from client/src/components/helpers/borderColorPicker.js
rename to client/src/components/helpers/border-color-picker.ts
index 4a36376509..a225a36136 100644
--- a/client/src/components/helpers/borderColorPicker.js
+++ b/client/src/components/helpers/border-color-picker.ts
@@ -1,4 +1,7 @@
-export default function borderColorPicker(isDonating, isTopContributor) {
+export default function borderColorPicker(
+  isDonating?: boolean,
+  isTopContributor?: boolean
+): string {
   if (isDonating && isTopContributor) return 'purple-border';
   else if (isTopContributor) return 'blue-border';
   else if (isDonating) return 'gold-border';
diff --git a/client/src/components/helpers/ButtonSpacer.js b/client/src/components/helpers/button-spacer.tsx
similarity index 81%
rename from client/src/components/helpers/ButtonSpacer.js
rename to client/src/components/helpers/button-spacer.tsx
index 8ac663d857..9813d0b823 100644
--- a/client/src/components/helpers/ButtonSpacer.js
+++ b/client/src/components/helpers/button-spacer.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-function ButtonSpacer() {
+function ButtonSpacer(): JSX.Element {
   return <div className='button-spacer' style={{ padding: '5px 0' }} />;
 }
 
diff --git a/client/src/components/helpers/CurrentChallengeLink.js b/client/src/components/helpers/current-challenge-link.tsx
similarity index 67%
rename from client/src/components/helpers/CurrentChallengeLink.js
rename to client/src/components/helpers/current-challenge-link.tsx
index 279ab66056..176bfcceda 100644
--- a/client/src/components/helpers/CurrentChallengeLink.js
+++ b/client/src/components/helpers/current-challenge-link.tsx
@@ -1,18 +1,22 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import envData from '../../../../config/env.json';
 
-const { apiLocation } = envData;
+interface EnvData {
+  apiLocation: string;
+}
+
+const { apiLocation } = envData as EnvData;
 
 const currentChallengeApi = '/challenges/current-challenge';
 
-const propTypes = {
-  children: PropTypes.any,
-  isLargeBtn: PropTypes.bool
-};
-
-function CurrentChallengeLink({ children, isLargeBtn }) {
+function CurrentChallengeLink({
+  children,
+  isLargeBtn
+}: {
+  children?: JSX.ElementChildrenAttribute;
+  isLargeBtn?: boolean;
+}): JSX.Element {
   let classNames;
   if (isLargeBtn) {
     classNames = 'btn btn-lg btn-primary btn-block';
@@ -27,6 +31,5 @@ function CurrentChallengeLink({ children, isLargeBtn }) {
 }
 
 CurrentChallengeLink.displayName = 'CurrentChallengeLink';
-CurrentChallengeLink.propTypes = propTypes;
 
 export default CurrentChallengeLink;
diff --git a/client/src/components/helpers/FullWidthRow.js b/client/src/components/helpers/full-width-row.tsx
similarity index 63%
rename from client/src/components/helpers/FullWidthRow.js
rename to client/src/components/helpers/full-width-row.tsx
index b55d3fdbf0..f7201a4b39 100644
--- a/client/src/components/helpers/FullWidthRow.js
+++ b/client/src/components/helpers/full-width-row.tsx
@@ -1,8 +1,13 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Row, Col } from '@freecodecamp/react-bootstrap';
 
-function FullWidthRow({ children, className }) {
+function FullWidthRow({
+  children,
+  className
+}: {
+  children?: JSX.ElementChildrenAttribute;
+  className?: string;
+}): JSX.Element {
   return (
     <Row className={className}>
       <Col sm={8} smOffset={2} xs={12}>
@@ -13,9 +18,5 @@ function FullWidthRow({ children, className }) {
 }
 
 FullWidthRow.displayName = 'FullWidthRow';
-FullWidthRow.propTypes = {
-  children: PropTypes.any,
-  className: PropTypes.string
-};
 
 export default FullWidthRow;
diff --git a/client/src/components/helpers/ImageLoader.js b/client/src/components/helpers/image-loader.tsx
similarity index 69%
rename from client/src/components/helpers/ImageLoader.js
rename to client/src/components/helpers/image-loader.tsx
index fcc8fe1ddd..53ec38b38f 100644
--- a/client/src/components/helpers/ImageLoader.js
+++ b/client/src/components/helpers/image-loader.tsx
@@ -1,20 +1,21 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 import React, { useState } from 'react';
 
 import './image-loader.css';
+// @ts-ignore
 import LazyLoad from 'react-lazy-load';
-import PropTypes from 'prop-types';
 
-const propTypes = {
-  alt: PropTypes.string,
-  className: PropTypes.string,
-  height: PropTypes.number,
-  loadedClassName: PropTypes.string,
-  loadingClassName: PropTypes.string,
-  offsetVertical: PropTypes.number,
-  src: PropTypes.string,
-  style: PropTypes.object,
-  width: PropTypes.number
-};
+interface ImageLoaderProps {
+  alt?: string;
+  className?: string;
+  height?: number;
+  loadedClassName?: string;
+  loadingClassName?: string;
+  offsetVertical?: number;
+  src?: string;
+  style?: React.CSSProperties;
+  width?: number;
+}
 
 const ImageLoader = ({
   className = '',
@@ -26,7 +27,7 @@ const ImageLoader = ({
   style,
   width,
   height
-}) => {
+}: ImageLoaderProps): JSX.Element => {
   const [loaded, setLoaded] = useState(false);
   const fullClassName = `${className} ${
     loaded ? loadedClassName : loadingClassName
@@ -49,5 +50,5 @@ const ImageLoader = ({
     </LazyLoad>
   );
 };
-ImageLoader.propTypes = propTypes;
+
 export default ImageLoader;
diff --git a/client/src/components/helpers/index.js b/client/src/components/helpers/index.js
index f59bba1524..a501903a0b 100644
--- a/client/src/components/helpers/index.js
+++ b/client/src/components/helpers/index.js
@@ -1,11 +1,11 @@
-export { default as ButtonSpacer } from './ButtonSpacer';
-export { default as FullWidthRow } from './FullWidthRow';
-export { default as SlimWidthRow } from './SlimWidthRow';
-export { default as Loader } from './Loader';
-export { default as SkeletonSprite } from './SkeletonSprite';
-export { default as Spacer } from './Spacer';
-export { default as Link } from './Link';
-export { default as CurrentChallengeLink } from './CurrentChallengeLink';
-export { default as ImageLoader } from './ImageLoader';
-export { default as AvatarRenderer } from './AvatarRenderer';
-export { default as borderColorPicker } from './borderColorPicker';
+export { default as ButtonSpacer } from './button-spacer';
+export { default as FullWidthRow } from './full-width-row';
+export { default as SlimWidthRow } from './slim-width-row';
+export { default as Loader } from './loader';
+export { default as SkeletonSprite } from './skeleton-sprite';
+export { default as Spacer } from './spacer';
+export { default as Link } from './link';
+export { default as CurrentChallengeLink } from './current-challenge-link';
+export { default as ImageLoader } from './image-loader';
+export { default as AvatarRenderer } from './avatar-renderer';
+export { default as borderColorPicker } from './border-color-picker';
diff --git a/client/src/components/helpers/Link.test.js b/client/src/components/helpers/link.test.tsx
similarity index 64%
rename from client/src/components/helpers/Link.test.js
rename to client/src/components/helpers/link.test.tsx
index 13a2f2cc44..92dc93bde3 100644
--- a/client/src/components/helpers/Link.test.js
+++ b/client/src/components/helpers/link.test.tsx
@@ -1,13 +1,15 @@
 import React from 'react';
-import renderer from 'react-test-renderer';
+import renderer, { ReactTestRendererJSON } from 'react-test-renderer';
 
-import Link from './Link';
+import Link from './link';
 
 describe('<Link />', () => {
   const externalLink = renderer
     .create(<Link external={true} to='/home' />)
-    .toJSON();
-  const gatsbyLink = renderer.create(<Link to='/home' />).toJSON();
+    .toJSON() as ReactTestRendererJSON;
+  const gatsbyLink = renderer
+    .create(<Link to='/home' />)
+    .toJSON() as ReactTestRendererJSON;
 
   it('renders to the DOM', () => {
     expect(gatsbyLink).toBeTruthy();
diff --git a/client/src/components/helpers/Link.js b/client/src/components/helpers/link.tsx
similarity index 63%
rename from client/src/components/helpers/Link.js
rename to client/src/components/helpers/link.tsx
index f5f9988ae9..91739a7acb 100644
--- a/client/src/components/helpers/Link.js
+++ b/client/src/components/helpers/link.tsx
@@ -1,15 +1,20 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Link as GatsbyLink } from 'gatsby';
 
-const propTypes = {
-  children: PropTypes.any,
-  external: PropTypes.bool,
-  sameTab: PropTypes.bool,
-  to: PropTypes.string.isRequired
-};
+interface LinkProps {
+  children?: JSX.ElementChildrenAttribute;
+  external?: boolean;
+  sameTab?: boolean;
+  to: string;
+}
 
-const Link = ({ children, to, external, sameTab, ...other }) => {
+const Link = ({
+  children,
+  to,
+  external,
+  sameTab,
+  ...other
+}: LinkProps): JSX.Element => {
   if (!external && /^\/(?!\/)/.test(to)) {
     return (
       <GatsbyLink to={to} {...other}>
@@ -30,6 +35,5 @@ const Link = ({ children, to, external, sameTab, ...other }) => {
     </a>
   );
 };
-Link.propTypes = propTypes;
 
 export default Link;
diff --git a/client/src/components/helpers/Loader.test.js b/client/src/components/helpers/loader.test.tsx
similarity index 96%
rename from client/src/components/helpers/Loader.test.js
rename to client/src/components/helpers/loader.test.tsx
index 21bf667513..f57a42b4db 100644
--- a/client/src/components/helpers/Loader.test.js
+++ b/client/src/components/helpers/loader.test.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, cleanup } from '@testing-library/react';
 
-import Loader from './Loader';
+import Loader from './loader';
 
 describe('<Loader />', () => {
   afterEach(cleanup);
diff --git a/client/src/components/helpers/Loader.js b/client/src/components/helpers/loader.tsx
similarity index 76%
rename from client/src/components/helpers/Loader.js
rename to client/src/components/helpers/loader.tsx
index 8bd5a55f3a..e39561e7d9 100644
--- a/client/src/components/helpers/Loader.js
+++ b/client/src/components/helpers/loader.tsx
@@ -1,13 +1,16 @@
 import React, { useState, useEffect } from 'react';
-import PropTypes from 'prop-types';
 import Spinner from 'react-spinkit';
 
 import './loader.css';
 
-function Loader({ fullScreen, timeout }) {
+interface LoaderProps {
+  fullScreen?: boolean;
+  timeout?: number;
+}
+function Loader({ fullScreen, timeout }: LoaderProps): JSX.Element {
   const [showSpinner, setShowSpinner] = useState(!timeout);
   useEffect(() => {
-    let timerId;
+    let timerId: ReturnType<typeof setTimeout>;
     if (!showSpinner) {
       timerId = setTimeout(() => setShowSpinner(true), timeout);
     }
@@ -21,9 +24,5 @@ function Loader({ fullScreen, timeout }) {
 }
 
 Loader.displayName = 'Loader';
-Loader.propTypes = {
-  fullScreen: PropTypes.bool,
-  timeout: PropTypes.number
-};
 
 export default Loader;
diff --git a/client/src/components/helpers/SkeletonSprite.js b/client/src/components/helpers/skeleton-sprite.tsx
similarity index 73%
rename from client/src/components/helpers/SkeletonSprite.js
rename to client/src/components/helpers/skeleton-sprite.tsx
index 7415e8d834..d7401b2d2f 100644
--- a/client/src/components/helpers/SkeletonSprite.js
+++ b/client/src/components/helpers/skeleton-sprite.tsx
@@ -1,8 +1,11 @@
 import React from 'react';
 
-import styles from './skeletonStyles';
+import styles from './skeleton-styles';
 
-function SkeletonSprite() {
+// TODO: unsure about parameter typing
+function SkeletonSprite({}: React.FC<
+  React.ComponentPropsWithoutRef<'svg'>
+>): JSX.Element {
   return (
     <div className='sprite-container'>
       <style dangerouslySetInnerHTML={{ __html: styles }} />
diff --git a/client/src/components/helpers/skeletonStyles.js b/client/src/components/helpers/skeleton-styles.ts
similarity index 100%
rename from client/src/components/helpers/skeletonStyles.js
rename to client/src/components/helpers/skeleton-styles.ts
diff --git a/client/src/components/helpers/SlimWidthRow.js b/client/src/components/helpers/slim-width-row.tsx
similarity index 63%
rename from client/src/components/helpers/SlimWidthRow.js
rename to client/src/components/helpers/slim-width-row.tsx
index 58df1f0ca0..983b6fe10c 100644
--- a/client/src/components/helpers/SlimWidthRow.js
+++ b/client/src/components/helpers/slim-width-row.tsx
@@ -1,8 +1,13 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Row, Col } from '@freecodecamp/react-bootstrap';
 
-function SlimWidthRow({ children, ...restProps }) {
+interface SlimWidthRowProps {
+  children: JSX.ElementChildrenAttribute;
+}
+function SlimWidthRow({
+  children,
+  ...restProps
+}: SlimWidthRowProps): JSX.Element {
   return (
     <Row {...restProps}>
       <Col md={6} mdOffset={3} sm={12}>
@@ -13,8 +18,5 @@ function SlimWidthRow({ children, ...restProps }) {
 }
 
 SlimWidthRow.displayName = 'SlimWidthRow';
-SlimWidthRow.propTypes = {
-  children: PropTypes.any
-};
 
 export default SlimWidthRow;
diff --git a/client/src/components/helpers/spacer.tsx b/client/src/components/helpers/spacer.tsx
new file mode 100644
index 0000000000..b67cbd8e5d
--- /dev/null
+++ b/client/src/components/helpers/spacer.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+
+interface SpacerProps {
+  size: number;
+}
+
+const styles = { padding: '15px 0', height: '1px' };
+
+const Comp = ({ ...props }): JSX.Element => (
+  <div className='spacer' style={styles} {...props} />
+);
+
+const Spacer = ({ size = 1 }: SpacerProps): JSX.Element =>
+  size === 1 ? (
+    <Comp />
+  ) : (
+    <>
+      {Array.from(Array(size), (_, i) => (
+        <Comp key={`spacer_${i}`} />
+      ))}
+    </>
+  );
+
+export default Spacer;
diff --git a/client/src/components/helpers/ToggleButton.js b/client/src/components/helpers/toggle-button.tsx
similarity index 82%
rename from client/src/components/helpers/ToggleButton.js
rename to client/src/components/helpers/toggle-button.tsx
index bb6b1fdd64..898cb28311 100644
--- a/client/src/components/helpers/ToggleButton.js
+++ b/client/src/components/helpers/toggle-button.tsx
@@ -1,5 +1,4 @@
 import React, { Fragment } from 'react';
-import PropTypes from 'prop-types';
 import {
   ToggleButtonGroup as BSBG,
   ToggleButton as TB
@@ -9,15 +8,18 @@ import './toggle-button.css';
 import ToggleCheck from '../../assets/icons/ToggleCheck';
 import Spacer from '../../assets/icons/Spacer';
 
-const propTypes = {
-  name: PropTypes.string.isRequired,
-  offLabel: PropTypes.string,
-  onChange: PropTypes.func.isRequired,
-  onLabel: PropTypes.string,
-  value: PropTypes.bool.isRequired
-};
+interface ButtonProps {
+  name: string;
+  offLabel: string;
+  onChange: (value: string) => void;
+  onLabel: string;
+  value: boolean;
+  condition: boolean;
+}
 
-function getActiveClass(condition) {
+type ActiveClass = Pick<ButtonProps, 'condition'>;
+
+function getActiveClass(condition: ActiveClass | unknown) {
   return condition ? 'active' : 'not-active';
 }
 
@@ -27,7 +29,7 @@ export default function ToggleButton({
   value,
   onLabel = 'On',
   offLabel = 'Off'
-}) {
+}: ButtonProps): JSX.Element {
   const checkIconStyle = {
     height: '15px',
     width: '20px'
@@ -71,4 +73,3 @@ export default function ToggleButton({
 }
 
 ToggleButton.displayName = 'ToggleButton';
-ToggleButton.propTypes = propTypes;
diff --git a/client/src/components/profile/Profile.js b/client/src/components/profile/Profile.js
index 25845b5046..76f22cdda1 100644
--- a/client/src/components/profile/Profile.js
+++ b/client/src/components/profile/Profile.js
@@ -2,7 +2,7 @@ import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { Grid, Row } from '@freecodecamp/react-bootstrap';
 import Helmet from 'react-helmet';
-import Link from '../helpers/Link';
+import Link from '../helpers/link';
 import { useTranslation } from 'react-i18next';
 
 import { CurrentChallengeLink, FullWidthRow, Spacer } from '../helpers';
diff --git a/client/src/components/profile/components/Camper.js b/client/src/components/profile/components/Camper.js
index dbcb9c55bc..cb267540d0 100644
--- a/client/src/components/profile/components/Camper.js
+++ b/client/src/components/profile/components/Camper.js
@@ -11,7 +11,7 @@ import { useTranslation } from 'react-i18next';
 
 import { AvatarRenderer } from '../../helpers';
 import SocialIcons from './SocialIcons';
-import Link from '../../helpers/Link';
+import Link from '../../helpers/link';
 
 import './camper.css';
 
diff --git a/client/src/components/profile/components/HeatMap.js b/client/src/components/profile/components/HeatMap.js
index 0076443323..689bc1633c 100644
--- a/client/src/components/profile/components/HeatMap.js
+++ b/client/src/components/profile/components/HeatMap.js
@@ -9,8 +9,8 @@ import startOfDay from 'date-fns/startOfDay';
 import isEqual from 'date-fns/isEqual';
 import { useTranslation } from 'react-i18next';
 
-import FullWidthRow from '../../helpers/FullWidthRow';
-import Spacer from '../../helpers/Spacer';
+import FullWidthRow from '../../helpers/full-width-row';
+import Spacer from '../../helpers/spacer';
 
 import '@freecodecamp/react-calendar-heatmap/dist/styles.css';
 import './heatmap.css';
diff --git a/client/src/components/settings/Email.js b/client/src/components/settings/Email.js
index 9a26f360f2..137e153d11 100644
--- a/client/src/components/settings/Email.js
+++ b/client/src/components/settings/Email.js
@@ -17,8 +17,8 @@ import { Trans, withTranslation } from 'react-i18next';
 import { updateMyEmail } from '../../redux/settings';
 import { maybeEmailRE } from '../../utils';
 
-import FullWidthRow from '../helpers/FullWidthRow';
-import Spacer from '../helpers/Spacer';
+import FullWidthRow from '../helpers/full-width-row';
+import Spacer from '../helpers/spacer';
 import SectionHeader from './SectionHeader';
 import BlockSaveButton from '../helpers/form/BlockSaveButton';
 import ToggleSetting from './ToggleSetting';
diff --git a/client/src/components/settings/Privacy.js b/client/src/components/settings/Privacy.js
index 0e34243975..bcb1386b51 100644
--- a/client/src/components/settings/Privacy.js
+++ b/client/src/components/settings/Privacy.js
@@ -9,8 +9,8 @@ import { withTranslation } from 'react-i18next';
 import { userSelector } from '../../redux';
 import { submitProfileUI } from '../../redux/settings';
 
-import FullWidthRow from '../helpers/FullWidthRow';
-import Spacer from '../helpers/Spacer';
+import FullWidthRow from '../helpers/full-width-row';
+import Spacer from '../helpers/spacer';
 import ToggleSetting from './ToggleSetting';
 import SectionHeader from './SectionHeader';
 
diff --git a/client/src/components/settings/SectionHeader.js b/client/src/components/settings/SectionHeader.js
index e34f728bd0..ee38bba238 100644
--- a/client/src/components/settings/SectionHeader.js
+++ b/client/src/components/settings/SectionHeader.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import FullWidthRow from '../helpers/FullWidthRow';
+import FullWidthRow from '../helpers/full-width-row';
 
 const propTypes = {
   children: PropTypes.oneOfType([
diff --git a/client/src/components/settings/ToggleSetting.js b/client/src/components/settings/ToggleSetting.js
index 5853a74042..00ce9ccef5 100644
--- a/client/src/components/settings/ToggleSetting.js
+++ b/client/src/components/settings/ToggleSetting.js
@@ -6,7 +6,7 @@ import {
   HelpBlock
 } from '@freecodecamp/react-bootstrap';
 
-import TB from '../helpers/ToggleButton';
+import TB from '../helpers/toggle-button';
 import { ButtonSpacer } from '../helpers';
 
 import './toggle-setting.css';
diff --git a/client/src/components/settings/Username.js b/client/src/components/settings/Username.js
index 0c7e95838e..9a6f53ed4a 100644
--- a/client/src/components/settings/Username.js
+++ b/client/src/components/settings/Username.js
@@ -17,7 +17,7 @@ import {
   submitNewUsername
 } from '../../redux/settings';
 import BlockSaveButton from '../helpers/form/BlockSaveButton';
-import FullWidthRow from '../helpers/FullWidthRow';
+import FullWidthRow from '../helpers/full-width-row';
 import { isValidUsername } from '../../../../utils/validate';
 
 const propTypes = {
diff --git a/client/src/templates/Challenges/projects/backend/Show.js b/client/src/templates/Challenges/projects/backend/Show.js
index 0c68c761ea..75d6b0a5bf 100644
--- a/client/src/templates/Challenges/projects/backend/Show.js
+++ b/client/src/templates/Challenges/projects/backend/Show.js
@@ -29,7 +29,7 @@ import CompletionModal from '../../components/CompletionModal';
 import HelpModal from '../../components/HelpModal';
 import ProjectToolPanel from '../Tool-Panel';
 import SolutionForm from '../SolutionForm';
-import Spacer from '../../../../components/helpers/Spacer';
+import Spacer from '../../../../components/helpers/spacer';
 import { ChallengeNode } from '../../../../redux/prop-types';
 import { isSignedInSelector } from '../../../../redux';
 import Hotkeys from '../../components/Hotkeys';
diff --git a/client/src/templates/Challenges/projects/frontend/Show.js b/client/src/templates/Challenges/projects/frontend/Show.js
index b5beb1573c..9c71875f19 100644
--- a/client/src/templates/Challenges/projects/frontend/Show.js
+++ b/client/src/templates/Challenges/projects/frontend/Show.js
@@ -22,7 +22,7 @@ import { getGuideUrl } from '../../utils';
 import LearnLayout from '../../../../components/layouts/Learn';
 import ChallengeTitle from '../../components/Challenge-Title';
 import ChallengeDescription from '../../components/Challenge-Description';
-import Spacer from '../../../../components/helpers/Spacer';
+import Spacer from '../../../../components/helpers/spacer';
 import SolutionForm from '../SolutionForm';
 import ProjectToolPanel from '../Tool-Panel';
 import CompletionModal from '../../components/CompletionModal';
diff --git a/client/src/templates/Challenges/video/Show.js b/client/src/templates/Challenges/video/Show.js
index 63d0dece7d..fb33277581 100644
--- a/client/src/templates/Challenges/video/Show.js
+++ b/client/src/templates/Challenges/video/Show.js
@@ -17,10 +17,10 @@ import { ChallengeNode } from '../../../redux/prop-types';
 import LearnLayout from '../../../components/layouts/Learn';
 import ChallengeTitle from '../components/Challenge-Title';
 import ChallengeDescription from '../components/Challenge-Description';
-import Spacer from '../../../components/helpers/Spacer';
+import Spacer from '../../../components/helpers/spacer';
 import CompletionModal from '../components/CompletionModal';
 import Hotkeys from '../components/Hotkeys';
-import Loader from '../../../components/helpers/Loader';
+import Loader from '../../../components/helpers/loader';
 import {
   isChallengeCompletedSelector,
   challengeMounted,
diff --git a/client/src/templates/Introduction/Intro.js b/client/src/templates/Introduction/Intro.js
index 76b91ce963..3c750bfecc 100644
--- a/client/src/templates/Introduction/Intro.js
+++ b/client/src/templates/Introduction/Intro.js
@@ -6,8 +6,8 @@ import { Grid, ListGroup, ListGroupItem } from '@freecodecamp/react-bootstrap';
 import { useTranslation } from 'react-i18next';
 
 import LearnLayout from '../../components/layouts/Learn';
-import FullWidthRow from '../../components/helpers/FullWidthRow';
-import ButtonSpacer from '../../components/helpers/ButtonSpacer';
+import FullWidthRow from '../../components/helpers/full-width-row';
+import ButtonSpacer from '../../components/helpers/button-spacer';
 import { MarkdownRemark, AllChallengeNode } from '../../redux/prop-types';
 
 import './intro.css';
diff --git a/client/tsconfig.json b/client/tsconfig.json
index d6d0f9671d..489302dd27 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -1,5 +1,10 @@
 {
-  "include": ["./i18n/**/*", "./plugins/**/*","./src/**/*","./utils/**/*"],
+  "include": [
+    "./i18n/**/*",
+    "./plugins/**/*",
+    "./src/**/*",
+    "./utils/**/*"
+  ],
   "compilerOptions": {
     "target": "es2020",
     "module": "es2020",
@@ -13,6 +18,10 @@
     "noEmit": true,
     "resolveJsonModule": true,
     "skipLibCheck": true,
-    "types": ["node", "jest", "@testing-library/jest-dom"]
+    "types": [
+      "node",
+      "jest",
+      "@testing-library/jest-dom"
+    ]
   }
-}
+}
\ No newline at end of file