diff --git a/web/src/components/cards/index.tsx b/web/src/components/cards/index.tsx
index 37b7068..130ee5c 100644
--- a/web/src/components/cards/index.tsx
+++ b/web/src/components/cards/index.tsx
@@ -1,28 +1,28 @@
 import React from 'react';
 import styled from 'styled-components';
 import {useTranslation} from 'react-i18next';
-
 import {mobile} from '../../util/css';
-import DomainCard from './Domains';
-import GithubCard from './GitHubRepository';
-import GitLabCard from './GitLab';
-import NpmCard from './Npm';
-import PypiCard from './PyPI';
-import RubyGemsCard from './RubyGems';
-import CratesioCard from './Cratesio';
-import HomebrewCard from './Homebrew';
-import LinuxCard from './Linux';
-import TwitterCard from './Twitter';
-import SpectrumCard from './Spectrum';
-import SlackCard from './Slack';
-import S3Card from './S3';
-import JsOrgCard from './JsOrg';
-import GithubSearchCard from './GitHubSearch';
-import AppStoreCard from './AppStore';
-import HerokuCard from './Heroku';
-import NowCard from './Now';
-import NtaCard from './Nta';
-import NetlifyCard from './Netlify';
+
+import DomainCard from './providers/Domains';
+import GithubCard from './providers/GitHubRepository';
+import GitLabCard from './providers/GitLab';
+import NpmCard from './providers/Npm';
+import PypiCard from './providers/PyPI';
+import RubyGemsCard from './providers/RubyGems';
+import CratesioCard from './providers/Cratesio';
+import HomebrewCard from './providers/Homebrew';
+import LinuxCard from './providers/Linux';
+import TwitterCard from './providers/Twitter';
+import SpectrumCard from './providers/Spectrum';
+import SlackCard from './providers/Slack';
+import S3Card from './providers/S3';
+import JsOrgCard from './providers/JsOrg';
+import GithubSearchCard from './providers/GitHubSearch';
+import AppStoreCard from './providers/AppStore';
+import HerokuCard from './providers/Heroku';
+import NowCard from './providers/Now';
+import NtaCard from './providers/Nta';
+import NetlifyCard from './providers/Netlify';
 
 const Index: React.FC<{query: string}> = ({query}) => {
   const {
diff --git a/web/src/components/cards/AppStore.tsx b/web/src/components/cards/providers/AppStore.tsx
similarity index 96%
rename from web/src/components/cards/AppStore.tsx
rename to web/src/components/cards/providers/AppStore.tsx
index 4e4322a..7f7bdd3 100644
--- a/web/src/components/cards/AppStore.tsx
+++ b/web/src/components/cards/providers/AppStore.tsx
@@ -3,7 +3,7 @@ import useFetch from 'fetch-suspense';
 import {useTranslation} from 'react-i18next';
 import {FaAppStore, FaInfoCircle} from 'react-icons/fa';
 
-import {Card, Result} from './core';
+import {Card, Result} from '../core';
 
 const Search: React.FC<{query: string}> = ({query}) => {
   const {t} = useTranslation();
diff --git a/web/src/components/cards/Cratesio.tsx b/web/src/components/cards/providers/Cratesio.tsx
similarity index 91%
rename from web/src/components/cards/Cratesio.tsx
rename to web/src/components/cards/providers/Cratesio.tsx
index 16ea610..26153f5 100644
--- a/web/src/components/cards/Cratesio.tsx
+++ b/web/src/components/cards/providers/Cratesio.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import {useTranslation} from 'react-i18next';
 import {DiRust} from 'react-icons/di';
 
-import {Card, Repeater, DedicatedAvailability} from './core';
+import {Card, Repeater, DedicatedAvailability} from '../core';
 
 const CratesioCard: React.FC<{query: string}> = ({query}) => {
   const {t} = useTranslation();
diff --git a/web/src/components/cards/Domains.tsx b/web/src/components/cards/providers/Domains.tsx
similarity index 93%
rename from web/src/components/cards/Domains.tsx
rename to web/src/components/cards/providers/Domains.tsx
index e27915d..fe0a98c 100644
--- a/web/src/components/cards/Domains.tsx
+++ b/web/src/components/cards/providers/Domains.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import {useTranslation} from 'react-i18next';
 import {FaMapSigns} from 'react-icons/fa';
 
-import {Card, Repeater, DedicatedAvailability} from './core';
+import {Card, Repeater, DedicatedAvailability} from '../core';
 
 const DomainCard: React.FC<{query: string}> = ({query}) => {
   const {t} = useTranslation();
diff --git a/web/src/components/cards/GitHubRepository.tsx b/web/src/components/cards/providers/GitHubRepository.tsx
similarity index 94%
rename from web/src/components/cards/GitHubRepository.tsx
rename to web/src/components/cards/providers/GitHubRepository.tsx
index 03b8c18..e713147 100644
--- a/web/src/components/cards/GitHubRepository.tsx
+++ b/web/src/components/cards/providers/GitHubRepository.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import {useTranslation} from 'react-i18next';
 import {FaGithub} from 'react-icons/fa';
 
-import {Card, Repeater, DedicatedAvailability} from './core';
+import {Card, Repeater, DedicatedAvailability} from '../core';
 
 const GithubCard: React.FC<{query: string}> = ({query}) => {
   const {t} = useTranslation();
diff --git a/web/src/components/cards/GitHubSearch.tsx b/web/src/components/cards/providers/GitHubSearch.tsx
similarity index 97%
rename from web/src/components/cards/GitHubSearch.tsx
rename to web/src/components/cards/providers/GitHubSearch.tsx
index 861d8c7..d8b92ab 100644
--- a/web/src/components/cards/GitHubSearch.tsx
+++ b/web/src/components/cards/providers/GitHubSearch.tsx
@@ -3,7 +3,7 @@ import useFetch from 'fetch-suspense';
 import {useTranslation} from 'react-i18next';
 import {FaGithub, FaInfoCircle} from 'react-icons/fa';
 
-import {Card, Result} from './core';
+import {Card, Result} from '../core';
 
 const Search: React.FC<{query: string}> = ({query}) => {
   const {t} = useTranslation();
diff --git a/web/src/components/cards/GitLab.tsx b/web/src/components/cards/providers/GitLab.tsx
similarity index 91%
rename from web/src/components/cards/GitLab.tsx
rename to web/src/components/cards/providers/GitLab.tsx
index e685a9c..af876de 100644
--- a/web/src/components/cards/GitLab.tsx
+++ b/web/src/components/cards/providers/GitLab.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import {useTranslation} from 'react-i18next';
 import {FaGitlab} from 'react-icons/fa';
 
-import {Card, Repeater, DedicatedAvailability} from './core';
+import {Card, Repeater, DedicatedAvailability} from '../core';
 
 const GitLabCard: React.FC<{query: string}> = ({query}) => {
   const {t} = useTranslation();
diff --git a/web/src/components/cards/Heroku.tsx b/web/src/components/cards/providers/Heroku.tsx
similarity index 91%
rename from web/src/components/cards/Heroku.tsx
rename to web/src/components/cards/providers/Heroku.tsx
index 789b904..3c31aef 100644
--- a/web/src/components/cards/Heroku.tsx
+++ b/web/src/components/cards/providers/Heroku.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import {useTranslation} from 'react-i18next';
 import {DiHeroku} from 'react-icons/di';
 
-import {Card, Repeater, DedicatedAvailability} from './core';
+import {Card, Repeater, DedicatedAvailability} from '../core';
 
 const HerokuCard: React.FC<{query: string}> = ({query}) => {
   const {t} = useTranslation();
diff --git a/web/src/components/cards/Homebrew.tsx b/web/src/components/cards/providers/Homebrew.tsx
similarity index 95%
rename from web/src/components/cards/Homebrew.tsx
rename to web/src/components/cards/providers/Homebrew.tsx
index 6996725..334595a 100644
--- a/web/src/components/cards/Homebrew.tsx
+++ b/web/src/components/cards/providers/Homebrew.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import {useTranslation} from 'react-i18next';
 import {IoIosBeer} from 'react-icons/io';
 
-import {Card, Repeater, ExistentialAvailability} from './core';
+import {Card, Repeater, ExistentialAvailability} from '../core';
 
 const HomebrewCard: React.FC<{query: string}> = ({query}) => {
   const {t} = useTranslation();
diff --git a/web/src/components/cards/JsOrg.tsx b/web/src/components/cards/providers/JsOrg.tsx
similarity index 92%
rename from web/src/components/cards/JsOrg.tsx
rename to web/src/components/cards/providers/JsOrg.tsx
index e341c9d..bd765fe 100644
--- a/web/src/components/cards/JsOrg.tsx
+++ b/web/src/components/cards/providers/JsOrg.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import {useTranslation} from 'react-i18next';
 import {FaJsSquare} from 'react-icons/fa';
 
-import {Card, Repeater, DedicatedAvailability} from './core';
+import {Card, Repeater, DedicatedAvailability} from '../core';
 
 const JsOrgCard: React.FC<{query: string}> = ({query}) => {
   const {t} = useTranslation();
diff --git a/web/src/components/cards/Linux.tsx b/web/src/components/cards/providers/Linux.tsx
similarity index 93%
rename from web/src/components/cards/Linux.tsx
rename to web/src/components/cards/providers/Linux.tsx
index 81c65c9..8170ab2 100644
--- a/web/src/components/cards/Linux.tsx
+++ b/web/src/components/cards/providers/Linux.tsx
@@ -3,7 +3,7 @@ import {useTranslation} from 'react-i18next';
 import {DiUbuntu} from 'react-icons/di';
 import {DiDebian} from 'react-icons/di';
 
-import {Card, Repeater, DedicatedAvailability} from './core';
+import {Card, Repeater, DedicatedAvailability} from '../core';
 
 const LinuxCard: React.FC<{query: string}> = ({query}) => {
   const {t} = useTranslation();
diff --git a/web/src/components/cards/Netlify.tsx b/web/src/components/cards/providers/Netlify.tsx
similarity index 86%
rename from web/src/components/cards/Netlify.tsx
rename to web/src/components/cards/providers/Netlify.tsx
index 870538c..070be50 100644
--- a/web/src/components/cards/Netlify.tsx
+++ b/web/src/components/cards/providers/Netlify.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import {useTranslation} from 'react-i18next';
-import {NetlifyIcon} from '../Icons';
+import {NetlifyIcon} from '../../Icons';
 
-import {Card, Repeater, DedicatedAvailability} from './core';
+import {Card, Repeater, DedicatedAvailability} from '../core';
 
 const NetlifyCard: React.FC<{query: string}> = ({query}) => {
   const {t} = useTranslation();
diff --git a/web/src/components/cards/Now.tsx b/web/src/components/cards/providers/Now.tsx
similarity index 86%
rename from web/src/components/cards/Now.tsx
rename to web/src/components/cards/providers/Now.tsx
index 08e06cc..7a79de7 100644
--- a/web/src/components/cards/Now.tsx
+++ b/web/src/components/cards/providers/Now.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import {useTranslation} from 'react-i18next';
-import {NowIcon} from '../Icons';
+import {NowIcon} from '../../Icons';
 
-import {Card, Repeater, DedicatedAvailability} from './core';
+import {Card, Repeater, DedicatedAvailability} from '../core';
 
 const NowCard: React.FC<{query: string}> = ({query}) => {
   const {t} = useTranslation();
diff --git a/web/src/components/cards/Npm.tsx b/web/src/components/cards/providers/Npm.tsx
similarity index 95%
rename from web/src/components/cards/Npm.tsx
rename to web/src/components/cards/providers/Npm.tsx
index 781db1f..2b33ad8 100644
--- a/web/src/components/cards/Npm.tsx
+++ b/web/src/components/cards/providers/Npm.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import {useTranslation} from 'react-i18next';
 import {FaNpm} from 'react-icons/fa';
 
-import {Card, Repeater, DedicatedAvailability} from './core';
+import {Card, Repeater, DedicatedAvailability} from '../core';
 
 const NpmCard: React.FC<{query: string}> = ({query}) => {
   const {t} = useTranslation();
diff --git a/web/src/components/cards/Nta.tsx b/web/src/components/cards/providers/Nta.tsx
similarity index 96%
rename from web/src/components/cards/Nta.tsx
rename to web/src/components/cards/providers/Nta.tsx
index 7674572..5736ddc 100644
--- a/web/src/components/cards/Nta.tsx
+++ b/web/src/components/cards/providers/Nta.tsx
@@ -3,7 +3,7 @@ import useFetch from 'fetch-suspense';
 import {useTranslation} from 'react-i18next';
 import {FaBuilding, FaInfoCircle} from 'react-icons/fa';
 
-import {Card, Result} from './core';
+import {Card, Result} from '../core';
 
 const Search: React.FC<{query: string}> = ({query}) => {
   const {t} = useTranslation();
diff --git a/web/src/components/cards/PyPI.tsx b/web/src/components/cards/providers/PyPI.tsx
similarity index 56%
rename from web/src/components/cards/PyPI.tsx
rename to web/src/components/cards/providers/PyPI.tsx
index 575f631..45af6e9 100644
--- a/web/src/components/cards/PyPI.tsx
+++ b/web/src/components/cards/providers/PyPI.tsx
@@ -1,15 +1,15 @@
-import React from 'react'
-import { useTranslation } from 'react-i18next'
-import { FaPython } from 'react-icons/fa'
+import React from 'react';
+import {useTranslation} from 'react-i18next';
+import {FaPython} from 'react-icons/fa';
 
-import { capitalize } from '../../util/text'
-import { Card, DedicatedAvailability, Repeater } from './core'
+import {capitalize} from '../../../util/text';
+import {Card, DedicatedAvailability, Repeater} from '../core';
 
-const PypiCard: React.FC<{ query: string }> = ({ query }) => {
-  const { t } = useTranslation()
+const PypiCard: React.FC<{query: string}> = ({query}) => {
+  const {t} = useTranslation();
 
-  const names = [query]
-  const moreNames = [`Py${capitalize(query)}`]
+  const names = [query];
+  const moreNames = [`Py${capitalize(query)}`];
 
   return (
     <Card title={t('providers.pypi')}>
@@ -28,7 +28,7 @@ const PypiCard: React.FC<{ query: string }> = ({ query }) => {
         )}
       </Repeater>
     </Card>
-  )
-}
+  );
+};
 
-export default PypiCard
+export default PypiCard;
diff --git a/web/src/components/cards/RubyGems.tsx b/web/src/components/cards/providers/RubyGems.tsx
similarity index 93%
rename from web/src/components/cards/RubyGems.tsx
rename to web/src/components/cards/providers/RubyGems.tsx
index 6df2725..c9625cd 100644
--- a/web/src/components/cards/RubyGems.tsx
+++ b/web/src/components/cards/providers/RubyGems.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import {useTranslation} from 'react-i18next';
 import {FaGem} from 'react-icons/fa';
 
-import {Card, Repeater, DedicatedAvailability} from './core';
+import {Card, Repeater, DedicatedAvailability} from '../core';
 
 const RubyGemsCard: React.FC<{query: string}> = ({query}) => {
   const {t} = useTranslation();
diff --git a/web/src/components/cards/S3.tsx b/web/src/components/cards/providers/S3.tsx
similarity index 93%
rename from web/src/components/cards/S3.tsx
rename to web/src/components/cards/providers/S3.tsx
index b718d9f..cadbf31 100644
--- a/web/src/components/cards/S3.tsx
+++ b/web/src/components/cards/providers/S3.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import {useTranslation} from 'react-i18next';
 import {FaAws} from 'react-icons/fa';
 
-import {Card, DedicatedAvailability, Repeater} from './core';
+import {Card, DedicatedAvailability, Repeater} from '../core';
 
 const S3Card: React.FC<{query: string}> = ({query}) => {
   const {t} = useTranslation();
diff --git a/web/src/components/cards/Slack.tsx b/web/src/components/cards/providers/Slack.tsx
similarity index 92%
rename from web/src/components/cards/Slack.tsx
rename to web/src/components/cards/providers/Slack.tsx
index 4a50c09..37bdfb3 100644
--- a/web/src/components/cards/Slack.tsx
+++ b/web/src/components/cards/providers/Slack.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import {useTranslation} from 'react-i18next';
 import {FaSlack} from 'react-icons/fa';
 
-import {Card, DedicatedAvailability, Repeater} from './core';
+import {Card, DedicatedAvailability, Repeater} from '../core';
 
 const SlackCard: React.FC<{query: string}> = ({query}) => {
   const {t} = useTranslation();
diff --git a/web/src/components/cards/Spectrum.tsx b/web/src/components/cards/providers/Spectrum.tsx
similarity index 87%
rename from web/src/components/cards/Spectrum.tsx
rename to web/src/components/cards/providers/Spectrum.tsx
index c308bef..ab3135a 100644
--- a/web/src/components/cards/Spectrum.tsx
+++ b/web/src/components/cards/providers/Spectrum.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import {useTranslation} from 'react-i18next';
-import {Card, Repeater, DedicatedAvailability} from './core';
-import {SpectrumIcon} from '../Icons';
+import {Card, Repeater, DedicatedAvailability} from '../core';
+import {SpectrumIcon} from '../../Icons';
 
 const SpectrumCard: React.FC<{query: string}> = ({query}) => {
   const {t} = useTranslation();
diff --git a/web/src/components/cards/Twitter.tsx b/web/src/components/cards/providers/Twitter.tsx
similarity index 90%
rename from web/src/components/cards/Twitter.tsx
rename to web/src/components/cards/providers/Twitter.tsx
index b87f916..736c24d 100644
--- a/web/src/components/cards/Twitter.tsx
+++ b/web/src/components/cards/providers/Twitter.tsx
@@ -2,8 +2,8 @@ import React from 'react';
 import {useTranslation} from 'react-i18next';
 import {FaTwitter} from 'react-icons/fa';
 
-import {capitalize} from '../../util/text';
-import {Card, Repeater, DedicatedAvailability} from './core';
+import {capitalize} from '../../../util/text';
+import {Card, Repeater, DedicatedAvailability} from '../core';
 
 const TwitterCard: React.FC<{query: string}> = ({query}) => {
   const {t} = useTranslation();