diff --git a/apps/client/src/lib/components/svg/servers/LocalDockerIcon.svelte b/apps/client/src/lib/components/svg/destinations/LocalDocker.svelte
similarity index 100%
rename from apps/client/src/lib/components/svg/servers/LocalDockerIcon.svelte
rename to apps/client/src/lib/components/svg/destinations/LocalDocker.svelte
diff --git a/apps/client/src/lib/components/svg/servers/RemoteDockerIcon.svelte b/apps/client/src/lib/components/svg/destinations/RemoteDocker.svelte
similarity index 100%
rename from apps/client/src/lib/components/svg/servers/RemoteDockerIcon.svelte
rename to apps/client/src/lib/components/svg/destinations/RemoteDocker.svelte
diff --git a/apps/client/src/lib/components/svg/destinations/index.ts b/apps/client/src/lib/components/svg/destinations/index.ts
new file mode 100644
index 000000000..f39255325
--- /dev/null
+++ b/apps/client/src/lib/components/svg/destinations/index.ts
@@ -0,0 +1,2 @@
+export { default as LocalDocker } from './LocalDocker.svelte';
+export { default as RemoteDocker } from './RemoteDocker.svelte';
diff --git a/apps/client/src/lib/components/svg/index.ts b/apps/client/src/lib/components/svg/index.ts
new file mode 100644
index 000000000..88f83c5c9
--- /dev/null
+++ b/apps/client/src/lib/components/svg/index.ts
@@ -0,0 +1,5 @@
+export { default as RemoteLink } from './RemoteLink.svelte';
+export * as Applications from './applications';
+export * as Sources from './sources';
+export * as Destinations from './destinations';
+export * as Databases from './databases';
diff --git a/apps/client/src/lib/components/svg/sources/GithubIcon.svelte b/apps/client/src/lib/components/svg/sources/Github.svelte
similarity index 100%
rename from apps/client/src/lib/components/svg/sources/GithubIcon.svelte
rename to apps/client/src/lib/components/svg/sources/Github.svelte
diff --git a/apps/client/src/lib/components/svg/sources/GitlabIcon.svelte b/apps/client/src/lib/components/svg/sources/Gitlab.svelte
similarity index 100%
rename from apps/client/src/lib/components/svg/sources/GitlabIcon.svelte
rename to apps/client/src/lib/components/svg/sources/Gitlab.svelte
diff --git a/apps/client/src/lib/components/svg/sources/index.ts b/apps/client/src/lib/components/svg/sources/index.ts
new file mode 100644
index 000000000..3a0d7cee3
--- /dev/null
+++ b/apps/client/src/lib/components/svg/sources/index.ts
@@ -0,0 +1,2 @@
+export { default as GitHub } from './Github.svelte';
+export { default as GitLab } from './Gitlab.svelte';
diff --git a/apps/client/src/routes/+page.svelte b/apps/client/src/routes/+page.svelte
index f7ca836a6..153634080 100644
--- a/apps/client/src/routes/+page.svelte
+++ b/apps/client/src/routes/+page.svelte
@@ -10,8 +10,9 @@
 	import ApplicationsIcons from '$lib/components/svg/applications/ApplicationIcons.svelte';
 	import DatabaseIcons from '$lib/components/svg/databases/DatabaseIcons.svelte';
 	import ServiceIcons from '$lib/components/svg/services/ServiceIcons.svelte';
-	import NewResource from '$lib/components/NewResource.svelte';
 	import DeleteIcon from '$lib/components/DeleteIcon.svelte';
+	
+	import NewResource from './_components/NewResource.svelte';
 
 	const {
 		applications,
diff --git a/apps/client/src/lib/components/NewResource.svelte b/apps/client/src/routes/_components/NewResource.svelte
similarity index 100%
rename from apps/client/src/lib/components/NewResource.svelte
rename to apps/client/src/routes/_components/NewResource.svelte
diff --git a/apps/client/src/routes/applications/[id]/_components/Menu.svelte b/apps/client/src/routes/applications/[id]/_components/Menu.svelte
index ff1106d04..5cef1fafb 100644
--- a/apps/client/src/routes/applications/[id]/_components/Menu.svelte
+++ b/apps/client/src/routes/applications/[id]/_components/Menu.svelte
@@ -2,9 +2,7 @@
 	export let application: any;
 	import { status } from '$lib/store';
 	import { page } from '$app/stores';
-	import GitlabIcon from '$lib/components/svg/sources/GitlabIcon.svelte';
-	import GithubIcon from '$lib/components/svg/sources/GithubIcon.svelte';
-	import RemoteLink from '$lib/components/svg/RemoteLink.svelte';
+	import * as Icons from '$lib/components/svg';
 </script>
 
 <ul class="menu border bg-coolgray-100 border-coolgray-200 rounded p-2 space-y-2 sticky top-4">
@@ -20,11 +18,11 @@
 				class="no-underline"
 			>
 				{#if application.gitSource?.type === 'gitlab'}
-					<GithubIcon small={true} />
+					<Icons.Sources.Github small={true} />
 				{:else if application.gitSource?.type === 'github'}
-					<GitlabIcon small={true} />
+					<Icons.Sources.Gitlab small={true} />
 				{/if}
-				Open on Git <RemoteLink />
+				Open on Git <Icons.RemoteLink />
 			</a>
 		</li>
 	{/if}