diff --git a/src/routes/info.article.component.svelte b/src/lib/components/cv_info_articles/info.article.component.svelte
similarity index 100%
rename from src/routes/info.article.component.svelte
rename to src/lib/components/cv_info_articles/info.article.component.svelte
diff --git a/src/routes/info.component.svelte b/src/lib/components/cv_info_articles/info.component.svelte
similarity index 96%
rename from src/routes/info.component.svelte
rename to src/lib/components/cv_info_articles/info.component.svelte
index 89f0832..705e9d3 100644
--- a/src/routes/info.component.svelte
+++ b/src/lib/components/cv_info_articles/info.component.svelte
@@ -2,7 +2,7 @@
 	import InfoArticleComponent from './info.article.component.svelte';
 	import { infoBodyPadding } from './info.component';
 
-	import type { InfoArticleList } from './+page';
+	import type { InfoArticleList } from '$lib/types/cv_types';
 
 	export let infoArticles: InfoArticleList;
 
diff --git a/src/routes/info.component.ts b/src/lib/components/cv_info_articles/info.component.ts
similarity index 100%
rename from src/routes/info.component.ts
rename to src/lib/components/cv_info_articles/info.component.ts
diff --git a/src/routes/skill.component.svelte b/src/lib/components/proficiency_trackers/skill.component.svelte
similarity index 100%
rename from src/routes/skill.component.svelte
rename to src/lib/components/proficiency_trackers/skill.component.svelte
diff --git a/src/routes/skill_area.component.svelte b/src/lib/components/proficiency_trackers/skill_area.component.svelte
similarity index 88%
rename from src/routes/skill_area.component.svelte
rename to src/lib/components/proficiency_trackers/skill_area.component.svelte
index a7a3c24..711ede9 100644
--- a/src/routes/skill_area.component.svelte
+++ b/src/lib/components/proficiency_trackers/skill_area.component.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { SkillList } from './+page';
+	import type { SkillList } from '$lib/types/cv_types';
 	import SkillComponent from './skill.component.svelte';
 
 	let skills: SkillList = [{ name: 'Placeholder Skill', proficiency: 3 }];
diff --git a/src/routes/+page.ts b/src/lib/types/cv_types.ts
similarity index 100%
rename from src/routes/+page.ts
rename to src/lib/types/cv_types.ts
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index e7904ac..315dc0f 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-	import type { SkillList, InfoArticleList } from './+page';
+	import type { SkillList, InfoArticleList } from '$lib/types/cv_types';
 
-	import InfoComponent from './info.component.svelte';
+	import InfoComponent from '$lib/components/cv_info_articles/info.component.svelte';
 	import NameComponent from './name.component.svelte';
-	import SkillAreaComponent from './skill_area.component.svelte';
+	import SkillAreaComponent from '$lib/components/proficiency_trackers/skill_area.component.svelte';
 
 	const skills: SkillList = [];
 	const infoArticles: InfoArticleList = [