diff --git a/pages/guides/components/guide-grid-item.tsx b/components/guide/guide-grid-item.tsx
similarity index 100%
rename from pages/guides/components/guide-grid-item.tsx
rename to components/guide/guide-grid-item.tsx
diff --git a/pages/roadmaps/components/home-roadmap-item.tsx b/components/roadmap/home-roadmap-item.tsx
similarity index 100%
rename from pages/roadmaps/components/home-roadmap-item.tsx
rename to components/roadmap/home-roadmap-item.tsx
diff --git a/pages/roadmaps/components/roadmap-grid-item.tsx b/components/roadmap/roadmap-grid-item.tsx
similarity index 100%
rename from pages/roadmaps/components/roadmap-grid-item.tsx
rename to components/roadmap/roadmap-grid-item.tsx
diff --git a/pages/watch/components/video-grid-item.tsx b/components/watch/video-grid-item.tsx
similarity index 100%
rename from pages/watch/components/video-grid-item.tsx
rename to components/watch/video-grid-item.tsx
diff --git a/package.json b/package.json
index f6e441d25..e4e3e4d51 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "license": "BSD-4-Clause",
   "scripts": {
-    "dev": "NODE_ENV=dev next",
+    "dev": "next",
     "serve:out": "serve out",
     "build": "./scripts/build.sh",
     "deploy": "NODE_DEBUG=gh-pages gh-pages -d out -t",
diff --git a/pages/[roadmap]/index.tsx b/pages/[roadmap].tsx
similarity index 85%
rename from pages/[roadmap]/index.tsx
rename to pages/[roadmap].tsx
index 107936983..930840a04 100644
--- a/pages/[roadmap]/index.tsx
+++ b/pages/[roadmap].tsx
@@ -1,13 +1,13 @@
 import { Box, Button, Container, Link, Stack } from '@chakra-ui/react';
 import { DownloadIcon, EmailIcon } from '@chakra-ui/icons';
-import { GlobalHeader } from '../../components/global-header';
-import { OpensourceBanner } from '../../components/opensource-banner';
-import { UpdatesBanner } from '../../components/updates-banner';
-import { Footer } from '../../components/footer';
-import { PageHeader } from '../../components/page-header';
-import { getAllRoadmaps, getRoadmapById, RoadmapType } from '../../lib/roadmap';
-import MdRenderer from '../../components/md-renderer';
-import Helmet from '../../components/helmet';
+import { GlobalHeader } from '../components/global-header';
+import { OpensourceBanner } from '../components/opensource-banner';
+import { UpdatesBanner } from '../components/updates-banner';
+import { Footer } from '../components/footer';
+import { PageHeader } from '../components/page-header';
+import { getAllRoadmaps, getRoadmapById, RoadmapType } from '../lib/roadmap';
+import MdRenderer from '../components/md-renderer';
+import Helmet from '../components/helmet';
 
 type RoadmapProps = {
   roadmap: RoadmapType;
@@ -36,7 +36,7 @@ function TextualRoadmap(props: RoadmapProps) {
 
   // Remove trailing slashes
   const normalizedPath = roadmap.contentPath.replace(/^\//, '');
-  const RoadmapContent = require(`../../content/${normalizedPath}`).default;
+  const RoadmapContent = require(`../content/${normalizedPath}`).default;
 
   return (
     <Container maxW={'container.md'} position='relative'>
diff --git a/pages/guides/index.tsx b/pages/guides/index.tsx
index e30ac4f57..1196a31b3 100644
--- a/pages/guides/index.tsx
+++ b/pages/guides/index.tsx
@@ -5,7 +5,7 @@ import { LinksListItem } from '../../components/links-list-item';
 import { OpensourceBanner } from '../../components/opensource-banner';
 import { UpdatesBanner } from '../../components/updates-banner';
 import { Footer } from '../../components/footer';
-import { GuideGridItem } from './components/guide-grid-item';
+import { GuideGridItem } from '../../components/guide/guide-grid-item';
 import { PageHeader } from '../../components/page-header';
 import { getAllGuides, GuideType } from '../../lib/guide';
 import Helmet from '../../components/helmet';
diff --git a/pages/index.tsx b/pages/index.tsx
index 56fd23c71..8beb7a730 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -7,7 +7,7 @@ import { DimmedMore } from '../components/dimmed-more';
 import { LinksListItem } from '../components/links-list-item';
 import { VideoIcon } from '../icons/video-icon';
 import { LinksList } from '../components/links-list';
-import { HomeRoadmapItem } from './roadmaps/components/home-roadmap-item';
+import { HomeRoadmapItem } from '../components/roadmap/home-roadmap-item';
 import { getFeaturedRoadmaps, RoadmapType } from '../lib/roadmap';
 import { getAllGuides, GuideType } from '../lib/guide';
 import { getAllVideos, VideoType } from '../lib/video';
diff --git a/pages/roadmaps/index.tsx b/pages/roadmaps.tsx
similarity index 74%
rename from pages/roadmaps/index.tsx
rename to pages/roadmaps.tsx
index 41da4433c..30ae75364 100644
--- a/pages/roadmaps/index.tsx
+++ b/pages/roadmaps.tsx
@@ -1,12 +1,12 @@
 import { Box, Container, SimpleGrid } from '@chakra-ui/react';
-import { GlobalHeader } from '../../components/global-header';
-import { OpensourceBanner } from '../../components/opensource-banner';
-import { UpdatesBanner } from '../../components/updates-banner';
-import { Footer } from '../../components/footer';
-import { PageHeader } from '../../components/page-header';
-import { RoadmapGridItem } from './components/roadmap-grid-item';
-import { getAllRoadmaps, RoadmapType } from '../../lib/roadmap';
-import Helmet from '../../components/helmet';
+import { GlobalHeader } from '../components/global-header';
+import { OpensourceBanner } from '../components/opensource-banner';
+import { UpdatesBanner } from '../components/updates-banner';
+import { Footer } from '../components/footer';
+import { PageHeader } from '../components/page-header';
+import { RoadmapGridItem } from '../components/roadmap/roadmap-grid-item';
+import { getAllRoadmaps, RoadmapType } from '../lib/roadmap';
+import Helmet from '../components/helmet';
 
 type RoadmapsProps = {
   roadmaps: RoadmapType[];
diff --git a/pages/watch/index.tsx b/pages/watch/index.tsx
index b03144568..cd27baddf 100644
--- a/pages/watch/index.tsx
+++ b/pages/watch/index.tsx
@@ -3,7 +3,7 @@ import { GlobalHeader } from '../../components/global-header';
 import { OpensourceBanner } from '../../components/opensource-banner';
 import { UpdatesBanner } from '../../components/updates-banner';
 import { Footer } from '../../components/footer';
-import { VideoGridItem } from './components/video-grid-item';
+import { VideoGridItem } from '../../components/watch/video-grid-item';
 import { PageHeader } from '../../components/page-header';
 import { getAllVideos, VideoType } from '../../lib/video';
 import Helmet from '../../components/helmet';
diff --git a/scripts/build.sh b/scripts/build.sh
index bc28125d3..8be7acb51 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-NODE_ENV=prod next build
-NODE_ENV=prod next export
+next build
+next export
 echo 'roadmap.sh' > out/CNAME
 touch out/.nojekyll