diff --git a/src3/App.tsx b/src/App.tsx
similarity index 100%
rename from src3/App.tsx
rename to src/App.tsx
diff --git a/src3/components/Dropdown.tsx b/src/components/Dropdown.tsx
similarity index 100%
rename from src3/components/Dropdown.tsx
rename to src/components/Dropdown.tsx
diff --git a/src3/components/Icon.tsx b/src/components/Icon.tsx
similarity index 100%
rename from src3/components/Icon.tsx
rename to src/components/Icon.tsx
diff --git a/src3/components/SearchBar.tsx b/src/components/SearchBar.tsx
similarity index 100%
rename from src3/components/SearchBar.tsx
rename to src/components/SearchBar.tsx
diff --git a/src3/components/buttons/ButtonControl.tsx b/src/components/buttons/ButtonControl.tsx
similarity index 100%
rename from src3/components/buttons/ButtonControl.tsx
rename to src/components/buttons/ButtonControl.tsx
diff --git a/src3/components/buttons/DropdownButton.tsx b/src/components/buttons/DropdownButton.tsx
similarity index 100%
rename from src3/components/buttons/DropdownButton.tsx
rename to src/components/buttons/DropdownButton.tsx
diff --git a/src3/components/buttons/IconButton.tsx b/src/components/buttons/IconButton.tsx
similarity index 100%
rename from src3/components/buttons/IconButton.tsx
rename to src/components/buttons/IconButton.tsx
diff --git a/src3/components/buttons/IconPatch.tsx b/src/components/buttons/IconPatch.tsx
similarity index 100%
rename from src3/components/buttons/IconPatch.tsx
rename to src/components/buttons/IconPatch.tsx
diff --git a/src3/components/layout/Backdrop.tsx b/src/components/layout/Backdrop.tsx
similarity index 100%
rename from src3/components/layout/Backdrop.tsx
rename to src/components/layout/Backdrop.tsx
diff --git a/src3/components/layout/BrandPill.tsx b/src/components/layout/BrandPill.tsx
similarity index 100%
rename from src3/components/layout/BrandPill.tsx
rename to src/components/layout/BrandPill.tsx
diff --git a/src3/components/layout/ErrorBoundary.tsx b/src/components/layout/ErrorBoundary.tsx
similarity index 100%
rename from src3/components/layout/ErrorBoundary.tsx
rename to src/components/layout/ErrorBoundary.tsx
diff --git a/src3/components/layout/Loading.tsx b/src/components/layout/Loading.tsx
similarity index 100%
rename from src3/components/layout/Loading.tsx
rename to src/components/layout/Loading.tsx
diff --git a/src3/components/layout/Navigation.tsx b/src/components/layout/Navigation.tsx
similarity index 100%
rename from src3/components/layout/Navigation.tsx
rename to src/components/layout/Navigation.tsx
diff --git a/src3/components/layout/Paper.tsx b/src/components/layout/Paper.tsx
similarity index 100%
rename from src3/components/layout/Paper.tsx
rename to src/components/layout/Paper.tsx
diff --git a/src3/components/layout/Seasons.tsx b/src/components/layout/Seasons.tsx
similarity index 100%
rename from src3/components/layout/Seasons.tsx
rename to src/components/layout/Seasons.tsx
diff --git a/src3/components/layout/SectionHeading.tsx b/src/components/layout/SectionHeading.tsx
similarity index 100%
rename from src3/components/layout/SectionHeading.tsx
rename to src/components/layout/SectionHeading.tsx
diff --git a/src3/components/layout/ThinContainer.tsx b/src/components/layout/ThinContainer.tsx
similarity index 100%
rename from src3/components/layout/ThinContainer.tsx
rename to src/components/layout/ThinContainer.tsx
diff --git a/src3/components/media/EpisodeButton.tsx b/src/components/media/EpisodeButton.tsx
similarity index 100%
rename from src3/components/media/EpisodeButton.tsx
rename to src/components/media/EpisodeButton.tsx
diff --git a/src3/components/media/MediaCard.tsx b/src/components/media/MediaCard.tsx
similarity index 100%
rename from src3/components/media/MediaCard.tsx
rename to src/components/media/MediaCard.tsx
diff --git a/src3/components/media/VideoPlayer.tsx b/src/components/media/VideoPlayer.tsx
similarity index 100%
rename from src3/components/media/VideoPlayer.tsx
rename to src/components/media/VideoPlayer.tsx
diff --git a/src3/components/media/WatchedEpisodeButton.tsx b/src/components/media/WatchedEpisodeButton.tsx
similarity index 100%
rename from src3/components/media/WatchedEpisodeButton.tsx
rename to src/components/media/WatchedEpisodeButton.tsx
diff --git a/src3/components/media/WatchedMediaCard.tsx b/src/components/media/WatchedMediaCard.tsx
similarity index 100%
rename from src3/components/media/WatchedMediaCard.tsx
rename to src/components/media/WatchedMediaCard.tsx
diff --git a/src3/components/text-inputs/TextInputControl.tsx b/src/components/text-inputs/TextInputControl.tsx
similarity index 100%
rename from src3/components/text-inputs/TextInputControl.tsx
rename to src/components/text-inputs/TextInputControl.tsx
diff --git a/src3/components/text/ArrowLink.tsx b/src/components/text/ArrowLink.tsx
similarity index 100%
rename from src3/components/text/ArrowLink.tsx
rename to src/components/text/ArrowLink.tsx
diff --git a/src3/components/text/DotList.tsx b/src/components/text/DotList.tsx
similarity index 100%
rename from src3/components/text/DotList.tsx
rename to src/components/text/DotList.tsx
diff --git a/src3/components/text/Link.tsx b/src/components/text/Link.tsx
similarity index 100%
rename from src3/components/text/Link.tsx
rename to src/components/text/Link.tsx
diff --git a/src3/components/text/Tagline.tsx b/src/components/text/Tagline.tsx
similarity index 100%
rename from src3/components/text/Tagline.tsx
rename to src/components/text/Tagline.tsx
diff --git a/src3/components/text/Title.tsx b/src/components/text/Title.tsx
similarity index 100%
rename from src3/components/text/Title.tsx
rename to src/components/text/Title.tsx
diff --git a/src3/hooks/useDebounce.ts b/src/hooks/useDebounce.ts
similarity index 100%
rename from src3/hooks/useDebounce.ts
rename to src/hooks/useDebounce.ts
diff --git a/src3/hooks/useFade.css b/src/hooks/useFade.css
similarity index 100%
rename from src3/hooks/useFade.css
rename to src/hooks/useFade.css
diff --git a/src3/hooks/useFade.ts b/src/hooks/useFade.ts
similarity index 100%
rename from src3/hooks/useFade.ts
rename to src/hooks/useFade.ts
diff --git a/src3/hooks/useLoading.ts b/src/hooks/useLoading.ts
similarity index 100%
rename from src3/hooks/useLoading.ts
rename to src/hooks/useLoading.ts
diff --git a/src3/hooks/usePortableMedia.ts b/src/hooks/usePortableMedia.ts
similarity index 100%
rename from src3/hooks/usePortableMedia.ts
rename to src/hooks/usePortableMedia.ts
diff --git a/src3/hooks/useSearchQuery.ts b/src/hooks/useSearchQuery.ts
similarity index 100%
rename from src3/hooks/useSearchQuery.ts
rename to src/hooks/useSearchQuery.ts
diff --git a/src3/index.css b/src/index.css
similarity index 100%
rename from src3/index.css
rename to src/index.css
diff --git a/src3/index.tsx b/src/index.tsx
similarity index 100%
rename from src3/index.tsx
rename to src/index.tsx
diff --git a/src3/mw_constants.ts b/src/mw_constants.ts
similarity index 100%
rename from src3/mw_constants.ts
rename to src/mw_constants.ts
diff --git a/src3/providers/README.md b/src/providers/README.md
similarity index 100%
rename from src3/providers/README.md
rename to src/providers/README.md
diff --git a/src3/providers/index.ts b/src/providers/index.ts
similarity index 100%
rename from src3/providers/index.ts
rename to src/providers/index.ts
diff --git a/src3/providers/list/theflix/index.ts b/src/providers/list/theflix/index.ts
similarity index 100%
rename from src3/providers/list/theflix/index.ts
rename to src/providers/list/theflix/index.ts
diff --git a/src3/providers/list/theflix/portableToMedia.ts b/src/providers/list/theflix/portableToMedia.ts
similarity index 100%
rename from src3/providers/list/theflix/portableToMedia.ts
rename to src/providers/list/theflix/portableToMedia.ts
diff --git a/src3/providers/list/theflix/search.ts b/src/providers/list/theflix/search.ts
similarity index 100%
rename from src3/providers/list/theflix/search.ts
rename to src/providers/list/theflix/search.ts
diff --git a/src3/providers/methods/contentCache.ts b/src/providers/methods/contentCache.ts
similarity index 100%
rename from src3/providers/methods/contentCache.ts
rename to src/providers/methods/contentCache.ts
diff --git a/src3/providers/methods/helpers.ts b/src/providers/methods/helpers.ts
similarity index 100%
rename from src3/providers/methods/helpers.ts
rename to src/providers/methods/helpers.ts
diff --git a/src3/providers/methods/providers.ts b/src/providers/methods/providers.ts
similarity index 100%
rename from src3/providers/methods/providers.ts
rename to src/providers/methods/providers.ts
diff --git a/src3/providers/methods/search.ts b/src/providers/methods/search.ts
similarity index 100%
rename from src3/providers/methods/search.ts
rename to src/providers/methods/search.ts
diff --git a/src3/providers/methods/seasons.ts b/src/providers/methods/seasons.ts
similarity index 100%
rename from src3/providers/methods/seasons.ts
rename to src/providers/methods/seasons.ts
diff --git a/src3/providers/types.ts b/src/providers/types.ts
similarity index 100%
rename from src3/providers/types.ts
rename to src/providers/types.ts
diff --git a/src3/providers/wrapper.ts b/src/providers/wrapper.ts
similarity index 100%
rename from src3/providers/wrapper.ts
rename to src/providers/wrapper.ts
diff --git a/src3/react-app-env.d.ts b/src/react-app-env.d.ts
similarity index 100%
rename from src3/react-app-env.d.ts
rename to src/react-app-env.d.ts
diff --git a/src3/state/bookmark/context.tsx b/src/state/bookmark/context.tsx
similarity index 100%
rename from src3/state/bookmark/context.tsx
rename to src/state/bookmark/context.tsx
diff --git a/src3/state/bookmark/index.ts b/src/state/bookmark/index.ts
similarity index 100%
rename from src3/state/bookmark/index.ts
rename to src/state/bookmark/index.ts
diff --git a/src3/state/bookmark/store.ts b/src/state/bookmark/store.ts
similarity index 100%
rename from src3/state/bookmark/store.ts
rename to src/state/bookmark/store.ts
diff --git a/src3/state/watched/context.tsx b/src/state/watched/context.tsx
similarity index 100%
rename from src3/state/watched/context.tsx
rename to src/state/watched/context.tsx
diff --git a/src3/state/watched/index.ts b/src/state/watched/index.ts
similarity index 100%
rename from src3/state/watched/index.ts
rename to src/state/watched/index.ts
diff --git a/src3/state/watched/store.ts b/src/state/watched/store.ts
similarity index 100%
rename from src3/state/watched/store.ts
rename to src/state/watched/store.ts
diff --git a/src3/utils/cache.ts b/src/utils/cache.ts
similarity index 100%
rename from src3/utils/cache.ts
rename to src/utils/cache.ts
diff --git a/src3/utils/storage.ts b/src/utils/storage.ts
similarity index 100%
rename from src3/utils/storage.ts
rename to src/utils/storage.ts
diff --git a/src3/views/MediaView.tsx b/src/views/MediaView.tsx
similarity index 100%
rename from src3/views/MediaView.tsx
rename to src/views/MediaView.tsx
diff --git a/src3/views/SearchView.tsx b/src/views/SearchView.tsx
similarity index 100%
rename from src3/views/SearchView.tsx
rename to src/views/SearchView.tsx
diff --git a/src3/views/notfound/NotFoundChecks.tsx b/src/views/notfound/NotFoundChecks.tsx
similarity index 100%
rename from src3/views/notfound/NotFoundChecks.tsx
rename to src/views/notfound/NotFoundChecks.tsx
diff --git a/src3/views/notfound/NotFoundView.tsx b/src/views/notfound/NotFoundView.tsx
similarity index 100%
rename from src3/views/notfound/NotFoundView.tsx
rename to src/views/notfound/NotFoundView.tsx