diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index dc727147c8..83aa968c3b 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -94,9 +94,9 @@ import { debugAnalytics, initAnalytics, trackEvent } from '@/helpers/analytics'
 import { check_reachable } from '@/helpers/auth.js'
 import { get_user, get_version } from '@/helpers/cache.js'
 import { command_listener, notification_listener, warning_listener } from '@/helpers/events.js'
+import { list } from '@/helpers/instance'
 import { cancelLogin, get as getCreds, login, logout } from '@/helpers/mr_auth.ts'
-import { create_profile_and_install_from_file } from '@/helpers/pack'
-import { list } from '@/helpers/profile.js'
+import { create_instance_and_install_from_file } from '@/helpers/pack'
 import { mergeUrlQuery, parseModrinthLink } from '@/helpers/project-links.ts'
 import { get as getSettings, set as setSettings } from '@/helpers/settings.ts'
 import { get_opening_command, initialize_state } from '@/helpers/state'
@@ -852,8 +852,8 @@ async function handleCommand(e) {
 	if (e.event === 'RunMRPack') {
 		// RunMRPack should directly install a local mrpack given a path
 		if (e.path.endsWith('.mrpack')) {
-			await create_profile_and_install_from_file(e.path, (createProfile, fileName) =>
-				unknownPackWarningModal.value?.show(createProfile, fileName),
+			await create_instance_and_install_from_file(e.path, (createInstance, fileName) =>
+				unknownPackWarningModal.value?.show(createInstance, fileName),
 			).catch(handleError)
 			trackEvent('InstanceCreate', {
 				source: 'CreationModalFileDrop',
diff --git a/apps/app-frontend/src/components/GridDisplay.vue b/apps/app-frontend/src/components/GridDisplay.vue
index 3d6dc42a13..b407ee483c 100644
--- a/apps/app-frontend/src/components/GridDisplay.vue
+++ b/apps/app-frontend/src/components/GridDisplay.vue
@@ -24,7 +24,7 @@ import { computed, ref } from 'vue'
 import ContextMenu from '@/components/ui/ContextMenu.vue'
 import Instance from '@/components/ui/Instance.vue'
 import ConfirmDeleteInstanceModal from '@/components/ui/modal/ConfirmDeleteInstanceModal.vue'
-import { duplicate, remove } from '@/helpers/profile.js'
+import { duplicate, remove } from '@/helpers/instance'
 
 const { handleError } = injectNotificationManager()
 
@@ -48,21 +48,21 @@ const instanceComponents = ref(null)
 const currentDeleteInstance = ref(null)
 const confirmModal = ref(null)
 
-async function deleteProfile() {
+async function deleteInstance() {
 	if (currentDeleteInstance.value) {
 		instanceComponents.value = instanceComponents.value.filter(
-			(x) => x.instance.path !== currentDeleteInstance.value,
+			(x) => x.instance.id !== currentDeleteInstance.value,
 		)
 		await remove(currentDeleteInstance.value).catch(handleError)
 	}
 }
 
-async function duplicateProfile(p) {
+async function duplicateInstance(p) {
 	await duplicate(p).catch(handleError)
 }
 
-const handleRightClick = (event, profilePathId) => {
-	const item = instanceComponents.value.find((x) => x.instance.path === profilePathId)
+const handleRightClick = (event, instanceId) => {
+	const item = instanceComponents.value.find((x) => x.instance.id === instanceId)
 	const baseOptions = [
 		{ name: 'add_content' },
 		{ type: 'divider' },
@@ -114,16 +114,16 @@ const handleOptionsClick = async (args) => {
 			break
 		case 'duplicate':
 			if (args.item.instance.install_stage == 'installed')
-				await duplicateProfile(args.item.instance.path)
+				await duplicateInstance(args.item.instance.id)
 			break
 		case 'open':
 			await args.item.openFolder()
 			break
 		case 'copy':
-			await navigator.clipboard.writeText(args.item.instance.path)
+			await navigator.clipboard.writeText(args.item.instance.id)
 			break
 		case 'delete':
-			currentDeleteInstance.value = args.item.instance.path
+			currentDeleteInstance.value = args.item.instance.id
 			confirmModal.value.show()
 			break
 	}
@@ -321,13 +321,13 @@ const filteredResults = computed(() => {
 			<Instance
 				v-for="instance in instanceSection.value"
 				ref="instanceComponents"
-				:key="instance.path + instance.install_stage"
+				:key="instance.id + instance.install_stage"
 				:instance="instance"
-				@contextmenu.prevent.stop="(event) => handleRightClick(event, instance.path)"
+				@contextmenu.prevent.stop="(event) => handleRightClick(event, instance.id)"
 			/>
 		</section>
 	</Accordion>
-	<ConfirmDeleteInstanceModal ref="confirmModal" @delete="deleteProfile" />
+	<ConfirmDeleteInstanceModal ref="confirmModal" @delete="deleteInstance" />
 	<ContextMenu ref="instanceOptions" @option-clicked="handleOptionsClick">
 		<template #play> <PlayIcon /> Play </template>
 		<template #stop> <StopCircleIcon /> Stop </template>
diff --git a/apps/app-frontend/src/components/RowDisplay.vue b/apps/app-frontend/src/components/RowDisplay.vue
index 8e3a4cc276..0d0c47988d 100644
--- a/apps/app-frontend/src/components/RowDisplay.vue
+++ b/apps/app-frontend/src/components/RowDisplay.vue
@@ -21,9 +21,9 @@ import Instance from '@/components/ui/Instance.vue'
 import LegacyProjectCard from '@/components/ui/LegacyProjectCard.vue'
 import ConfirmDeleteInstanceModal from '@/components/ui/modal/ConfirmDeleteInstanceModal.vue'
 import { trackEvent } from '@/helpers/analytics'
-import { get_by_profile_path } from '@/helpers/process.js'
-import { duplicate, kill, remove, run } from '@/helpers/profile.js'
-import { showProfileInFolder } from '@/helpers/utils.js'
+import { duplicate, kill, remove, run } from '@/helpers/instance'
+import { get_by_instance_id } from '@/helpers/process.js'
+import { showInstanceInFolder } from '@/helpers/utils.js'
 import { injectContentInstall } from '@/providers/content-install'
 import { handleSevereError } from '@/store/error.js'
 
@@ -60,13 +60,13 @@ const deleteConfirmModal = ref(null)
 
 const currentDeleteInstance = ref(null)
 
-async function deleteProfile() {
+async function deleteInstance() {
 	if (currentDeleteInstance.value) {
 		await remove(currentDeleteInstance.value).catch(handleError)
 	}
 }
 
-async function duplicateProfile(p) {
+async function duplicateInstance(p) {
 	await duplicate(p).catch(handleError)
 }
 
@@ -85,7 +85,7 @@ const handleInstanceRightClick = async (event, passedInstance) => {
 		},
 	]
 
-	const runningProcesses = await get_by_profile_path(passedInstance.path).catch(handleError)
+	const runningProcesses = await get_by_instance_id(passedInstance.id).catch(handleError)
 
 	const options =
 		runningProcesses.length > 0
@@ -126,16 +126,14 @@ const handleProjectClick = (event, passedInstance) => {
 const handleOptionsClick = async (args) => {
 	switch (args.option) {
 		case 'play':
-			await run(args.item.path).catch((err) =>
-				handleSevereError(err, { profilePath: args.item.path }),
-			)
+			await run(args.item.id).catch((err) => handleSevereError(err, { instanceId: args.item.id }))
 			trackEvent('InstanceStart', {
 				loader: args.item.loader,
 				game_version: args.item.game_version,
 			})
 			break
 		case 'stop':
-			await kill(args.item.path).catch(handleError)
+			await kill(args.item.id).catch(handleError)
 			trackEvent('InstanceStop', {
 				loader: args.item.loader,
 				game_version: args.item.game_version,
@@ -144,26 +142,26 @@ const handleOptionsClick = async (args) => {
 		case 'add_content':
 			await router.push({
 				path: `/browse/${args.item.loader === 'vanilla' ? 'datapack' : 'mod'}`,
-				query: { i: args.item.path },
+				query: { i: args.item.id },
 			})
 			break
 		case 'edit':
 			await router.push({
-				path: `/instance/${encodeURIComponent(args.item.path)}`,
+				path: `/instance/${encodeURIComponent(args.item.id)}`,
 			})
 			break
 		case 'duplicate':
-			if (args.item.install_stage == 'installed') await duplicateProfile(args.item.path)
+			if (args.item.install_stage == 'installed') await duplicateInstance(args.item.id)
 			break
 		case 'delete':
-			currentDeleteInstance.value = args.item.path
+			currentDeleteInstance.value = args.item.id
 			deleteConfirmModal.value.show()
 			break
 		case 'open_folder':
-			await showProfileInFolder(args.item.path)
+			await showInstanceInFolder(args.item.id)
 			break
 		case 'copy_path':
-			await navigator.clipboard.writeText(args.item.path)
+			await navigator.clipboard.writeText(args.item.id)
 			break
 		case 'install': {
 			await installVersion(
@@ -239,7 +237,7 @@ onUnmounted(() => {
 </script>
 
 <template>
-	<ConfirmDeleteInstanceModal ref="deleteConfirmModal" @delete="deleteProfile" />
+	<ConfirmDeleteInstanceModal ref="deleteConfirmModal" @delete="deleteInstance" />
 	<div ref="rowContainer" class="flex flex-col gap-4">
 		<div v-for="row in actualInstances" ref="rows" :key="row.label" class="row">
 			<HeadingLink class="mt-1" :to="row.route">
@@ -256,7 +254,7 @@ onUnmounted(() => {
 						0,
 						row.compact ? maxInstancesPerCompactRow : maxInstancesPerRow,
 					)"
-					:key="row.label + instance.path"
+					:key="row.label + instance.id"
 					:instance="instance"
 					:compact="row.compact"
 					:first="instanceIndex === 0"
diff --git a/apps/app-frontend/src/components/ui/AddContentButton.vue b/apps/app-frontend/src/components/ui/AddContentButton.vue
index 193b6e80f3..cdea116e87 100644
--- a/apps/app-frontend/src/components/ui/AddContentButton.vue
+++ b/apps/app-frontend/src/components/ui/AddContentButton.vue
@@ -4,7 +4,7 @@ import { ButtonStyled, injectNotificationManager, OverflowMenu } from '@modrinth
 import { open } from '@tauri-apps/plugin-dialog'
 import { useRouter } from 'vue-router'
 
-import { add_project_from_path } from '@/helpers/profile.js'
+import { add_project_from_path } from '@/helpers/instance'
 
 const { handleError } = injectNotificationManager()
 
@@ -22,14 +22,14 @@ const handleAddContentFromFile = async () => {
 	if (!newProject) return
 
 	for (const project of newProject) {
-		await add_project_from_path(props.instance.path, project.path ?? project).catch(handleError)
+		await add_project_from_path(props.instance.id, project.path ?? project).catch(handleError)
 	}
 }
 
 const handleSearchContent = async () => {
 	await router.push({
 		path: `/browse/${props.instance.loader === 'vanilla' ? 'resourcepack' : 'mod'}`,
-		query: { i: props.instance.path },
+		query: { i: props.instance.id },
 	})
 }
 </script>
diff --git a/apps/app-frontend/src/components/ui/AppActionBar.vue b/apps/app-frontend/src/components/ui/AppActionBar.vue
index 916edd96f8..9536eeea96 100644
--- a/apps/app-frontend/src/components/ui/AppActionBar.vue
+++ b/apps/app-frontend/src/components/ui/AppActionBar.vue
@@ -47,28 +47,28 @@
 				<div class="text-contrast flex items-center gap-2">
 					<router-link
 						v-tooltip="formatMessage(messages.viewInstance)"
-						:to="`/instance/${encodeURIComponent(selectedProcess.profile.path)}`"
+						:to="`/instance/${encodeURIComponent(selectedProcess.instance.id)}`"
 						class="hover:underline"
 					>
-						{{ selectedProcess.profile.name }}
+						{{ selectedProcess.instance.name }}
 					</router-link>
 					<Dropdown
 						v-if="currentProcesses.length > 1"
 						placement="bottom"
 						:triggers="['click']"
 						:hide-triggers="['click']"
-						@show="showProfiles = true"
-						@hide="showProfiles = false"
+						@show="showInstances = true"
+						@hide="showInstances = false"
 					>
 						<ButtonStyled type="transparent" circular size="small">
 							<button
 								v-tooltip="
-									showProfiles
+									showInstances
 										? formatMessage(messages.hideMoreRunningInstances)
 										: formatMessage(messages.showMoreRunningInstances)
 								"
 							>
-								<DropdownIcon :class="{ 'rotate-180': !!showProfiles }" />
+								<DropdownIcon :class="{ 'rotate-180': !!showInstances }" />
 							</button>
 						</ButtonStyled>
 						<template #popper>
@@ -93,7 +93,7 @@
 									>
 										<OnlineIndicatorIcon />
 										<span class="mr-auto text-contrast flex items-center gap-2">
-											{{ process.profile.name }}
+											{{ process.instance.name }}
 											<StarIcon v-if="process.uuid === selectedProcess.uuid" class="text-orange" />
 										</span>
 									</button>
@@ -107,7 +107,7 @@
 									<button
 										v-tooltip="formatMessage(messages.viewLogs)"
 										class="active:scale-95 flex"
-										@click.stop="goToTerminal(process.profile.path)"
+										@click.stop="goToTerminal(process.instance.id)"
 									>
 										<TerminalSquareIcon class="text-secondary size-5" />
 									</button>
@@ -166,8 +166,8 @@ import { useRouter } from 'vue-router'
 
 import { trackEvent } from '@/helpers/analytics'
 import { loading_listener, process_listener } from '@/helpers/events'
+import { get_many as getInstances } from '@/helpers/instance'
 import { get_all as getRunningProcesses, kill as killProcess } from '@/helpers/process'
-import { get_many as getInstances } from '@/helpers/profile.js'
 import type { LoadingBar } from '@/helpers/state'
 import { progress_bars_list } from '@/helpers/state'
 import type { GameInstance } from '@/helpers/types'
@@ -183,12 +183,12 @@ const { formatMessage } = useVIntl()
 
 const router = useRouter()
 
-const showProfiles = ref(false)
+const showInstances = ref(false)
 
 interface RunningProcess {
 	uuid: string
-	profile_path: string
-	profile: GameInstance
+	instance_id: string
+	instance: GameInstance
 }
 
 const messages = defineMessages({
@@ -337,22 +337,22 @@ const refresh = async () => {
 	const processes = ((await getRunningProcesses().catch((error) => {
 		handleError(error)
 		return []
-	})) ?? []) as Array<{ uuid: string; profile_path: string }>
-	const paths = processes.map((process) => process.profile_path)
-	const profiles: GameInstance[] = await getInstances(paths).catch((error) => {
+	})) ?? []) as Array<{ uuid: string; instance_id: string }>
+	const instanceIds = processes.map((process) => process.instance_id)
+	const instances: GameInstance[] = await getInstances(instanceIds).catch((error) => {
 		handleError(error)
 		return []
 	})
 
 	currentProcesses.value = processes
 		.map((process) => {
-			const profile = profiles.find((item) => process.profile_path === item.path)
-			if (!profile) {
+			const instance = instances.find((item) => process.instance_id === item.id)
+			if (!instance) {
 				return null
 			}
 			return {
 				...process,
-				profile,
+				instance,
 			}
 		})
 		.filter((process): process is RunningProcess => process !== null)
@@ -385,8 +385,8 @@ const stop = async (process: RunningProcess) => {
 		await killProcess(process.uuid).catch(handleError)
 
 		trackEvent('InstanceStop', {
-			loader: process.profile.loader,
-			game_version: process.profile.game_version,
+			loader: process.instance.loader,
+			game_version: process.instance.game_version,
 			source: 'AppBar',
 		})
 	} catch (e) {
@@ -396,7 +396,7 @@ const stop = async (process: RunningProcess) => {
 }
 
 function goToTerminal(path?: string) {
-	const selectedPath = path ?? selectedProcess.value?.profile.path
+	const selectedPath = path ?? selectedProcess.value?.instance.id
 	if (!selectedPath) {
 		return
 	}
@@ -513,8 +513,8 @@ function formatLoadingBars(loadingBar: LoadingBar): LoadingBar {
 			version: formatted.bar_type.version,
 		})
 	}
-	if (formatted.bar_type?.profile_path) {
-		formatted.title = formatted.bar_type.profile_path
+	if (formatted.bar_type?.instance_id) {
+		formatted.title = formatted.bar_type.instance_id
 	}
 	if (formatted.bar_type?.pack_name) {
 		formatted.title = formatted.bar_type.pack_name
@@ -532,29 +532,29 @@ async function refreshLoadingBars() {
 		.map(formatLoadingBars)
 		.filter((bar) => bar?.bar_type?.type !== 'launcher_update')
 
-	const profilePaths = Array.from(
+	const instanceIds = Array.from(
 		new Set(
 			currentLoadingBars.value
-				.map((bar) => bar.bar_type?.profile_path)
-				.filter((path): path is string => !!path),
+				.map((bar) => bar.bar_type?.instance_id)
+				.filter((instanceId): instanceId is string => !!instanceId),
 		),
 	)
-	const profiles = profilePaths.length
-		? await getInstances(profilePaths).catch((error) => {
+	const instances = instanceIds.length
+		? await getInstances(instanceIds).catch((error) => {
 				handleError(error)
 				return []
 			})
 		: []
-	const profileIconUrls = new Map(
-		profiles.map((profile) => [profile.path, getDisplayIconUrl(profile.icon_path)]),
+	const instanceIconUrls = new Map(
+		instances.map((instance) => [instance.id, getDisplayIconUrl(instance.icon_path)]),
 	)
 	currentLoadingBarIconUrls.value = Object.fromEntries(
 		currentLoadingBars.value.map((bar) => {
 			const barIconUrl = getDisplayIconUrl(bar.bar_type?.icon)
-			const profileIconUrl = bar.bar_type?.profile_path
-				? profileIconUrls.get(bar.bar_type.profile_path)
+			const instanceIconUrl = bar.bar_type?.instance_id
+				? instanceIconUrls.get(bar.bar_type.instance_id)
 				: null
-			return [getLoadingBarKey(bar), barIconUrl ?? profileIconUrl ?? null]
+			return [getLoadingBarKey(bar), barIconUrl ?? instanceIconUrl ?? null]
 		}),
 	)
 
diff --git a/apps/app-frontend/src/components/ui/ContextMenu.vue b/apps/app-frontend/src/components/ui/ContextMenu.vue
index e778190f39..5a74d7a8f7 100644
--- a/apps/app-frontend/src/components/ui/ContextMenu.vue
+++ b/apps/app-frontend/src/components/ui/ContextMenu.vue
@@ -12,7 +12,7 @@
 			<div v-for="(option, index) in options" :key="index" @click.stop="optionClicked(option.name)">
 				<hr v-if="option.type === 'divider'" class="divider" />
 				<div
-					v-else-if="!(isLinkedData(item) && option.name === `add_content`)"
+					v-else-if="!(isInstanceLink(item) && option.name === `add_content`)"
 					class="item clickable"
 					:class="[option.color ?? 'base']"
 				>
@@ -64,10 +64,10 @@ defineExpose({
 	},
 })
 
-const isLinkedData = (item) => {
-	if (item.instance != undefined && item.instance.linked_data) {
+const isInstanceLink = (item) => {
+	if (item.instance != undefined && item.instance.link) {
 		return true
-	} else if (item != undefined && item.linked_data) {
+	} else if (item != undefined && item.link) {
 		return true
 	}
 	return false
diff --git a/apps/app-frontend/src/components/ui/ErrorModal.vue b/apps/app-frontend/src/components/ui/ErrorModal.vue
index 6ae482c772..36af8764de 100644
--- a/apps/app-frontend/src/components/ui/ErrorModal.vue
+++ b/apps/app-frontend/src/components/ui/ErrorModal.vue
@@ -16,7 +16,7 @@ import { ChatIcon } from '@/assets/icons'
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import { trackEvent } from '@/helpers/analytics'
 import { login as login_flow, set_default_user } from '@/helpers/auth.js'
-import { install } from '@/helpers/profile.js'
+import { install } from '@/helpers/instance'
 import { cancel_directory_change } from '@/helpers/settings.ts'
 import { handleSevereError } from '@/store/error.js'
 
@@ -72,7 +72,7 @@ defineExpose({
 			title.value = 'No loader selected'
 			errorType.value = 'no_loader_version'
 			supportLink.value = 'https://support.modrinth.com'
-			metadata.value.profilePath = context.profilePath
+			metadata.value.instanceId = context.instanceId
 		} else if (source === 'state_init') {
 			title.value = 'Error initializing Modrinth App'
 			errorType.value = 'state_init'
@@ -125,7 +125,7 @@ const loadingRepair = ref(false)
 async function repairInstance() {
 	loadingRepair.value = true
 	try {
-		await install(metadata.value.profilePath, false)
+		await install(metadata.value.instanceId, false)
 		errorModal.value.hide()
 	} catch (err) {
 		handleSevereError(err)
diff --git a/apps/app-frontend/src/components/ui/ExportModal.vue b/apps/app-frontend/src/components/ui/ExportModal.vue
index ea573dfef2..a71898949f 100644
--- a/apps/app-frontend/src/components/ui/ExportModal.vue
+++ b/apps/app-frontend/src/components/ui/ExportModal.vue
@@ -15,7 +15,7 @@ import { ref } from 'vue'
 
 import { PackageIcon, VersionIcon } from '@/assets/icons'
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import { export_profile_mrpack, get_pack_export_candidates } from '@/helpers/profile.js'
+import { export_instance_mrpack, get_pack_export_candidates } from '@/helpers/instance'
 
 const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
@@ -75,7 +75,7 @@ const initFiles = async () => {
 	const newFolders = new Map()
 	const sep = '/'
 	files.value = []
-	await get_pack_export_candidates(props.instance.path).then((filePaths) =>
+	await get_pack_export_candidates(props.instance.id).then((filePaths) =>
 		filePaths
 			.map((folder) => ({
 				path: folder,
@@ -136,8 +136,8 @@ const exportPack = async () => {
 	})
 
 	if (outputPath) {
-		export_profile_mrpack(
-			props.instance.path,
+		export_instance_mrpack(
+			props.instance.id,
 			outputPath,
 			filesToExport,
 			versionInput.value,
diff --git a/apps/app-frontend/src/components/ui/Instance.vue b/apps/app-frontend/src/components/ui/Instance.vue
index a73162731d..97e52acfcd 100644
--- a/apps/app-frontend/src/components/ui/Instance.vue
+++ b/apps/app-frontend/src/components/ui/Instance.vue
@@ -15,9 +15,9 @@ import { useRouter } from 'vue-router'
 
 import { trackEvent } from '@/helpers/analytics'
 import { process_listener } from '@/helpers/events'
-import { get_by_profile_path } from '@/helpers/process'
-import { finish_install, kill, run } from '@/helpers/profile'
-import { showProfileInFolder } from '@/helpers/utils.js'
+import { finish_install, kill, run } from '@/helpers/instance'
+import { get_by_instance_id } from '@/helpers/process'
+import { showInstanceInFolder } from '@/helpers/utils.js'
 import { handleSevereError } from '@/store/error.js'
 
 const { handleError } = injectNotificationManager()
@@ -54,11 +54,11 @@ const installed = computed(() => props.instance.install_stage === 'installed')
 const router = useRouter()
 
 const seeInstance = async () => {
-	await router.push(`/instance/${encodeURIComponent(props.instance.path)}`)
+	await router.push(`/instance/${encodeURIComponent(props.instance.id)}`)
 }
 
 const checkProcess = async () => {
-	const runningProcesses = await get_by_profile_path(props.instance.path).catch(handleError)
+	const runningProcesses = await get_by_instance_id(props.instance.id).catch(handleError)
 
 	playing.value = runningProcesses.length > 0
 }
@@ -66,8 +66,8 @@ const checkProcess = async () => {
 const play = async (e, context) => {
 	e?.stopPropagation()
 	loading.value = true
-	await run(props.instance.path)
-		.catch((err) => handleSevereError(err, { profilePath: props.instance.path }))
+	await run(props.instance.id)
+		.catch((err) => handleSevereError(err, { instanceId: props.instance.id }))
 		.finally(() => {
 			trackEvent('InstanceStart', {
 				loader: props.instance.loader,
@@ -82,7 +82,7 @@ const stop = async (e, context) => {
 	e?.stopPropagation()
 	playing.value = false
 
-	await kill(props.instance.path).catch(handleError)
+	await kill(props.instance.id).catch(handleError)
 
 	trackEvent('InstanceStop', {
 		loader: props.instance.loader,
@@ -98,13 +98,13 @@ const repair = async (e) => {
 }
 
 const openFolder = async () => {
-	await showProfileInFolder(props.instance.path)
+	await showInstanceInFolder(props.instance.id)
 }
 
 const addContent = async () => {
 	await router.push({
 		path: `/browse/${props.instance.loader === 'vanilla' ? 'datapack' : 'mod'}`,
-		query: { i: props.instance.path },
+		query: { i: props.instance.id },
 	})
 }
 
@@ -120,7 +120,7 @@ defineExpose({
 const currentEvent = ref(null)
 
 const unlisten = await process_listener((e) => {
-	if (e.profile_path_id === props.instance.path) {
+	if (e.instance_id === props.instance.id) {
 		currentEvent.value = e.event
 		if (e.event === 'finished') {
 			playing.value = false
@@ -142,7 +142,7 @@ onUnmounted(() => unlisten())
 			<Avatar
 				size="48px"
 				:src="instance.icon_path ? convertFileSrc(instance.icon_path) : null"
-				:tint-by="instance.path"
+				:tint-by="instance.id"
 				alt="Mod card"
 			/>
 			<div class="h-full flex items-center font-bold text-contrast leading-normal">
@@ -191,7 +191,7 @@ onUnmounted(() => unlisten())
 				<Avatar
 					size="48px"
 					:src="instance.icon_path ? convertFileSrc(instance.icon_path) : null"
-					:tint-by="instance.path"
+					:tint-by="instance.id"
 					alt="Mod card"
 					:class="`transition-all ${modLoading || installing ? `brightness-[0.25] scale-[0.85]` : `group-hover:brightness-75`}`"
 				/>
diff --git a/apps/app-frontend/src/components/ui/InstanceIndicator.vue b/apps/app-frontend/src/components/ui/InstanceIndicator.vue
index 49515c3af7..2787635117 100644
--- a/apps/app-frontend/src/components/ui/InstanceIndicator.vue
+++ b/apps/app-frontend/src/components/ui/InstanceIndicator.vue
@@ -22,7 +22,7 @@ const props = withDefaults(
 )
 
 const instanceLink = computed(() => {
-	const base = `/instance/${encodeURIComponent(props.instance.path)}`
+	const base = `/instance/${encodeURIComponent(props.instance.id)}`
 	return props.backTab ? `${base}/${props.backTab}` : base
 })
 </script>
diff --git a/apps/app-frontend/src/components/ui/ModpackVersionModal.vue b/apps/app-frontend/src/components/ui/ModpackVersionModal.vue
index c0014b0844..9e1a79a64c 100644
--- a/apps/app-frontend/src/components/ui/ModpackVersionModal.vue
+++ b/apps/app-frontend/src/components/ui/ModpackVersionModal.vue
@@ -5,7 +5,7 @@ import { computed, ref } from 'vue'
 
 import { SwapIcon } from '@/assets/icons/index.js'
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import { update_managed_modrinth_version } from '@/helpers/profile'
+import { update_managed_modrinth_version } from '@/helpers/instance'
 import { releaseColor } from '@/helpers/utils'
 
 const props = defineProps({
@@ -32,14 +32,14 @@ const filteredVersions = computed(() => {
 })
 
 const modpackVersionModal = ref(null)
-const installedVersion = computed(() => props.instance?.linked_data?.version_id)
+const installedVersion = computed(() => props.instance?.link?.version_id)
 const installing = computed(() => props.instance.install_stage !== 'installed')
 const inProgress = ref(false)
 
 const switchVersion = async (versionId) => {
 	modpackVersionModal.value.hide()
 	inProgress.value = true
-	await update_managed_modrinth_version(props.instance.path, versionId)
+	await update_managed_modrinth_version(props.instance.id, versionId)
 	inProgress.value = false
 	emit('finish-install')
 }
@@ -59,7 +59,7 @@ const onHide = () => {
 		:on-hide="onHide"
 	>
 		<div class="modal-body">
-			<div v-if="instance.linked_data" class="mod-card">
+			<div v-if="instance.link" class="mod-card">
 				<div class="table">
 					<div class="table-row with-columns table-head">
 						<div class="table-cell table-text download-cell" />
diff --git a/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue b/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue
index 7fbc731fd6..851cf1be0e 100644
--- a/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue
+++ b/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue
@@ -6,16 +6,16 @@ import dayjs from 'dayjs'
 import { onUnmounted, ref } from 'vue'
 
 import NavButton from '@/components/ui/NavButton.vue'
-import { profile_listener } from '@/helpers/events.js'
-import { list } from '@/helpers/profile'
+import { instance_listener } from '@/helpers/events.js'
+import { list } from '@/helpers/instance'
 
 const { handleError } = injectNotificationManager()
 
 const recentInstances = ref([])
 const getInstances = async () => {
-	const profiles = await list().catch(handleError)
+	const instances = await list().catch(handleError)
 
-	recentInstances.value = profiles
+	recentInstances.value = instances
 		.sort((a, b) => {
 			const dateACreated = dayjs(a.created)
 			const dateAPlayed = a.last_played ? dayjs(a.last_played) : dayjs(0)
@@ -37,24 +37,24 @@ const getInstances = async () => {
 
 await getInstances()
 
-const unlistenProfile = await profile_listener(async (event) => {
+const unlistenInstance = await instance_listener(async (event) => {
 	if (event.event !== 'synced') {
 		await getInstances()
 	}
 })
 
 onUnmounted(() => {
-	unlistenProfile()
+	unlistenInstance()
 })
 </script>
 
 <template>
 	<div v-for="instance in recentInstances" :key="instance.id" v-tooltip.right="instance.name">
-		<NavButton :to="`/instance/${encodeURIComponent(instance.path)}`" class="relative">
+		<NavButton :to="`/instance/${encodeURIComponent(instance.id)}`" class="relative">
 			<Avatar
 				:src="instance.icon_path ? convertFileSrc(instance.icon_path) : null"
 				size="28px"
-				:tint-by="instance.path"
+				:tint-by="instance.id"
 				:class="`transition-all ${instance.install_stage !== 'installed' ? `brightness-[0.25] scale-[0.85]` : `group-hover:brightness-75`}`"
 			/>
 			<div
@@ -65,10 +65,7 @@ onUnmounted(() => {
 			</div>
 		</NavButton>
 	</div>
-	<div
-		v-if="instances && recentInstances.length > 0"
-		class="h-px w-6 mx-auto my-2 bg-divider"
-	></div>
+	<div v-if="recentInstances.length > 0" class="h-px w-6 mx-auto my-2 bg-divider"></div>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/apps/app-frontend/src/components/ui/install_flow/AddServerToInstanceModal.vue b/apps/app-frontend/src/components/ui/install_flow/AddServerToInstanceModal.vue
index 8b78062e50..d6383c059f 100644
--- a/apps/app-frontend/src/components/ui/install_flow/AddServerToInstanceModal.vue
+++ b/apps/app-frontend/src/components/ui/install_flow/AddServerToInstanceModal.vue
@@ -12,21 +12,21 @@ import { computed, ref } from 'vue'
 
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import { trackEvent } from '@/helpers/analytics'
-import { list } from '@/helpers/profile'
-import { add_server_to_profile, get_profile_worlds } from '@/helpers/worlds.ts'
+import { list } from '@/helpers/instance'
+import { add_server_to_instance, get_instance_worlds } from '@/helpers/worlds.ts'
 
 const { handleError } = injectNotificationManager()
 
 const modal = ref()
 const searchFilter = ref('')
-const profiles = ref([])
+const instances = ref([])
 
 const serverName = ref('')
 const serverAddress = ref('')
 
-const shownProfiles = computed(() =>
-	profiles.value.filter((profile) => {
-		return profile.name.toLowerCase().includes(searchFilter.value.toLowerCase())
+const shownInstances = computed(() =>
+	instances.value.filter((instance) => {
+		return instance.name.toLowerCase().includes(searchFilter.value.toLowerCase())
 	}),
 )
 
@@ -36,15 +36,15 @@ defineExpose({
 		serverAddress.value = address
 		searchFilter.value = ''
 
-		const profilesVal = await list().catch(handleError)
+		const instanceValues = await list().catch(handleError)
 		await Promise.allSettled(
-			profilesVal.map(async (profile) => {
-				profile.adding = false
-				profile.added = false
+			instanceValues.map(async (instance) => {
+				instance.adding = false
+				instance.added = false
 
 				try {
-					const worlds = await get_profile_worlds(profile.path)
-					profile.added = worlds.some(
+					const worlds = await get_instance_worlds(instance.id)
+					instance.added = worlds.some(
 						(w) => w.type === 'server' && w.address === serverAddress.value,
 					)
 				} catch {
@@ -53,28 +53,28 @@ defineExpose({
 			}),
 		)
 
-		profiles.value = profilesVal
+		instances.value = instanceValues
 		modal.value.show()
 
 		trackEvent('AddServerToInstanceStart', { source: 'AddServerToInstanceModal' })
 	},
 })
 
-async function addServer(profile) {
-	profile.adding = true
+async function addServer(instance) {
+	instance.adding = true
 	try {
-		await add_server_to_profile(profile.path, serverName.value, serverAddress.value, 'prompt')
-		profile.added = true
+		await add_server_to_instance(instance.id, serverName.value, serverAddress.value, 'prompt')
+		instance.added = true
 
 		trackEvent('AddServerToInstance', {
 			server_name: serverName.value,
-			instance_name: profile.name,
+			instance_name: instance.name,
 			source: 'AddServerToInstanceModal',
 		})
 	} catch (err) {
 		handleError(err)
 	}
-	profile.adding = false
+	instance.adding = false
 }
 </script>
 
@@ -91,26 +91,26 @@ async function addServer(profile) {
 			/>
 			<div class="max-h-[21rem] overflow-y-auto">
 				<div
-					v-for="profile in shownProfiles"
-					:key="profile.path"
+					v-for="instance in shownInstances"
+					:key="instance.id"
 					class="flex w-full items-center justify-between gap-2 bg-bg-raised text-icon shadow-none"
 				>
 					<router-link
 						class="btn btn-transparent p-2 text-left"
-						:to="`/instance/${encodeURIComponent(profile.path)}`"
+						:to="`/instance/${encodeURIComponent(instance.id)}`"
 						@click="modal.hide()"
 					>
 						<Avatar
-							:src="profile.icon_path ? convertFileSrc(profile.icon_path) : null"
+							:src="instance.icon_path ? convertFileSrc(instance.icon_path) : null"
 							class="mr-2 [--size:2rem]"
 						/>
-						{{ profile.name }}
+						{{ instance.name }}
 					</router-link>
 					<ButtonStyled>
-						<button :disabled="profile.added || profile.adding" @click="addServer(profile)">
-							<PlusIcon v-if="!profile.added && !profile.adding" />
-							<CheckIcon v-else-if="profile.added" />
-							{{ profile.adding ? 'Adding...' : profile.added ? 'Added' : 'Add' }}
+						<button :disabled="instance.added || instance.adding" @click="addServer(instance)">
+							<PlusIcon v-if="!instance.added && !instance.adding" />
+							<CheckIcon v-else-if="instance.added" />
+							{{ instance.adding ? 'Adding...' : instance.added ? 'Added' : 'Add' }}
 						</button>
 					</ButtonStyled>
 				</div>
diff --git a/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue
index e30bead729..11450497e4 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue
@@ -19,7 +19,7 @@ import { useRouter } from 'vue-router'
 
 import ConfirmDeleteInstanceModal from '@/components/ui/modal/ConfirmDeleteInstanceModal.vue'
 import { trackEvent } from '@/helpers/analytics'
-import { duplicate, edit, edit_icon, list, remove } from '@/helpers/profile'
+import { duplicate, edit, edit_icon, list, remove } from '@/helpers/instance'
 import { injectInstanceSettings } from '@/providers/instance-settings'
 
 import type { GameInstance } from '../../../helpers/types'
@@ -32,14 +32,14 @@ const queryClient = useQueryClient()
 const deleteConfirmModal = ref()
 
 const { instance } = injectInstanceSettings()
-type ReleaseChannel = GameInstance['preferred_update_channel']
+type ReleaseChannel = GameInstance['update_channel']
 const releaseChannelOptions: ReleaseChannel[] = ['release', 'beta', 'alpha']
 
 const title = ref(instance.value.name)
 const icon: Ref<string | undefined> = ref(instance.value.icon_path)
 const groups = ref([...instance.value.groups])
 const savingReleaseChannel = ref(false)
-const selectedReleaseChannel = ref<ReleaseChannel>(instance.value.preferred_update_channel)
+const selectedReleaseChannel = ref<ReleaseChannel>(instance.value.update_channel)
 const releaseChannelDisabledItems = computed<ReleaseChannel[]>(() =>
 	savingReleaseChannel.value ? [...releaseChannelOptions] : [],
 )
@@ -48,8 +48,8 @@ const newCategoryInput = ref('')
 
 const installing = computed(() => instance.value.install_stage !== 'installed')
 
-async function duplicateProfile() {
-	await duplicate(instance.value.path).catch(handleError)
+async function duplicateInstance() {
+	await duplicate(instance.value.id).catch(handleError)
 	trackEvent('InstanceDuplicate', {
 		loader: instance.value.loader,
 		game_version: instance.value.game_version,
@@ -84,22 +84,22 @@ function formatReleaseChannelDescription(channel: ReleaseChannel) {
 }
 
 watch(
-	() => [instance.value.path, instance.value.preferred_update_channel] as const,
+	() => [instance.value.id, instance.value.update_channel] as const,
 	() => {
 		if (!savingReleaseChannel.value) {
-			selectedReleaseChannel.value = instance.value.preferred_update_channel
+			selectedReleaseChannel.value = instance.value.update_channel
 		}
 	},
 )
 
 watch(selectedReleaseChannel, async (channel, previousChannel) => {
-	const previousReleaseChannel = previousChannel ?? instance.value.preferred_update_channel
-	if (channel === instance.value.preferred_update_channel) return
+	const previousReleaseChannel = previousChannel ?? instance.value.update_channel
+	if (channel === instance.value.update_channel) return
 
 	savingReleaseChannel.value = true
-	const profilePath = instance.value.path
-	await edit(profilePath, { preferred_update_channel: channel })
-		.then(() => queryClient.invalidateQueries({ queryKey: ['linkedModpackInfo', profilePath] }))
+	const instanceId = instance.value.id
+	await edit(instanceId, { update_channel: channel })
+		.then(() => queryClient.invalidateQueries({ queryKey: ['linkedModpackInfo', instanceId] }))
 		.catch((error) => {
 			selectedReleaseChannel.value = previousReleaseChannel
 			handleError(error)
@@ -109,7 +109,7 @@ watch(selectedReleaseChannel, async (channel, previousChannel) => {
 
 async function resetIcon() {
 	icon.value = undefined
-	await edit_icon(instance.value.path, null).catch(handleError)
+	await edit_icon(instance.value.id, null).catch(handleError)
 	trackEvent('InstanceRemoveIcon')
 }
 
@@ -127,12 +127,12 @@ async function setIcon() {
 	if (!value) return
 
 	icon.value = value
-	await edit_icon(instance.value.path, icon.value).catch(handleError)
+	await edit_icon(instance.value.id, icon.value).catch(handleError)
 
 	trackEvent('InstanceSetIcon')
 }
 
-const editProfileObject = computed(() => ({
+const editInstanceObject = computed(() => ({
 	name: title.value.trim().substring(0, 32) ?? 'Instance',
 	groups: groups.value.map((x) => x.trim().substring(0, 32)).filter((x) => x.length > 0),
 }))
@@ -158,15 +158,15 @@ watch(
 	[title, groups, groups],
 	async () => {
 		if (removing.value) return
-		await edit(instance.value.path, editProfileObject.value).catch(handleError)
+		await edit(instance.value.id, editInstanceObject.value).catch(handleError)
 	},
 	{ deep: true },
 )
 
 const removing = ref(false)
-async function removeProfile() {
+async function removeInstance() {
 	removing.value = true
-	const path = instance.value.path
+	const path = instance.value.id
 
 	trackEvent('InstanceRemove', {
 		loader: instance.value.loader,
@@ -284,7 +284,7 @@ const messages = defineMessages({
 </script>
 
 <template>
-	<ConfirmDeleteInstanceModal ref="deleteConfirmModal" @delete="removeProfile" />
+	<ConfirmDeleteInstanceModal ref="deleteConfirmModal" @delete="removeInstance" />
 	<div class="block">
 		<div class="float-end ml-10 relative group w-fit">
 			<div class="flex flex-col gap-1">
@@ -310,7 +310,7 @@ const messages = defineMessages({
 							:src="icon ? convertFileSrc(icon) : icon"
 							size="108px"
 							class="transition-[filter] group-hover:brightness-75"
-							:tint-by="instance.path"
+							:tint-by="instance.id"
 							no-shadow
 						/>
 						<div
@@ -350,7 +350,7 @@ const messages = defineMessages({
 						aria-labelledby="duplicate-instance-label"
 						:disabled="installing"
 						class="w-max !shadow-none"
-						@click="duplicateProfile"
+						@click="duplicateInstance"
 					>
 						<CopyIcon /> {{ formatMessage(messages.duplicateButton) }}
 					</button>
diff --git a/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue
index 51305aa539..bfd016d940 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue
@@ -8,7 +8,7 @@ import {
 } from '@modrinth/ui'
 import { computed, ref, watch } from 'vue'
 
-import { edit } from '@/helpers/profile'
+import { edit } from '@/helpers/instance'
 import { get } from '@/helpers/settings.ts'
 import { injectInstanceSettings } from '@/providers/instance-settings'
 
@@ -28,21 +28,21 @@ const overrideHooks = ref(
 )
 const hooks = ref(instance.value.hooks ?? globalSettings.hooks)
 
-const editProfileObject = computed(() => {
-	const editProfile: {
+const editInstanceObject = computed(() => {
+	const editInstancePatch: {
 		hooks?: Hooks
 	} = {}
 
 	// When hooks are not overridden per-instance, we want to clear them
-	editProfile.hooks = overrideHooks.value ? hooks.value : {}
+	editInstancePatch.hooks = overrideHooks.value ? hooks.value : {}
 
-	return editProfile
+	return editInstancePatch
 })
 
 watch(
 	[overrideHooks, hooks],
 	async () => {
-		await edit(instance.value.path, editProfileObject.value)
+		await edit(instance.value.id, editInstanceObject.value)
 	},
 	{ deep: true },
 )
diff --git a/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
index a9edf12ef3..4c856f78a4 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
@@ -17,7 +17,6 @@ import { computed, ref, shallowRef } from 'vue'
 
 import { trackEvent } from '@/helpers/analytics'
 import { get_project_versions, get_version } from '@/helpers/cache'
-import { get_loader_versions } from '@/helpers/metadata'
 import {
 	duplicate,
 	edit,
@@ -26,7 +25,8 @@ import {
 	list,
 	update_managed_modrinth_version,
 	update_repair_modrinth,
-} from '@/helpers/profile'
+} from '@/helpers/instance'
+import { get_loader_versions } from '@/helpers/metadata'
 import { get_game_versions, get_loaders } from '@/helpers/tags'
 import { injectInstanceSettings } from '@/providers/instance-settings'
 
@@ -40,7 +40,7 @@ const debug = useDebugLogger('AppInstallationSettings')
 const { instance, offline, isMinecraftServer, onUnlinked, closeModal } = injectInstanceSettings()
 
 debug('metadata load: start', {
-	instancePath: instance.value.path,
+	instancePath: instance.value.id,
 	loader: instance.value.loader,
 	gameVersion: instance.value.game_version,
 	installStage: instance.value.install_stage,
@@ -91,9 +91,9 @@ debug('metadata load: done', {
 })
 
 const { data: modpackInfo } = useQuery({
-	queryKey: computed(() => ['linkedModpackInfo', instance.value.path]),
-	queryFn: () => get_linked_modpack_info(instance.value.path, 'must_revalidate'),
-	enabled: computed(() => !!instance.value.linked_data?.project_id && !offline),
+	queryKey: computed(() => ['linkedModpackInfo', instance.value.id]),
+	queryFn: () => get_linked_modpack_info(instance.value.id, 'must_revalidate'),
+	enabled: computed(() => !!instance.value.link?.project_id && !offline),
 })
 
 const repairing = ref(false)
@@ -125,17 +125,17 @@ function getManifest(loader: string) {
 provideAppBackup({
 	async createBackup() {
 		debug('createBackup: start', {
-			instancePath: instance.value.path,
+			instancePath: instance.value.id,
 			instanceName: instance.value.name,
 		})
-		const allProfiles = await list()
+		const allInstances = await list()
 		const prefix = `${instance.value.name} - Backup #`
-		const existingNums = allProfiles
+		const existingNums = allInstances
 			.filter((p) => p.name.startsWith(prefix))
 			.map((p) => parseInt(p.name.slice(prefix.length), 10))
 			.filter((n) => !isNaN(n))
 		const nextNum = existingNums.length > 0 ? Math.max(...existingNums) + 1 : 1
-		const newPath = await duplicate(instance.value.path)
+		const newPath = await duplicate(instance.value.id)
 		await edit(newPath, { name: `${prefix}${nextNum}` })
 		debug('createBackup: done', { newPath, backupName: `${prefix}${nextNum}` })
 	},
@@ -165,7 +165,11 @@ provideInstallationSettings({
 		}
 		return rows
 	}),
-	isLinked: computed(() => !!instance.value.linked_data?.locked),
+	isLinked: computed(
+		() =>
+			instance.value.link?.type === 'modrinth_modpack' ||
+			instance.value.link?.type === 'server_project_modpack',
+	),
 	isBusy: computed(
 		() =>
 			instance.value.install_stage !== 'installed' ||
@@ -255,25 +259,25 @@ provideInstallationSettings({
 
 	async save(platform, gameVersion, loaderVersionId) {
 		debug('save: called', {
-			instancePath: instance.value.path,
+			instancePath: instance.value.id,
 			platform,
 			gameVersion,
 			loaderVersionId,
 		})
-		const editProfile: Record<string, string | undefined> = {
+		const editInstancePatch: Record<string, string | undefined> = {
 			loader: platform,
 			game_version: gameVersion,
 		}
 		if (platform !== 'vanilla' && loaderVersionId) {
-			editProfile.loader_version = loaderVersionId
+			editInstancePatch.loader_version = loaderVersionId
 		}
-		await edit(instance.value.path, editProfile).catch(handleError)
-		debug('save: edit complete', { editProfile })
+		await edit(instance.value.id, editInstancePatch).catch(handleError)
+		debug('save: edit complete', { editInstancePatch })
 	},
 
 	afterSave: async () => {
-		debug('afterSave: installing', { instancePath: instance.value.path })
-		await install(instance.value.path, false).catch(handleError)
+		debug('afterSave: installing', { instancePath: instance.value.id })
+		await install(instance.value.id, false).catch(handleError)
 		trackEvent('InstanceRepair', {
 			loader: instance.value.loader,
 			game_version: instance.value.game_version,
@@ -282,9 +286,9 @@ provideInstallationSettings({
 	},
 
 	async repair() {
-		debug('repair: called', { instancePath: instance.value.path })
+		debug('repair: called', { instancePath: instance.value.id })
 		repairing.value = true
-		await install(instance.value.path, true).catch(handleError)
+		await install(instance.value.id, true).catch(handleError)
 		repairing.value = false
 		trackEvent('InstanceRepair', {
 			loader: instance.value.loader,
@@ -294,9 +298,9 @@ provideInstallationSettings({
 	},
 
 	async reinstallModpack() {
-		debug('reinstallModpack: called', { instancePath: instance.value.path })
+		debug('reinstallModpack: called', { instancePath: instance.value.id })
 		reinstalling.value = true
-		await update_repair_modrinth(instance.value.path).catch(handleError)
+		await update_repair_modrinth(instance.value.id).catch(handleError)
 		reinstalling.value = false
 		trackEvent('InstanceRepair', {
 			loader: instance.value.loader,
@@ -306,12 +310,12 @@ provideInstallationSettings({
 	},
 
 	async unlinkModpack() {
-		debug('unlinkModpack: called', { instancePath: instance.value.path })
-		await edit(instance.value.path, {
-			linked_data: null as unknown as undefined,
+		debug('unlinkModpack: called', { instancePath: instance.value.id })
+		await edit(instance.value.id, {
+			link: null as unknown as undefined,
 		})
 		await queryClient.invalidateQueries({
-			queryKey: ['linkedModpackInfo', instance.value.path],
+			queryKey: ['linkedModpackInfo', instance.value.id],
 		})
 		onUnlinked()
 		debug('unlinkModpack: done')
@@ -320,11 +324,9 @@ provideInstallationSettings({
 	getCachedModpackVersions: () => null,
 	async fetchModpackVersions() {
 		debug('fetchModpackVersions: called', {
-			projectId: instance.value.linked_data?.project_id,
+			projectId: instance.value.link?.project_id,
 		})
-		const versions = await get_project_versions(instance.value.linked_data!.project_id!).catch(
-			handleError,
-		)
+		const versions = await get_project_versions(instance.value.link!.project_id!).catch(handleError)
 		debug('fetchModpackVersions: done', { count: versions?.length ?? 0 })
 		return (versions ?? []) as Labrinth.Versions.v2.Version[]
 	},
@@ -339,19 +341,18 @@ provideInstallationSettings({
 	async onModpackVersionConfirm(version) {
 		debug('onModpackVersionConfirm: called', {
 			versionId: version.id,
-			instancePath: instance.value.path,
+			instancePath: instance.value.id,
 		})
-		await update_managed_modrinth_version(instance.value.path, version.id)
+		await update_managed_modrinth_version(instance.value.id, version.id)
 		await queryClient.invalidateQueries({
-			queryKey: ['linkedModpackInfo', instance.value.path],
+			queryKey: ['linkedModpackInfo', instance.value.id],
 		})
 		debug('onModpackVersionConfirm: done')
 	},
 
 	updaterModalProps: computed(() => ({
 		isApp: true,
-		currentVersionId:
-			modpackInfo.value?.update_version_id ?? instance.value.linked_data?.version_id ?? '',
+		currentVersionId: modpackInfo.value?.update_version_id ?? instance.value.link?.version_id ?? '',
 		projectIconUrl: modpackInfo.value?.project?.icon_url,
 		projectName: modpackInfo.value?.project?.title ?? 'Modpack',
 		currentGameVersion: instance.value.game_version,
diff --git a/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
index 46fdf20335..71e4449937 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
@@ -23,7 +23,7 @@ import { computed, readonly, ref, watch } from 'vue'
 import JavaDetectionModal from '@/components/ui/JavaDetectionModal.vue'
 import useJavaTest from '@/composables/useJavaTest'
 import useMemorySlider from '@/composables/useMemorySlider'
-import { edit, get_optimal_jre_key } from '@/helpers/profile'
+import { edit, get_optimal_jre_key } from '@/helpers/instance'
 import { get } from '@/helpers/settings.ts'
 import { injectInstanceSettings } from '@/providers/instance-settings'
 
@@ -36,7 +36,7 @@ const { instance } = injectInstanceSettings()
 
 const globalSettings = (await get().catch(handleError)) as unknown as AppSettings
 
-const optimalJava = readonly(await get_optimal_jre_key(instance.value.path).catch(handleError))
+const optimalJava = readonly(await get_optimal_jre_key(instance.value.id).catch(handleError))
 
 const overrideJavaInstall = ref(!!instance.value.java_path)
 const javaPath = ref(instance.value.java_path ?? optimalJava?.path ?? '')
@@ -104,7 +104,7 @@ const { maxMemory, snapPoints } = (await useMemorySlider().catch(handleError)) a
 	snapPoints: number[]
 }
 
-const editProfileObject = computed(() => {
+const editInstanceObject = computed(() => {
 	return {
 		java_path:
 			overrideJavaInstall.value && javaPath.value
@@ -136,7 +136,7 @@ watch(
 		memory,
 	],
 	async () => {
-		await edit(instance.value.path, editProfileObject.value)
+		await edit(instance.value.id, editInstanceObject.value)
 	},
 	{ deep: true },
 )
diff --git a/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue
index 08e350885e..925a22a3de 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue
@@ -9,7 +9,7 @@ import {
 } from '@modrinth/ui'
 import { computed, type Ref, ref, watch } from 'vue'
 
-import { edit } from '@/helpers/profile'
+import { edit } from '@/helpers/instance'
 import { get } from '@/helpers/settings.ts'
 import { injectInstanceSettings } from '@/providers/instance-settings'
 
@@ -32,7 +32,7 @@ const fullscreenSetting: Ref<boolean> = ref(
 	instance.value.force_fullscreen ?? globalSettings.force_fullscreen,
 )
 
-const editProfileObject = computed(() => {
+const editInstanceObject = computed(() => {
 	if (!overrideWindowSettings.value) {
 		return {
 			force_fullscreen: null,
@@ -48,7 +48,7 @@ const editProfileObject = computed(() => {
 watch(
 	[overrideWindowSettings, resolution, fullscreenSetting],
 	async () => {
-		await edit(instance.value.path, editProfileObject.value)
+		await edit(instance.value.id, editInstanceObject.value)
 	},
 	{ deep: true },
 )
diff --git a/apps/app-frontend/src/components/ui/modal/InstanceModalTitlePrefix.vue b/apps/app-frontend/src/components/ui/modal/InstanceModalTitlePrefix.vue
index a1ce6f0fcb..8f02662c6d 100644
--- a/apps/app-frontend/src/components/ui/modal/InstanceModalTitlePrefix.vue
+++ b/apps/app-frontend/src/components/ui/modal/InstanceModalTitlePrefix.vue
@@ -14,7 +14,7 @@ defineProps<{
 		<Avatar
 			:src="instance.icon_path ? convertFileSrc(instance.icon_path) : undefined"
 			size="24px"
-			:tint-by="instance.path"
+			:tint-by="instance.id"
 		/>
 		{{ instance.name }} <ChevronRightIcon />
 	</span>
diff --git a/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue b/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue
index e5253948c7..630b68896e 100644
--- a/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue
@@ -26,7 +26,7 @@ import InstallationSettings from '@/components/ui/instance_settings/Installation
 import JavaSettings from '@/components/ui/instance_settings/JavaSettings.vue'
 import WindowSettings from '@/components/ui/instance_settings/WindowSettings.vue'
 import { get_project_v3 } from '@/helpers/cache'
-import { get_linked_modpack_info } from '@/helpers/profile'
+import { get_linked_modpack_info } from '@/helpers/instance'
 import { provideInstanceSettings } from '@/providers/instance-settings'
 
 import type { GameInstance } from '../../../helpers/types'
@@ -64,8 +64,8 @@ watch(
 	() => props.instance,
 	(instance) => {
 		isMinecraftServer.value = false
-		if (instance.linked_data?.project_id) {
-			get_project_v3(instance.linked_data.project_id, 'must_revalidate')
+		if (instance.link?.project_id) {
+			get_project_v3(instance.link.project_id, 'must_revalidate')
 				.then((project: Labrinth.Projects.v3.Project | undefined) => {
 					if (project?.minecraft_server != null) {
 						isMinecraftServer.value = true
@@ -121,10 +121,10 @@ const tabs = computed<TabbedModalTab[]>(() => [
 ])
 
 function show(tabIndex?: number) {
-	if (props.instance.linked_data?.project_id) {
+	if (props.instance.link?.project_id) {
 		queryClient.prefetchQuery({
-			queryKey: ['linkedModpackInfo', props.instance.path],
-			queryFn: () => get_linked_modpack_info(props.instance.path, 'stale_while_revalidate'),
+			queryKey: ['linkedModpackInfo', props.instance.id],
+			queryFn: () => get_linked_modpack_info(props.instance.id, 'stale_while_revalidate'),
 		})
 	}
 	tabbedModal.value?.show()
@@ -147,7 +147,7 @@ defineExpose({ show, hide })
 				<Avatar
 					:src="instance.icon_path ? convertFileSrc(instance.icon_path) : undefined"
 					size="24px"
-					:tint-by="props.instance.path"
+					:tint-by="props.instance.id"
 				/>
 				{{ instance.name }} <ChevronRightIcon />
 				<span class="font-extrabold text-contrast">{{
diff --git a/apps/app-frontend/src/components/ui/modal/ModpackAlreadyInstalledModal.vue b/apps/app-frontend/src/components/ui/modal/ModpackAlreadyInstalledModal.vue
index 1fdf7e60dc..007a4a84e2 100644
--- a/apps/app-frontend/src/components/ui/modal/ModpackAlreadyInstalledModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/ModpackAlreadyInstalledModal.vue
@@ -68,17 +68,17 @@ const messages = defineMessages({
 })
 
 const emit = defineEmits<{
-	(e: 'go-to-instance', instancePath: string): void
+	(e: 'go-to-instance', instanceId: string): void
 	(e: 'create-anyway'): void
 }>()
 
 const modal = ref<InstanceType<typeof NewModal>>()
 const instanceName = ref('')
-const instancePath = ref('')
+const instanceId = ref('')
 
-function show(name: string, path: string) {
+function show(name: string, id: string) {
 	instanceName.value = name
-	instancePath.value = path
+	instanceId.value = id
 	modal.value?.show()
 }
 
@@ -88,7 +88,7 @@ function handleCancel() {
 
 function handleGoToInstance() {
 	modal.value?.hide()
-	emit('go-to-instance', instancePath.value)
+	emit('go-to-instance', instanceId.value)
 }
 
 function handleCreateAnyway() {
diff --git a/apps/app-frontend/src/components/ui/modal/UpdateToPlayModal.vue b/apps/app-frontend/src/components/ui/modal/UpdateToPlayModal.vue
index acbd9d3f30..9e5cf758b2 100644
--- a/apps/app-frontend/src/components/ui/modal/UpdateToPlayModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/UpdateToPlayModal.vue
@@ -31,7 +31,7 @@ import dayjs from 'dayjs'
 import { computed, ref, watch } from 'vue'
 
 import { get_project_many, get_version, get_version_many } from '@/helpers/cache.js'
-import { update_managed_modrinth_version } from '@/helpers/profile'
+import { update_managed_modrinth_version } from '@/helpers/instance'
 import type { GameInstance } from '@/helpers/types'
 import { injectServerInstall } from '@/providers/server-install'
 
@@ -202,15 +202,15 @@ async function computeDependencyDiffs(
 }
 
 async function checkUpdateAvailable(inst: GameInstance): Promise<DependencyDiff[] | null> {
-	if (!inst.linked_data) return null
-	if (!modpackVersionId.value || !inst.linked_data.version_id) return null
+	if (!inst.link) return null
+	if (!modpackVersionId.value || !inst.link.version_id) return null
 
 	try {
-		// For server projects, linked_data.project_id is the server project but
-		// linked_data.version_id references a content modpack version from a different project.
-		// Detect this by comparing the version's project_id with linked_data.project_id.
+		// For server projects, link.project_id is the server project but
+		// link.version_id references a content modpack version from a different project.
+		// Detect this by comparing the version's project_id with link.project_id.
 		modpackVersion.value = await get_version(modpackVersionId.value, 'bypass')
-		const instanceModpackVersion = await get_version(inst.linked_data.version_id, 'bypass')
+		const instanceModpackVersion = await get_version(inst.link.version_id, 'bypass')
 
 		// Compute dependency diffs between current and latest version
 		if (instanceModpackVersion && modpackVersion.value) {
@@ -238,11 +238,11 @@ watch(
 
 async function handleUpdate() {
 	hide()
-	const serverProjectId = instance.value?.linked_data?.project_id
+	const serverProjectId = instance.value?.link?.project_id
 	if (serverProjectId) startInstallingServer(serverProjectId)
 	try {
 		if (modpackVersionId.value && instance.value) {
-			await update_managed_modrinth_version(instance.value.path, modpackVersionId.value)
+			await update_managed_modrinth_version(instance.value.id, modpackVersionId.value)
 			await onUpdateComplete.value()
 		}
 	} catch (error) {
@@ -253,10 +253,8 @@ async function handleUpdate() {
 }
 
 function handleReport() {
-	if (instance.value?.linked_data?.project_id) {
-		openUrl(
-			`https://modrinth.com/report?item=project&itemID=${instance.value.linked_data.project_id}`,
-		)
+	if (instance.value?.link?.project_id) {
+		openUrl(`https://modrinth.com/report?item=project&itemID=${instance.value.link.project_id}`)
 	}
 }
 
@@ -297,11 +295,8 @@ const messages = defineMessages({
 })
 
 const hasUpdate = computed(() => {
-	if (!instance.value?.linked_data) return false
-	return (
-		modpackVersionId.value != null &&
-		modpackVersionId.value !== instance.value.linked_data.version_id
-	)
+	if (!instance.value?.link) return false
+	return modpackVersionId.value != null && modpackVersionId.value !== instance.value.link.version_id
 })
 
 defineExpose({ show, hide, hasUpdate })
diff --git a/apps/app-frontend/src/components/ui/world/InstanceItem.vue b/apps/app-frontend/src/components/ui/world/InstanceItem.vue
index 3de1801d4c..f76801f9c2 100644
--- a/apps/app-frontend/src/components/ui/world/InstanceItem.vue
+++ b/apps/app-frontend/src/components/ui/world/InstanceItem.vue
@@ -27,10 +27,10 @@ import { useRouter } from 'vue-router'
 import { trackEvent } from '@/helpers/analytics'
 import { get_project } from '@/helpers/cache'
 import { process_listener } from '@/helpers/events'
-import { get_by_profile_path } from '@/helpers/process'
-import { kill, run } from '@/helpers/profile'
+import { kill, run } from '@/helpers/instance'
+import { get_by_instance_id } from '@/helpers/process'
 import type { GameInstance } from '@/helpers/types'
-import { showProfileInFolder } from '@/helpers/utils'
+import { showInstanceInFolder } from '@/helpers/utils'
 import { handleSevereError } from '@/store/error'
 
 const { handleError } = injectNotificationManager()
@@ -52,13 +52,13 @@ const props = defineProps<{
 	last_played: Dayjs
 }>()
 
-const loadingModpack = ref(!!props.instance.linked_data)
+const loadingModpack = ref(!!props.instance.link)
 
 const modpack = ref()
 
-if (props.instance.linked_data) {
+if (props.instance.link) {
 	nextTick().then(async () => {
-		modpack.value = await get_project(props.instance.linked_data?.project_id, 'must_revalidate')
+		modpack.value = await get_project(props.instance.link?.project_id, 'must_revalidate')
 		loadingModpack.value = false
 	})
 }
@@ -81,8 +81,8 @@ const playing = ref(false)
 const play = async (event: MouseEvent) => {
 	event?.stopPropagation()
 	loading.value = true
-	await run(props.instance.path)
-		.catch((err) => handleSevereError(err, { profilePath: props.instance.path }))
+	await run(props.instance.id)
+		.catch((err) => handleSevereError(err, { instanceId: props.instance.id }))
 		.finally(() => {
 			trackEvent('InstanceStart', {
 				loader: props.instance.loader,
@@ -97,7 +97,7 @@ const play = async (event: MouseEvent) => {
 const stop = async (event: MouseEvent) => {
 	event?.stopPropagation()
 	loading.value = true
-	await kill(props.instance.path).catch(handleError)
+	await kill(props.instance.id).catch(handleError)
 	trackEvent('InstanceStop', {
 		loader: props.instance.loader,
 		game_version: props.instance.game_version,
@@ -112,7 +112,7 @@ const unlistenProcesses = await process_listener(async () => {
 })
 
 const checkProcess = async () => {
-	const runningProcesses = await get_by_profile_path(props.instance.path).catch(handleError)
+	const runningProcesses = await get_by_instance_id(props.instance.id).catch(handleError)
 
 	playing.value = runningProcesses.length > 0
 }
@@ -130,7 +130,7 @@ onUnmounted(() => {
 		<template #clickable>
 			<router-link
 				class="no-click-animation"
-				:to="`/instance/${encodeURIComponent(instance.path)}`"
+				:to="`/instance/${encodeURIComponent(instance.id)}`"
 			/>
 		</template>
 		<div
@@ -138,7 +138,7 @@ onUnmounted(() => {
 		>
 			<Avatar
 				:src="instanceIcon ? convertFileSrc(instanceIcon) : undefined"
-				:tint-by="instance.path"
+				:tint-by="instance.id"
 				size="48px"
 			/>
 			<div class="flex flex-col col-span-2 justify-between h-full">
@@ -206,12 +206,12 @@ onUnmounted(() => {
 						:options="[
 							{
 								id: 'open-instance',
-								shown: !!instance.path,
-								action: () => router.push(encodeURI(`/instance/${instance.path}`)),
+								shown: !!instance.id,
+								action: () => router.push(encodeURI(`/instance/${instance.id}`)),
 							},
 							{
 								id: 'open-folder',
-								action: () => showProfileInFolder(instance.path),
+								action: () => showInstanceInFolder(instance.id),
 							},
 						]"
 					>
diff --git a/apps/app-frontend/src/components/ui/world/RecentWorldsList.vue b/apps/app-frontend/src/components/ui/world/RecentWorldsList.vue
index a091552566..09a44bc266 100644
--- a/apps/app-frontend/src/components/ui/world/RecentWorldsList.vue
+++ b/apps/app-frontend/src/components/ui/world/RecentWorldsList.vue
@@ -10,13 +10,13 @@ import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 import InstanceItem from '@/components/ui/world/InstanceItem.vue'
 import WorldItem from '@/components/ui/world/WorldItem.vue'
 import { trackEvent } from '@/helpers/analytics'
-import { process_listener, profile_listener } from '@/helpers/events'
+import { instance_listener, process_listener } from '@/helpers/events'
+import { kill, run } from '@/helpers/instance'
 import { get_all } from '@/helpers/process'
-import { kill, run } from '@/helpers/profile'
 import { get_game_versions } from '@/helpers/tags'
 import type { GameInstance } from '@/helpers/types'
 import {
-	get_profile_protocol_version,
+	get_instance_protocol_version,
 	get_recent_worlds,
 	getWorldIdentifier,
 	hasServerQuickPlaySupport,
@@ -27,7 +27,7 @@ import {
 	type ServerWorld,
 	start_join_server,
 	start_join_singleplayer_world,
-	type WorldWithProfile,
+	type WorldWithInstance,
 } from '@/helpers/worlds.ts'
 import { handleSevereError } from '@/store/error'
 import { useTheming } from '@/store/theme.ts'
@@ -66,7 +66,7 @@ type InstanceJumpBackInItem = BaseJumpBackInItem & {
 
 type WorldJumpBackInItem = BaseJumpBackInItem & {
 	type: 'world'
-	world: WorldWithProfile
+	world: WorldWithInstance
 }
 
 type JumpBackInItem = InstanceJumpBackInItem | WorldJumpBackInItem
@@ -100,7 +100,7 @@ async function populateJumpBackIn() {
 		const worlds = await get_recent_worlds(MAX_JUMP_BACK_IN, ['normal', 'favorite'])
 
 		worlds.forEach((world) => {
-			const instance = props.recentInstances.find((instance) => instance.path === world.profile)
+			const instance = props.recentInstances.find((instance) => instance.id === world.instance_id)
 
 			if (!instance || !world.last_played) {
 				return
@@ -115,23 +115,23 @@ async function populateJumpBackIn() {
 		})
 
 		const servers: {
-			instancePath: string
+			instanceId: string
 			address: string
 		}[] = worldItems
 			.filter((item) => item.world.type === 'server' && item.instance)
 			.map((item) => ({
-				instancePath: item.instance.path,
+				instanceId: item.instance.id,
 				address: (item.world as ServerWorld).address,
 			}))
 
 		// fetch protocol versions for all unique MC versions with server worlds
-		const uniqueServerInstances = new Set<string>(servers.map((x) => x.instancePath))
+		const uniqueServerInstances = new Set<string>(servers.map((x) => x.instanceId))
 		await Promise.all(
-			[...uniqueServerInstances].map((path) =>
-				get_profile_protocol_version(path)
-					.then((protoVer) => (protocolVersions.value[path] = protoVer))
+			[...uniqueServerInstances].map((instanceId) =>
+				get_instance_protocol_version(instanceId)
+					.then((protoVer) => (protocolVersions.value[instanceId] = protoVer))
 					.catch(() => {
-						console.error(`Failed to get profile protocol for: ${path} `)
+						console.error(`Failed to get instance protocol for: ${instanceId} `)
 					}),
 			),
 		)
@@ -145,14 +145,14 @@ async function populateJumpBackIn() {
 			}
 		})
 
-		servers.forEach(({ instancePath, address }) =>
-			refreshServerData(serverData.value[address], protocolVersions.value[instancePath], address),
+		servers.forEach(({ instanceId, address }) =>
+			refreshServerData(serverData.value[address], protocolVersions.value[instanceId], address),
 		)
 	}
 
 	const instanceItems: InstanceJumpBackInItem[] = []
 	for (const instance of props.recentInstances) {
-		const worldItem = worldItems.find((item) => item.instance.path === instance.path)
+		const worldItem = worldItems.find((item) => item.instance.id === instance.id)
 		if ((worldItem && worldItem.last_played.isAfter(TWO_WEEKS_AGO)) || !instance.last_played) {
 			continue
 		}
@@ -171,14 +171,14 @@ async function populateJumpBackIn() {
 		.slice(0, MAX_JUMP_BACK_IN)
 }
 
-function refreshServer(address: string, instancePath: string) {
-	refreshServerData(serverData.value[address], protocolVersions.value[instancePath], address)
+function refreshServer(address: string, instanceId: string) {
+	refreshServerData(serverData.value[address], protocolVersions.value[instanceId], address)
 }
 
-async function joinWorld(world: WorldWithProfile, instance?: GameInstance) {
+async function joinWorld(world: WorldWithInstance, instance?: GameInstance) {
 	console.log(`Joining world ${getWorldIdentifier(world)}`)
 	if (world.type === 'server') {
-		await start_join_server(world.profile, world.address).catch(handleError)
+		await start_join_server(world.instance_id, world.address).catch(handleError)
 		if (instance) {
 			trackEvent('InstanceStart', {
 				loader: instance.loader,
@@ -187,13 +187,13 @@ async function joinWorld(world: WorldWithProfile, instance?: GameInstance) {
 			})
 		}
 	} else if (world.type === 'singleplayer') {
-		await start_join_singleplayer_world(world.profile, world.path).catch(handleError)
+		await start_join_singleplayer_world(world.instance_id, world.path).catch(handleError)
 	}
 }
 
 async function playInstance(instance: GameInstance) {
-	await run(instance.path)
-		.catch((err) => handleSevereError(err, { profilePath: instance.path }))
+	await run(instance.id)
+		.catch((err) => handleSevereError(err, { instanceId: instance.id }))
 		.finally(() => {
 			trackEvent('InstanceStart', {
 				loader: instance.loader,
@@ -210,14 +210,14 @@ async function stopInstance(path: string) {
 	})
 }
 
-const currentProfile = ref<string>()
+const currentInstance = ref<string>()
 const currentWorld = ref<string>()
 
 const unlistenProcesses = await process_listener(async () => {
 	await checkProcesses()
 })
 
-const unlistenProfiles = await profile_listener(async () => {
+const unlistenInstances = await instance_listener(async () => {
 	await populateJumpBackIn().catch(() => {
 		console.error('Failed to populate jump back in')
 	})
@@ -227,18 +227,18 @@ const runningInstances = ref<string[]>([])
 
 type ProcessMetadata = {
 	uuid: string
-	profile_path: string
+	instance_id: string
 	start_time: string
 }
 
 const checkProcesses = async () => {
 	const runningProcesses: ProcessMetadata[] = await get_all().catch(handleError)
 
-	const runningPaths = runningProcesses.map((x) => x.profile_path)
+	const runningPaths = runningProcesses.map((x) => x.instance_id)
 
 	const stoppedInstances = runningInstances.value.filter((x) => !runningPaths.includes(x))
-	if (currentProfile.value && stoppedInstances.includes(currentProfile.value)) {
-		currentProfile.value = undefined
+	if (currentInstance.value && stoppedInstances.includes(currentInstance.value)) {
+		currentInstance.value = undefined
 		currentWorld.value = undefined
 	}
 
@@ -252,7 +252,7 @@ onMounted(() => {
 
 onUnmounted(() => {
 	unlistenProcesses()
-	unlistenProfiles()
+	unlistenInstances()
 })
 </script>
 
@@ -278,14 +278,14 @@ onUnmounted(() => {
 		<div class="grid-when-huge flex flex-col w-full gap-2">
 			<template
 				v-for="item in jumpBackInItems"
-				:key="`${item.instance.path}-${item.type === 'world' ? getWorldIdentifier(item.world) : 'instance'}`"
+				:key="`${item.instance.id}-${item.type === 'world' ? getWorldIdentifier(item.world) : 'instance'}`"
 			>
 				<WorldItem
 					v-if="item.type === 'world'"
 					:world="item.world"
-					:playing-instance="runningInstances.includes(item.instance.path)"
+					:playing-instance="runningInstances.includes(item.instance.id)"
 					:playing-world="
-						currentProfile === item.instance.path && currentWorld === getWorldIdentifier(item.world)
+						currentInstance === item.instance.id && currentWorld === getWorldIdentifier(item.world)
 					"
 					:refreshing="
 						item.world.type === 'server'
@@ -306,34 +306,34 @@ onUnmounted(() => {
 					:rendered-motd="
 						item.world.type === 'server' ? serverData[item.world.address].renderedMotd : undefined
 					"
-					:current-protocol="protocolVersions[item.instance.path]"
+					:current-protocol="protocolVersions[item.instance.id]"
 					:game-mode="
 						item.world.type === 'singleplayer' ? GAME_MODES[item.world.game_mode] : undefined
 					"
-					:instance-path="item.instance.path"
+					:instance-id="item.instance.id"
 					:instance-name="item.instance.name"
 					:instance-icon="item.instance.icon_path"
 					@refresh="
 						() =>
 							item.world.type === 'server'
-								? refreshServer(item.world.address, item.instance.path)
+								? refreshServer(item.world.address, item.instance.id)
 								: {}
 					"
 					@update="() => populateJumpBackIn()"
 					@play="
 						() => {
-							currentProfile = item.instance.path
+							currentInstance = item.instance.id
 							currentWorld = getWorldIdentifier(item.world)
 							joinWorld(item.world, item.instance)
 						}
 					"
 					@play-instance="
 						() => {
-							currentProfile = item.instance.path
+							currentInstance = item.instance.id
 							playInstance(item.instance)
 						}
 					"
-					@stop="() => stopInstance(item.instance.path)"
+					@stop="() => stopInstance(item.instance.id)"
 				/>
 				<InstanceItem v-else :instance="item.instance" :last_played="item.last_played" />
 			</template>
diff --git a/apps/app-frontend/src/components/ui/world/WorldItem.vue b/apps/app-frontend/src/components/ui/world/WorldItem.vue
index ba4597bd58..1f599c0e4f 100644
--- a/apps/app-frontend/src/components/ui/world/WorldItem.vue
+++ b/apps/app-frontend/src/components/ui/world/WorldItem.vue
@@ -91,7 +91,7 @@ const props = withDefaults(
 		managed?: boolean
 
 		// Instance
-		instancePath?: string
+		instanceId?: string
 		instanceName?: string
 		instanceIcon?: string
 	}>(),
@@ -110,7 +110,7 @@ const props = withDefaults(
 		gameMode: undefined,
 		managed: false,
 
-		instancePath: undefined,
+		instanceId: undefined,
 		instanceName: undefined,
 		instanceIcon: undefined,
 	},
@@ -209,10 +209,10 @@ const messages = defineMessages({
 </script>
 <template>
 	<SmartClickable>
-		<template v-if="instancePath" #clickable>
+		<template v-if="instanceId" #clickable>
 			<router-link
 				class="no-click-animation"
-				:to="`/instance/${encodeURIComponent(instancePath)}/worlds?highlight=${encodeURIComponent(getWorldIdentifier(world))}`"
+				:to="`/instance/${encodeURIComponent(instanceId)}/worlds?highlight=${encodeURIComponent(getWorldIdentifier(world))}`"
 			/>
 		</template>
 		<div
@@ -324,16 +324,16 @@ const messages = defineMessages({
 						</template>
 						<template v-else> {{ formatMessage(messages.notPlayedYet) }} </template>
 					</div>
-					<template v-if="instancePath">
+					<template v-if="instanceId">
 						•
 						<router-link
 							class="flex items-center gap-1 truncate hover:underline text-secondary smart-clickable:allow-pointer-events"
-							:to="`/instance/${instancePath}`"
+							:to="`/instance/${instanceId}`"
 						>
 							<Avatar
 								:src="instanceIcon ? convertFileSrc(instanceIcon) : undefined"
 								size="16px"
-								:tint-by="instancePath"
+								:tint-by="instanceId"
 								class="shrink-0"
 							/>
 							<span class="truncate">{{ instanceName }}</span>
@@ -420,14 +420,14 @@ const messages = defineMessages({
 						:options="[
 							{
 								id: 'play-instance',
-								shown: !!instancePath,
+								shown: !!instanceId,
 								disabled: playingInstance,
 								action: () => emit('play-instance'),
 							},
 							{
 								id: 'open-instance',
-								shown: !!instancePath,
-								action: () => router.push(encodeURI(`/instance/${instancePath}`)),
+								shown: !!instanceId,
+								action: () => router.push(`/instance/${encodeURIComponent(instanceId)}`),
 							},
 							{
 								id: 'refresh',
@@ -442,7 +442,7 @@ const messages = defineMessages({
 							{
 								id: 'edit',
 								action: () => emit('edit'),
-								shown: !instancePath,
+								shown: !instanceId,
 								disabled: locked || managed,
 								tooltip: locked
 									? formatMessage(messages.worldInUse)
@@ -457,14 +457,14 @@ const messages = defineMessages({
 							},
 							{
 								divider: true,
-								shown: !!instancePath,
+								shown: !!instanceId,
 							},
 							{
 								id: 'dont-show-on-home',
-								shown: !!instancePath,
+								shown: !!instanceId,
 								action: () => {
 									set_world_display_status(
-										instancePath,
+										instanceId,
 										world.type,
 										getWorldIdentifier(world),
 										'hidden',
@@ -475,14 +475,14 @@ const messages = defineMessages({
 							},
 							{
 								divider: true,
-								shown: !instancePath,
+								shown: !instanceId,
 							},
 							{
 								id: 'delete',
 								color: 'red',
 								hoverFilled: true,
 								action: () => emit('delete'),
-								shown: !instancePath,
+								shown: !instanceId,
 								disabled: locked || managed,
 								tooltip: locked
 									? formatMessage(messages.worldInUse)
diff --git a/apps/app-frontend/src/components/ui/world/modal/AddServerModal.vue b/apps/app-frontend/src/components/ui/world/modal/AddServerModal.vue
index 0afcc632eb..c1679ae0b5 100644
--- a/apps/app-frontend/src/components/ui/world/modal/AddServerModal.vue
+++ b/apps/app-frontend/src/components/ui/world/modal/AddServerModal.vue
@@ -12,7 +12,11 @@ import { ref } from 'vue'
 
 import ServerModalBody from '@/components/ui/world/modal/ServerModalBody.vue'
 import type { GameInstance } from '@/helpers/types'
-import { add_server_to_profile, type ServerPackStatus, type ServerWorld } from '@/helpers/worlds.ts'
+import {
+	add_server_to_instance,
+	type ServerPackStatus,
+	type ServerWorld,
+} from '@/helpers/worlds.ts'
 
 const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
@@ -35,8 +39,8 @@ async function addServer(play: boolean) {
 	const serverName = name.value ? name.value : address.value
 	const resourcePackStatus = resourcePack.value
 	const index =
-		(await add_server_to_profile(
-			props.instance.path,
+		(await add_server_to_instance(
+			props.instance.id,
 			serverName,
 			address.value,
 			resourcePackStatus,
diff --git a/apps/app-frontend/src/components/ui/world/modal/EditServerModal.vue b/apps/app-frontend/src/components/ui/world/modal/EditServerModal.vue
index 3cdd48b06f..ce541cce4e 100644
--- a/apps/app-frontend/src/components/ui/world/modal/EditServerModal.vue
+++ b/apps/app-frontend/src/components/ui/world/modal/EditServerModal.vue
@@ -15,7 +15,7 @@ import ServerModalBody from '@/components/ui/world/modal/ServerModalBody.vue'
 import type { GameInstance } from '@/helpers/types'
 import {
 	type DisplayStatus,
-	edit_server_in_profile,
+	edit_server_in_instance,
 	type ServerPackStatus,
 	type ServerWorld,
 	set_world_display_status,
@@ -46,8 +46,8 @@ const newDisplayStatus = computed(() => (hideFromHome.value ? 'hidden' : 'normal
 async function saveServer() {
 	const serverName = name.value ? name.value : address.value
 	const resourcePackStatus = resourcePack.value
-	await edit_server_in_profile(
-		props.instance.path,
+	await edit_server_in_instance(
+		props.instance.id,
 		index.value,
 		serverName,
 		address.value,
@@ -56,7 +56,7 @@ async function saveServer() {
 
 	if (newDisplayStatus.value !== displayStatus.value) {
 		await set_world_display_status(
-			props.instance.path,
+			props.instance.id,
 			'server',
 			address.value,
 			newDisplayStatus.value,
diff --git a/apps/app-frontend/src/components/ui/world/modal/EditSingleplayerWorldModal.vue b/apps/app-frontend/src/components/ui/world/modal/EditSingleplayerWorldModal.vue
index 8ad4887724..b611ce4a5f 100644
--- a/apps/app-frontend/src/components/ui/world/modal/EditSingleplayerWorldModal.vue
+++ b/apps/app-frontend/src/components/ui/world/modal/EditSingleplayerWorldModal.vue
@@ -40,14 +40,14 @@ const hideFromHome = ref(false)
 const newDisplayStatus = computed(() => (hideFromHome.value ? 'hidden' : 'normal'))
 
 async function saveWorld() {
-	await rename_world(props.instance.path, path.value, name.value).catch(handleError)
+	await rename_world(props.instance.id, path.value, name.value).catch(handleError)
 
 	if (removeIcon.value) {
-		await reset_world_icon(props.instance.path, path.value).catch(handleError)
+		await reset_world_icon(props.instance.id, path.value).catch(handleError)
 	}
 	if (newDisplayStatus.value !== displayStatus.value) {
 		await set_world_display_status(
-			props.instance.path,
+			props.instance.id,
 			'singleplayer',
 			path.value,
 			newDisplayStatus.value,
diff --git a/apps/app-frontend/src/composables/browse/use-app-server-browse.ts b/apps/app-frontend/src/composables/browse/use-app-server-browse.ts
index 1a0fe431d2..7e78a2545a 100644
--- a/apps/app-frontend/src/composables/browse/use-app-server-browse.ts
+++ b/apps/app-frontend/src/composables/browse/use-app-server-browse.ts
@@ -8,10 +8,10 @@ import { onUnmounted, ref, shallowRef } from 'vue'
 import type { Router } from 'vue-router'
 
 import { process_listener } from '@/helpers/events'
-import { get_by_profile_path } from '@/helpers/process'
-import { kill, list as listInstances } from '@/helpers/profile.js'
+import { kill, list as listInstances } from '@/helpers/instance'
+import { get_by_instance_id } from '@/helpers/process'
 import type { GameInstance } from '@/helpers/types'
-import { add_server_to_profile, getServerLatency } from '@/helpers/worlds'
+import { add_server_to_instance, getServerLatency } from '@/helpers/worlds'
 import { getServerAddress } from '@/store/install.js'
 
 interface BrowseServerInstance {
@@ -83,13 +83,11 @@ export function useAppServerBrowse(options: UseAppServerBrowseOptions) {
 		})
 		const newRunning: Record<string, string> = {}
 		for (const hit of hits) {
-			const inst = packs.find(
-				(pack: GameInstance) => pack.linked_data?.project_id === hit.project_id,
-			)
+			const inst = packs.find((pack: GameInstance) => pack.link?.project_id === hit.project_id)
 			if (inst) {
-				const processes = await get_by_profile_path(inst.path).catch(() => [])
+				const processes = await get_by_instance_id(inst.id).catch(() => [])
 				if (Array.isArray(processes) && processes.length > 0) {
-					newRunning[hit.project_id] = inst.path
+					newRunning[hit.project_id] = inst.id
 				}
 			}
 		}
@@ -99,9 +97,9 @@ export function useAppServerBrowse(options: UseAppServerBrowseOptions) {
 
 	async function handleStopServerProject(projectId: string) {
 		debugLog('handleStopServerProject', projectId)
-		const instancePath = runningServerProjects.value[projectId]
-		if (!instancePath) return
-		await kill(instancePath).catch(() => {})
+		const instanceId = runningServerProjects.value[projectId]
+		if (!instanceId) return
+		await kill(instanceId).catch(() => {})
 		const { [projectId]: _, ...rest } = runningServerProjects.value
 		runningServerProjects.value = rest
 	}
@@ -119,8 +117,8 @@ export function useAppServerBrowse(options: UseAppServerBrowseOptions) {
 
 		if (options.instance.value) {
 			try {
-				await add_server_to_profile(
-					options.instance.value.path,
+				await add_server_to_instance(
+					options.instance.value.id,
 					project.name,
 					address,
 					'prompt',
@@ -289,11 +287,11 @@ export function useAppServerBrowse(options: UseAppServerBrowseOptions) {
 		}
 	}
 
-	process_listener((event: { event: string; profile_path_id: string }) => {
+	process_listener((event: { event: string; instance_id: string }) => {
 		debugLog('process event', event)
 		if (event.event === 'finished') {
 			const projectId = Object.entries(runningServerProjects.value).find(
-				([, path]) => path === event.profile_path_id,
+				([, path]) => path === event.instance_id,
 			)?.[0]
 			if (projectId) {
 				const { [projectId]: _, ...rest } = runningServerProjects.value
diff --git a/apps/app-frontend/src/composables/useInstanceConsole.ts b/apps/app-frontend/src/composables/useInstanceConsole.ts
index c0a0b66ef4..3ca97c210a 100644
--- a/apps/app-frontend/src/composables/useInstanceConsole.ts
+++ b/apps/app-frontend/src/composables/useInstanceConsole.ts
@@ -22,8 +22,8 @@ interface InstanceConsoleEntry {
 
 const instances = new Map<string, InstanceConsoleEntry>()
 
-function getOrCreate(profilePathId: string): InstanceConsoleEntry {
-	let entry = instances.get(profilePathId)
+function getOrCreate(instanceId: string): InstanceConsoleEntry {
+	let entry = instances.get(instanceId)
 	if (entry) return entry
 
 	entry = {
@@ -32,22 +32,22 @@ function getOrCreate(profilePathId: string): InstanceConsoleEntry {
 		historicalCache: new Map(),
 		logList: null,
 	}
-	instances.set(profilePathId, entry)
+	instances.set(instanceId, entry)
 	return entry
 }
 
-async function hydrate(profilePathId: string): Promise<void> {
-	const entry = getOrCreate(profilePathId)
+async function hydrate(instanceId: string): Promise<void> {
+	const entry = getOrCreate(instanceId)
 	if (entry.liveConsole.output.value.length > 0) return
 
-	const buffer = await get_live_log_buffer(profilePathId)
+	const buffer = await get_live_log_buffer(instanceId)
 	if (buffer) {
 		entry.liveConsole.addLegacyLog(buffer)
 	}
 }
 
-async function getHistoricalLogs(profilePathId: string, instancePath: string): Promise<LogEntry[]> {
-	const entry = getOrCreate(profilePathId)
+async function getHistoricalLogs(instanceId: string, instancePath: string): Promise<LogEntry[]> {
+	const entry = getOrCreate(instanceId)
 	if (entry.logList) return entry.logList
 
 	const logs: LogEntry[] = await get_logs(instancePath, true)
@@ -62,38 +62,38 @@ async function getHistoricalLogs(profilePathId: string, instancePath: string): P
 	return logs
 }
 
-function getHistoricalContent(profilePathId: string, filename: string): string | undefined {
-	return instances.get(profilePathId)?.historicalCache.get(filename)
+function getHistoricalContent(instanceId: string, filename: string): string | undefined {
+	return instances.get(instanceId)?.historicalCache.get(filename)
 }
 
-function invalidate(profilePathId: string): void {
-	const entry = instances.get(profilePathId)
+function invalidate(instanceId: string): void {
+	const entry = instances.get(instanceId)
 	if (!entry) return
 	entry.historicalCache.clear()
 	entry.logList = null
 }
 
-async function clearLive(profilePathId: string): Promise<void> {
-	const entry = getOrCreate(profilePathId)
+async function clearLive(instanceId: string): Promise<void> {
+	const entry = getOrCreate(instanceId)
 	entry.liveConsole.clear()
-	await clear_log_buffer(profilePathId).catch(() => {})
+	await clear_log_buffer(instanceId).catch(() => {})
 }
 
-async function destroy(profilePathId: string): Promise<void> {
-	instances.delete(profilePathId)
-	await clear_log_buffer(profilePathId).catch(() => {})
+async function destroy(instanceId: string): Promise<void> {
+	instances.delete(instanceId)
+	await clear_log_buffer(instanceId).catch(() => {})
 }
 
-export function useInstanceConsole(profilePathId: string) {
-	const entry = getOrCreate(profilePathId)
+export function useInstanceConsole(instanceId: string) {
+	const entry = getOrCreate(instanceId)
 	return {
 		liveConsole: entry.liveConsole,
 		historicalConsole: entry.historicalConsole,
-		hydrate: () => hydrate(profilePathId),
-		getHistoricalLogs: (instancePath: string) => getHistoricalLogs(profilePathId, instancePath),
-		getHistoricalContent: (filename: string) => getHistoricalContent(profilePathId, filename),
-		invalidate: () => invalidate(profilePathId),
-		clearLive: () => clearLive(profilePathId),
-		destroy: () => destroy(profilePathId),
+		hydrate: () => hydrate(instanceId),
+		getHistoricalLogs: (instancePath: string) => getHistoricalLogs(instanceId, instancePath),
+		getHistoricalContent: (filename: string) => getHistoricalContent(instanceId, filename),
+		invalidate: () => invalidate(instanceId),
+		clearLive: () => clearLive(instanceId),
+		destroy: () => destroy(instanceId),
 	}
 }
diff --git a/apps/app-frontend/src/helpers/auth.js b/apps/app-frontend/src/helpers/auth.js
index 0201f6b641..94bd13e386 100644
--- a/apps/app-frontend/src/helpers/auth.js
+++ b/apps/app-frontend/src/helpers/auth.js
@@ -1,6 +1,6 @@
 /**
  * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
  *  and deserialized into a usable JS object.
  */
 import { invoke } from '@tauri-apps/api/core'
diff --git a/apps/app-frontend/src/helpers/events.js b/apps/app-frontend/src/helpers/events.js
index 3ed1b2d779..166edee7d0 100644
--- a/apps/app-frontend/src/helpers/events.js
+++ b/apps/app-frontend/src/helpers/events.js
@@ -31,8 +31,8 @@ import { listen } from '@tauri-apps/api/event'
           pack_name: name of the pack
           pack_id, optional, the id of the modpack
           pack_version, optional, the version of the modpack
-          profile_name: name of the profile
-          profile_uuid: unique identification of the profile
+          instance_name: name of the instance
+          instance_id: unique identification of the instance
 
         }
         loader_uuid: unique identification of the loading bar
@@ -57,18 +57,15 @@ export async function process_listener(callback) {
 	return await listen('process', (event) => callback(event.payload))
 }
 
-/// Payload for the 'profile' event
+/// Payload for the 'instance' event
 /*
-    ProfilePayload {
-        uuid: unique identification of the process in the state (currently identified by path, but that will change)
-        name: name of the profile
-        profile_path: relative path toprofile_listener profile (used for path identification)
-        path: path to profile (used for opening the profile in the OS file explorer)
+    InstancePayload {
+        instance_id: unique identification of the instance
         event: event type ("Created", "Added", "Edited", "Removed")
     }
 */
-export async function profile_listener(callback) {
-	return await listen('profile', (event) => callback(event.payload))
+export async function instance_listener(callback) {
+	return await listen('instance', (event) => callback(event.payload))
 }
 
 /// Payload for the 'command' event
@@ -105,7 +102,7 @@ export async function notification_listener(callback) {
 /// Payload for the 'log' event
 /*
     LogPayload {
-        profile_path_id: string,
+        instance_id: string,
         type: "log4j" | "legacy",
         // log4j fields (when type === "log4j"):
         timestamp_millis?: number,
diff --git a/apps/app-frontend/src/helpers/friends.ts b/apps/app-frontend/src/helpers/friends.ts
index 96effddd98..7fd27b5a88 100644
--- a/apps/app-frontend/src/helpers/friends.ts
+++ b/apps/app-frontend/src/helpers/friends.ts
@@ -8,7 +8,7 @@ import type { ModrinthCredentials } from '@/helpers/mr_auth'
 
 export type UserStatus = {
 	user_id: string
-	profile_name: string | null
+	instance_name: string | null
 	last_update: string
 }
 
diff --git a/apps/app-frontend/src/helpers/import.js b/apps/app-frontend/src/helpers/import.js
index f14ccca90f..59b7a77942 100644
--- a/apps/app-frontend/src/helpers/import.js
+++ b/apps/app-frontend/src/helpers/import.js
@@ -1,11 +1,11 @@
 /**
  * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
  *  and deserialized into a usable JS object.
  */
 import { invoke } from '@tauri-apps/api/core'
 
-import { create } from './profile'
+import { create } from './instance'
 
 /*
   API for importing instances from other launchers
@@ -32,15 +32,14 @@ export async function get_importable_instances(launcherType, basePath) {
 }
 
 /// Import an instance from a launcher type and base path
-/// eg: import_instance("profile-name-to-go-to", "MultiMC", "C:/MultiMC", "Instance 1")
 export async function import_instance(launcherType, basePath, instanceFolder) {
 	// create a basic, empty instance (most properties will be filled in by the import process)
 	// We do NOT watch the fs for changes to avoid duplicate events during installation
 	// fs watching will be enabled once the instance is imported
-	const profilePath = await create(instanceFolder, '1.19.4', 'vanilla', 'latest', null, true)
+	const instanceId = await create(instanceFolder, '1.19.4', 'vanilla', 'latest', null, true)
 
 	return await invoke('plugin:import|import_instance', {
-		profilePath,
+		instanceId,
 		launcherType,
 		basePath,
 		instanceFolder,
diff --git a/apps/app-frontend/src/helpers/instance-content.ts b/apps/app-frontend/src/helpers/instance-content.ts
index d3451d9191..f9f386febf 100644
--- a/apps/app-frontend/src/helpers/instance-content.ts
+++ b/apps/app-frontend/src/helpers/instance-content.ts
@@ -10,7 +10,7 @@ import {
 	get_content_items,
 	get_linked_modpack_info,
 	type LinkedModpackInfo,
-} from '@/helpers/profile'
+} from '@/helpers/instance'
 import { get_categories } from '@/helpers/tags.js'
 import type { CacheBehaviour } from '@/helpers/types'
 
diff --git a/apps/app-frontend/src/helpers/instance.ts b/apps/app-frontend/src/helpers/instance.ts
new file mode 100644
index 0000000000..be330d0fc4
--- /dev/null
+++ b/apps/app-frontend/src/helpers/instance.ts
@@ -0,0 +1,314 @@
+/**
+ * All theseus API calls return serialized values (both return values and errors);
+ * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
+ *  and deserialized into a usable JS object.
+ */
+import type { Labrinth } from '@modrinth/api-client'
+import type { ContentItem, ContentOwner } from '@modrinth/ui'
+import { invoke } from '@tauri-apps/api/core'
+
+import { install_to_existing_instance } from '@/helpers/pack'
+
+import type {
+	CacheBehaviour,
+	ContentFile,
+	ContentFileProjectType,
+	GameInstance,
+	InstanceLink,
+	InstanceLoader,
+} from './types'
+
+// Add instance
+/*
+    name: String,           // the name of the instance
+    game_version: String,   // the game version of the instance
+    modloader: ModLoader,   // the modloader to use
+    - ModLoader is an enum, with the following variants: Vanilla, Forge, Fabric, Quilt
+    loader_version: String, // the modloader version to use, set to "latest", "stable", or the ID of your chosen loader
+    icon: Path,  // the icon for the instance
+*/
+
+export async function create(
+	name: string,
+	gameVersion: string,
+	modloader: InstanceLoader,
+	loaderVersion: string | null,
+	icon: string | null,
+	skipInstall: boolean,
+	link?: InstanceLink | null,
+): Promise<string> {
+	// Trim string name to avoid "Unable to find directory"
+	name = name.trim()
+	return await invoke('plugin:instance|instance_create', {
+		name,
+		gameVersion,
+		modloader,
+		loaderVersion,
+		icon,
+		skipInstall,
+		link,
+	})
+}
+
+export async function duplicate(instanceId: string): Promise<string> {
+	return await invoke('plugin:instance|instance_duplicate', { instanceId })
+}
+
+export async function remove(instanceId: string): Promise<void> {
+	return await invoke('plugin:instance|instance_remove', { instanceId })
+}
+
+export async function get(instanceId: string): Promise<GameInstance | null> {
+	return await invoke('plugin:instance|instance_get', { instanceId })
+}
+
+export async function get_many(instanceIds: string[]): Promise<GameInstance[]> {
+	return await invoke('plugin:instance|instance_get_many', { instanceIds })
+}
+
+export async function get_projects(
+	instanceId: string,
+	cacheBehaviour?: CacheBehaviour,
+): Promise<Record<string, ContentFile>> {
+	return await invoke('plugin:instance|instance_get_projects', { instanceId, cacheBehaviour })
+}
+
+export async function get_installed_project_ids(instanceId: string): Promise<string[]> {
+	return await invoke('plugin:instance|instance_get_installed_project_ids', { instanceId })
+}
+
+// Get content items with rich metadata for an instance
+// Returns content items filtered to exclude modpack files (if linked),
+// sorted alphabetically by project name
+export async function get_content_items(
+	instanceId: string,
+	cacheBehaviour?: CacheBehaviour,
+): Promise<ContentItem[]> {
+	return await invoke('plugin:instance|instance_get_content_items', { instanceId, cacheBehaviour })
+}
+
+// Linked modpack info returned from backend
+export interface LinkedModpackInfo {
+	project: Labrinth.Projects.v2.Project
+	version: Labrinth.Versions.v2.Version
+	owner: ContentOwner | null
+	has_update: boolean
+	update_version_id: string | null
+	update_version: Labrinth.Versions.v2.Version | null
+}
+
+// Get linked modpack info for an instance
+// Returns project, version, and owner information for the linked modpack,
+// or null if the instance is not linked to a modpack
+export async function get_linked_modpack_info(
+	instanceId: string,
+	cacheBehaviour?: CacheBehaviour,
+): Promise<LinkedModpackInfo | null> {
+	return await invoke('plugin:instance|instance_get_linked_modpack_info', {
+		instanceId,
+		cacheBehaviour,
+	})
+}
+
+// Get content items that are part of the linked modpack
+// Returns the modpack's dependencies as ContentItem list
+// Returns empty array if the instance is not linked to a modpack
+export async function get_linked_modpack_content(
+	instanceId: string,
+	cacheBehaviour?: CacheBehaviour,
+): Promise<ContentItem[]> {
+	return await invoke('plugin:instance|instance_get_linked_modpack_content', {
+		instanceId,
+		cacheBehaviour,
+	})
+}
+
+// Convert a list of dependencies into ContentItems with rich metadata
+export async function get_dependencies_as_content_items(
+	dependencies: Labrinth.Versions.v3.Dependency[],
+	cacheBehaviour?: CacheBehaviour,
+): Promise<ContentItem[]> {
+	return await invoke('plugin:instance|instance_get_dependencies_as_content_items', {
+		dependencies,
+		cacheBehaviour,
+	})
+}
+
+export async function get_full_path(instanceId: string): Promise<string> {
+	return await invoke('plugin:instance|instance_get_full_path', { instanceId })
+}
+
+export async function get_mod_full_path(instanceId: string, projectPath: string): Promise<string> {
+	return await invoke('plugin:instance|instance_get_mod_full_path', { instanceId, projectPath })
+}
+
+export interface JavaVersion {
+	parsed_version: number
+	version: string
+	architecture: string
+	path: string
+}
+
+export async function get_optimal_jre_key(instanceId: string): Promise<JavaVersion | null> {
+	return await invoke('plugin:instance|instance_get_optimal_jre_key', { instanceId })
+}
+
+export async function list(): Promise<GameInstance[]> {
+	return await invoke('plugin:instance|instance_list')
+}
+
+export async function check_installed(instanceId: string, projectId: string): Promise<boolean> {
+	return await invoke('plugin:instance|instance_check_installed', { instanceId, projectId })
+}
+
+export async function check_installed_batch(projectId: string): Promise<Record<string, boolean>> {
+	return await invoke('plugin:instance|instance_check_installed_batch', { projectId })
+}
+
+export async function install(instanceId: string, force: boolean): Promise<void> {
+	return await invoke('plugin:instance|instance_install', { instanceId, force })
+}
+
+export async function update_all(instanceId: string): Promise<Record<string, string>> {
+	return await invoke('plugin:instance|instance_update_all', { instanceId })
+}
+
+// Updates a specified project
+export async function update_project(instanceId: string, projectPath: string): Promise<string> {
+	return await invoke('plugin:instance|instance_update_project', { instanceId, projectPath })
+}
+
+// Add a project to an instance from a version
+// Returns a path to the new project file
+export type DownloadReason = 'standalone' | 'dependency' | 'modpack' | 'update'
+
+export async function add_project_from_version(
+	instanceId: string,
+	versionId: string,
+	reason: DownloadReason,
+	dependentOnVersionId?: string,
+): Promise<string> {
+	return await invoke('plugin:instance|instance_add_project_from_version', {
+		instanceId,
+		versionId,
+		reason,
+		dependentOnVersionId,
+	})
+}
+
+// Add a project to an instance from a path + project_type
+// Returns a path to the new project file
+export async function add_project_from_path(
+	instanceId: string,
+	projectPath: string,
+	projectType?: ContentFileProjectType,
+): Promise<string> {
+	return await invoke('plugin:instance|instance_add_project_from_path', {
+		instanceId,
+		projectPath,
+		projectType,
+	})
+}
+
+// Toggle disabling a project
+export async function toggle_disable_project(
+	instanceId: string,
+	projectPath: string,
+): Promise<string> {
+	return await invoke('plugin:instance|instance_toggle_disable_project', {
+		instanceId,
+		projectPath,
+	})
+}
+
+// Remove a project
+export async function remove_project(instanceId: string, projectPath: string): Promise<void> {
+	return await invoke('plugin:instance|instance_remove_project', { instanceId, projectPath })
+}
+
+// Update a managed Modrinth instance to a specific version
+export async function update_managed_modrinth_version(
+	instanceId: string,
+	versionId: string,
+): Promise<void> {
+	return await invoke('plugin:instance|instance_update_managed_modrinth_version', {
+		instanceId,
+		versionId,
+	})
+}
+
+// Repair a managed Modrinth instance
+export async function update_repair_modrinth(instanceId: string): Promise<void> {
+	return await invoke('plugin:instance|instance_repair_managed_modrinth', { instanceId })
+}
+
+// Export an instance to .mrpack
+// included_overrides is an array of paths to override folders to include (ie: 'mods', 'resource_packs')
+// Version id is optional (ie: 1.1.5)
+export async function export_instance_mrpack(
+	instanceId: string,
+	exportLocation: string,
+	includedOverrides: string[],
+	versionId?: string,
+	description?: string,
+	name?: string,
+): Promise<void> {
+	return await invoke('plugin:instance|instance_export_mrpack', {
+		instanceId,
+		exportLocation,
+		includedOverrides,
+		versionId,
+		description,
+		name,
+	})
+}
+
+// Given a folder path, populate an array of all the subfolders
+// Intended to be used for finding potential override folders
+// profile
+// -- mods
+// -- resourcepacks
+// -- file1
+// => [mods, resourcepacks]
+// allows selection for 'included_overrides' in export_instance_mrpack
+export async function get_pack_export_candidates(instanceId: string): Promise<string[]> {
+	return await invoke('plugin:instance|instance_get_pack_export_candidates', { instanceId })
+}
+
+// Run Minecraft using an instance
+// Returns PID of child
+export async function run(
+	instanceId: string,
+	serverAddress: string | null = null,
+): Promise<unknown> {
+	return await invoke('plugin:instance|instance_run', { instanceId, serverAddress })
+}
+
+export async function kill(instanceId: string): Promise<void> {
+	return await invoke('plugin:instance|instance_kill', { instanceId })
+}
+
+// Edits an instance
+export async function edit(instanceId: string, editInstance: Partial<GameInstance>): Promise<void> {
+	return await invoke('plugin:instance|instance_edit', { instanceId, editInstance })
+}
+
+// Edits an instance's icon
+export async function edit_icon(instanceId: string, iconPath: string | null): Promise<void> {
+	return await invoke('plugin:instance|instance_edit_icon', { instanceId, iconPath })
+}
+
+export async function finish_install(instance: GameInstance): Promise<void> {
+	if (instance.install_stage !== 'pack_installed') {
+		if (instance.link) {
+			await install_to_existing_instance(
+				instance.link.project_id ?? instance.link.server_project_id ?? '',
+				instance.link.version_id ?? instance.link.content_version_id ?? '',
+				instance.name,
+				instance.id,
+			)
+		}
+	} else {
+		await install(instance.id, false)
+	}
+}
diff --git a/apps/app-frontend/src/helpers/jre.js b/apps/app-frontend/src/helpers/jre.js
index 4be5ff020e..21af5847e1 100644
--- a/apps/app-frontend/src/helpers/jre.js
+++ b/apps/app-frontend/src/helpers/jre.js
@@ -1,6 +1,6 @@
 /**
  * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
  *  and deserialized into a usable JS object.
  */
 import { invoke } from '@tauri-apps/api/core'
diff --git a/apps/app-frontend/src/helpers/logs.js b/apps/app-frontend/src/helpers/logs.js
index 3a57360628..843e572882 100644
--- a/apps/app-frontend/src/helpers/logs.js
+++ b/apps/app-frontend/src/helpers/logs.js
@@ -1,6 +1,6 @@
 /**
  * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
  *  and deserialized into a usable JS object.
  */
 import { invoke } from '@tauri-apps/api/core'
@@ -14,41 +14,41 @@ pub struct Logs {
 }
 */
 
-/// Get all logs that exist for a given profile
+/// Get all logs that exist for a given instance
 /// This is returned as an array of Log objects, sorted by filename (the folder name, when the log was created)
-export async function get_logs(profilePath, clearContents) {
-	return await invoke('plugin:logs|logs_get_logs', { profilePath, clearContents })
+export async function get_logs(instanceId, clearContents) {
+	return await invoke('plugin:logs|logs_get_logs', { instanceId, clearContents })
 }
 
-/// Get a profile's log by filename
-export async function get_logs_by_filename(profilePath, logType, filename) {
-	return await invoke('plugin:logs|logs_get_logs_by_filename', { profilePath, logType, filename })
+/// Get an instance's log by filename
+export async function get_logs_by_filename(instanceId, logType, filename) {
+	return await invoke('plugin:logs|logs_get_logs_by_filename', { instanceId, logType, filename })
 }
 
-/// Get a profile's log text only by filename
-export async function get_output_by_filename(profilePath, logType, filename) {
+/// Get an instance's log text only by filename
+export async function get_output_by_filename(instanceId, logType, filename) {
 	return await invoke('plugin:logs|logs_get_output_by_filename', {
-		profilePath,
+		instanceId,
 		logType,
 		filename,
 	})
 }
 
-/// Delete a profile's log by filename
-export async function delete_logs_by_filename(profilePath, logType, filename) {
+/// Delete an instance's log by filename
+export async function delete_logs_by_filename(instanceId, logType, filename) {
 	return await invoke('plugin:logs|logs_delete_logs_by_filename', {
-		profilePath,
+		instanceId,
 		logType,
 		filename,
 	})
 }
 
-/// Delete all logs for a given profile
-export async function delete_logs(profilePath) {
-	return await invoke('plugin:logs|logs_delete_logs', { profilePath })
+/// Delete all logs for a given instance
+export async function delete_logs(instanceId) {
+	return await invoke('plugin:logs|logs_delete_logs', { instanceId })
 }
 
-/// Get the latest log for a given profile and cursor (startpoint to read withi nthe file)
+/// Get the latest log for a given instance and cursor (startpoint to read within the file)
 /// Returns:
 /*
   {
@@ -59,16 +59,16 @@ export async function delete_logs(profilePath) {
 */
 
 // From latest.log directly
-export async function get_latest_log_cursor(profilePath, cursor) {
-	return await invoke('plugin:logs|logs_get_latest_log_cursor', { profilePath, cursor })
+export async function get_latest_log_cursor(instanceId, cursor) {
+	return await invoke('plugin:logs|logs_get_latest_log_cursor', { instanceId, cursor })
 }
 
-/// Get all buffered live log lines for a profile from the Rust ring buffer
-export async function get_live_log_buffer(profilePath) {
-	return await invoke('plugin:logs|logs_get_live_log_buffer', { profilePath })
+/// Get all buffered live log lines for an instance from the Rust ring buffer
+export async function get_live_log_buffer(instanceId) {
+	return await invoke('plugin:logs|logs_get_live_log_buffer', { instanceId })
 }
 
-/// Clear the live log buffer for a profile on the Rust side
-export async function clear_log_buffer(profilePath) {
-	return await invoke('plugin:logs|logs_clear_live_log_buffer', { profilePath })
+/// Clear the live log buffer for an instance on the Rust side
+export async function clear_log_buffer(instanceId) {
+	return await invoke('plugin:logs|logs_clear_live_log_buffer', { instanceId })
 }
diff --git a/apps/app-frontend/src/helpers/mr_auth.ts b/apps/app-frontend/src/helpers/mr_auth.ts
index dfb476d2cc..d28ad63db4 100644
--- a/apps/app-frontend/src/helpers/mr_auth.ts
+++ b/apps/app-frontend/src/helpers/mr_auth.ts
@@ -1,6 +1,6 @@
 /**
  * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
  *  and deserialized into a usable JS object.
  */
 import { invoke } from '@tauri-apps/api/core'
diff --git a/apps/app-frontend/src/helpers/pack.ts b/apps/app-frontend/src/helpers/pack.ts
index b5a05610e2..17899100ad 100644
--- a/apps/app-frontend/src/helpers/pack.ts
+++ b/apps/app-frontend/src/helpers/pack.ts
@@ -1,9 +1,9 @@
 import { invoke } from '@tauri-apps/api/core'
 
-import { create } from './profile'
+import { create } from './instance'
 import type { InstanceLoader } from './types'
 
-interface PackProfileCreator {
+interface PackInstanceCreator {
 	name: string
 	gameVersion: string
 	modloader: InstanceLoader
@@ -24,12 +24,12 @@ interface PackLocationFile {
 	path: string
 }
 
-export async function create_profile_and_install(
+export async function create_instance_and_install(
 	projectId: string,
 	versionId: string,
 	packTitle: string,
 	iconUrl?: string,
-	createInstanceCallback: (profile: string) => void = () => {},
+	createInstanceCallback: (instanceId: string) => void = () => {},
 ): Promise<void> {
 	const location: PackLocationVersionId = {
 		type: 'fromVersionId',
@@ -38,28 +38,33 @@ export async function create_profile_and_install(
 		title: packTitle,
 		icon_url: iconUrl,
 	}
-	const profile_creator = await invoke<PackProfileCreator>(
-		'plugin:pack|pack_get_profile_from_pack',
+	const instanceCreator = await invoke<PackInstanceCreator>(
+		'plugin:pack|pack_get_instance_from_pack',
 		{ location },
 	)
-	const profile = await create(
-		profile_creator.name,
-		profile_creator.gameVersion,
-		profile_creator.modloader,
-		profile_creator.loaderVersion,
+	const instanceId = await create(
+		instanceCreator.name,
+		instanceCreator.gameVersion,
+		instanceCreator.modloader,
+		instanceCreator.loaderVersion,
 		null,
 		true,
+		{
+			type: 'modrinth_modpack',
+			project_id: projectId,
+			version_id: versionId,
+		},
 	)
-	createInstanceCallback(profile)
+	createInstanceCallback(instanceId)
 
-	return await invoke('plugin:pack|pack_install', { location, profile })
+	return await invoke('plugin:pack|pack_install', { location, instanceId })
 }
 
-export async function install_to_existing_profile(
+export async function install_to_existing_instance(
 	projectId: string,
 	versionId: string,
 	title: string,
-	profilePath: string,
+	instanceId: string,
 ): Promise<void> {
 	const location: PackLocationVersionId = {
 		type: 'fromVersionId',
@@ -67,39 +72,39 @@ export async function install_to_existing_profile(
 		version_id: versionId,
 		title,
 	}
-	return await invoke('plugin:pack|pack_install', { location, profile: profilePath })
+	return await invoke('plugin:pack|pack_install', { location, instanceId })
 }
 
-export async function create_profile_and_install_from_file(
+export async function create_instance_and_install_from_file(
 	path: string,
-	showUnknownPackWarningModal?: (createProfile: () => Promise<void>, fileName: string) => void,
+	showUnknownPackWarningModal?: (createInstance: () => Promise<void>, fileName: string) => void,
 ): Promise<void> {
 	const location: PackLocationFile = {
 		type: 'fromFile',
 		path,
 	}
-	const profile_creator = await invoke<PackProfileCreator>(
-		'plugin:pack|pack_get_profile_from_pack',
+	const instanceCreator = await invoke<PackInstanceCreator>(
+		'plugin:pack|pack_get_instance_from_pack',
 		{ location },
 	)
 
-	const createProfile = async () => {
-		const profile = await create(
-			profile_creator.name,
-			profile_creator.gameVersion,
-			profile_creator.modloader,
-			profile_creator.loaderVersion,
+	const createInstance = async () => {
+		const instanceId = await create(
+			instanceCreator.name,
+			instanceCreator.gameVersion,
+			instanceCreator.modloader,
+			instanceCreator.loaderVersion,
 			null,
 			true,
 		)
-		await invoke('plugin:pack|pack_install', { location, profile })
+		await invoke('plugin:pack|pack_install', { location, instanceId })
 	}
 
-	if (profile_creator.unknownFile && showUnknownPackWarningModal) {
+	if (instanceCreator.unknownFile && showUnknownPackWarningModal) {
 		const splitPath = path.split(/[\\/]/)
 		const fileName = splitPath ? splitPath[splitPath.length - 1] : path
-		showUnknownPackWarningModal(createProfile, fileName)
+		showUnknownPackWarningModal(createInstance, fileName)
 	} else {
-		await createProfile()
+		await createInstance()
 	}
 }
diff --git a/apps/app-frontend/src/helpers/process.js b/apps/app-frontend/src/helpers/process.js
index a9f4dcc39a..b597702f2e 100644
--- a/apps/app-frontend/src/helpers/process.js
+++ b/apps/app-frontend/src/helpers/process.js
@@ -1,17 +1,17 @@
 /**
  * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
  *  and deserialized into a usable JS object.
  */
 import { invoke } from '@tauri-apps/api/core'
 
-/// Gets all running process IDs with a given profile path
+/// Gets all running process IDs with a given instance ID
 /// Returns [u32]
-export async function get_by_profile_path(path) {
-	return await invoke('plugin:process|process_get_by_profile_path', { path })
+export async function get_by_instance_id(instanceId) {
+	return await invoke('plugin:process|process_get_by_instance_id', { instanceId })
 }
 
-/// Gets all running process IDs with a given profile path
+/// Gets all running process IDs
 /// Returns [u32]
 export async function get_all() {
 	return await invoke('plugin:process|process_get_all')
diff --git a/apps/app-frontend/src/helpers/profile.ts b/apps/app-frontend/src/helpers/profile.ts
deleted file mode 100644
index be3b62c6ef..0000000000
--- a/apps/app-frontend/src/helpers/profile.ts
+++ /dev/null
@@ -1,317 +0,0 @@
-/**
- * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
- *  and deserialized into a usable JS object.
- */
-import type { Labrinth } from '@modrinth/api-client'
-import type { ContentItem, ContentOwner } from '@modrinth/ui'
-import { invoke } from '@tauri-apps/api/core'
-
-import { install_to_existing_profile } from '@/helpers/pack'
-
-import type {
-	CacheBehaviour,
-	ContentFile,
-	ContentFileProjectType,
-	GameInstance,
-	InstanceLoader,
-} from './types'
-
-// Add instance
-/*
-    name: String,           // the name of the profile, and relative path to create
-    game_version: String,   // the game version of the profile
-    modloader: ModLoader,   // the modloader to use
-    - ModLoader is an enum, with the following variants: Vanilla, Forge, Fabric, Quilt
-    loader_version: String, // the modloader version to use, set to "latest", "stable", or the ID of your chosen loader
-    icon: Path,  // the icon for the profile
-    - icon is a path to an image file, which will be copied into the profile directory
-*/
-
-export async function create(
-	name: string,
-	gameVersion: string,
-	modloader: InstanceLoader,
-	loaderVersion: string | null,
-	icon: string | null,
-	skipInstall: boolean,
-	linkedData?: { project_id: string; version_id: string; locked: boolean } | null,
-): Promise<string> {
-	// Trim string name to avoid "Unable to find directory"
-	name = name.trim()
-	return await invoke('plugin:profile-create|profile_create', {
-		name,
-		gameVersion,
-		modloader,
-		loaderVersion,
-		icon,
-		skipInstall,
-		linkedData,
-	})
-}
-
-// duplicate a profile
-export async function duplicate(path: string): Promise<string> {
-	return await invoke('plugin:profile-create|profile_duplicate', { path })
-}
-
-// Remove a profile
-export async function remove(path: string): Promise<void> {
-	return await invoke('plugin:profile|profile_remove', { path })
-}
-
-// Get a profile by path
-// Returns a Profile
-export async function get(path: string): Promise<GameInstance | null> {
-	return await invoke('plugin:profile|profile_get', { path })
-}
-
-export async function get_many(paths: string[]): Promise<GameInstance[]> {
-	return await invoke('plugin:profile|profile_get_many', { paths })
-}
-
-// Get a profile's projects
-// Returns a map of a path to profile file
-export async function get_projects(
-	path: string,
-	cacheBehaviour?: CacheBehaviour,
-): Promise<Record<string, ContentFile>> {
-	return await invoke('plugin:profile|profile_get_projects', { path, cacheBehaviour })
-}
-
-// Get just the installed project IDs for a profile (lightweight, skips update checks)
-export async function get_installed_project_ids(path: string): Promise<string[]> {
-	return await invoke('plugin:profile|profile_get_installed_project_ids', { path })
-}
-
-// Get content items with rich metadata for a profile
-// Returns content items filtered to exclude modpack files (if linked),
-// sorted alphabetically by project name
-export async function get_content_items(
-	path: string,
-	cacheBehaviour?: CacheBehaviour,
-): Promise<ContentItem[]> {
-	return await invoke('plugin:profile|profile_get_content_items', { path, cacheBehaviour })
-}
-
-// Linked modpack info returned from backend
-export interface LinkedModpackInfo {
-	project: Labrinth.Projects.v2.Project
-	version: Labrinth.Versions.v2.Version
-	owner: ContentOwner | null
-	has_update: boolean
-	update_version_id: string | null
-	update_version: Labrinth.Versions.v2.Version | null
-}
-
-// Get linked modpack info for a profile
-// Returns project, version, and owner information for the linked modpack,
-// or null if the profile is not linked to a modpack
-export async function get_linked_modpack_info(
-	path: string,
-	cacheBehaviour?: CacheBehaviour,
-): Promise<LinkedModpackInfo | null> {
-	return await invoke('plugin:profile|profile_get_linked_modpack_info', { path, cacheBehaviour })
-}
-
-// Get content items that are part of the linked modpack
-// Returns the modpack's dependencies as ContentItem list
-// Returns empty array if the profile is not linked to a modpack
-export async function get_linked_modpack_content(
-	path: string,
-	cacheBehaviour?: CacheBehaviour,
-): Promise<ContentItem[]> {
-	return await invoke('plugin:profile|profile_get_linked_modpack_content', { path, cacheBehaviour })
-}
-
-// Convert a list of dependencies into ContentItems with rich metadata
-export async function get_dependencies_as_content_items(
-	dependencies: Labrinth.Versions.v3.Dependency[],
-	cacheBehaviour?: CacheBehaviour,
-): Promise<ContentItem[]> {
-	return await invoke('plugin:profile|profile_get_dependencies_as_content_items', {
-		dependencies,
-		cacheBehaviour,
-	})
-}
-
-// Get a profile's full fs path
-// Returns a path
-export async function get_full_path(path: string): Promise<string> {
-	return await invoke('plugin:profile|profile_get_full_path', { path })
-}
-
-// Get's a mod's full fs path
-// Returns a path
-export async function get_mod_full_path(path: string, projectPath: string): Promise<string> {
-	return await invoke('plugin:profile|profile_get_mod_full_path', { path, projectPath })
-}
-
-export interface JavaVersion {
-	parsed_version: number
-	version: string
-	architecture: string
-	path: string
-}
-
-// Get optimal java version from profile
-// Returns a java version
-export async function get_optimal_jre_key(path: string): Promise<JavaVersion | null> {
-	return await invoke('plugin:profile|profile_get_optimal_jre_key', { path })
-}
-
-// Get a copy of the profile set
-// Returns hashmap of path -> Profile
-export async function list(): Promise<GameInstance[]> {
-	return await invoke('plugin:profile|profile_list')
-}
-
-export async function check_installed(path: string, projectId: string): Promise<boolean> {
-	return await invoke('plugin:profile|profile_check_installed', { path, projectId })
-}
-
-export async function check_installed_batch(projectId: string): Promise<Record<string, boolean>> {
-	return await invoke('plugin:profile|profile_check_installed_batch', { projectId })
-}
-
-// Installs/Repairs a profile
-export async function install(path: string, force: boolean): Promise<void> {
-	return await invoke('plugin:profile|profile_install', { path, force })
-}
-
-// Updates all of a profile's projects
-export async function update_all(path: string): Promise<Record<string, string>> {
-	return await invoke('plugin:profile|profile_update_all', { path })
-}
-
-// Updates a specified project
-export async function update_project(path: string, projectPath: string): Promise<string> {
-	return await invoke('plugin:profile|profile_update_project', { path, projectPath })
-}
-
-// Add a project to a profile from a version
-// Returns a path to the new project file
-export type DownloadReason = 'standalone' | 'dependency' | 'modpack' | 'update'
-
-export async function add_project_from_version(
-	path: string,
-	versionId: string,
-	reason: DownloadReason,
-	dependentOnVersionId?: string,
-): Promise<string> {
-	return await invoke('plugin:profile|profile_add_project_from_version', {
-		path,
-		versionId,
-		reason,
-		dependentOnVersionId,
-	})
-}
-
-// Add a project to a profile from a path + project_type
-// Returns a path to the new project file
-export async function add_project_from_path(
-	path: string,
-	projectPath: string,
-	projectType?: ContentFileProjectType,
-): Promise<string> {
-	return await invoke('plugin:profile|profile_add_project_from_path', {
-		path,
-		projectPath,
-		projectType,
-	})
-}
-
-// Toggle disabling a project
-export async function toggle_disable_project(path: string, projectPath: string): Promise<string> {
-	return await invoke('plugin:profile|profile_toggle_disable_project', { path, projectPath })
-}
-
-// Remove a project
-export async function remove_project(path: string, projectPath: string): Promise<void> {
-	return await invoke('plugin:profile|profile_remove_project', { path, projectPath })
-}
-
-// Update a managed Modrinth profile to a specific version
-export async function update_managed_modrinth_version(
-	path: string,
-	versionId: string,
-): Promise<void> {
-	return await invoke('plugin:profile|profile_update_managed_modrinth_version', {
-		path,
-		versionId,
-	})
-}
-
-// Repair a managed Modrinth profile
-export async function update_repair_modrinth(path: string): Promise<void> {
-	return await invoke('plugin:profile|profile_repair_managed_modrinth', { path })
-}
-
-// Export a profile to .mrpack
-// included_overrides is an array of paths to override folders to include (ie: 'mods', 'resource_packs')
-// Version id is optional (ie: 1.1.5)
-export async function export_profile_mrpack(
-	path: string,
-	exportLocation: string,
-	includedOverrides: string[],
-	versionId?: string,
-	description?: string,
-	name?: string,
-): Promise<void> {
-	return await invoke('plugin:profile|profile_export_mrpack', {
-		path,
-		exportLocation,
-		includedOverrides,
-		versionId,
-		description,
-		name,
-	})
-}
-
-// Given a folder path, populate an array of all the subfolders
-// Intended to be used for finding potential override folders
-// profile
-// -- mods
-// -- resourcepacks
-// -- file1
-// => [mods, resourcepacks]
-// allows selection for 'included_overrides' in export_profile_mrpack
-export async function get_pack_export_candidates(profilePath: string): Promise<string[]> {
-	return await invoke('plugin:profile|profile_get_pack_export_candidates', { profilePath })
-}
-
-// Run Minecraft using a pathed profile
-// Returns PID of child
-export async function run(path: string, serverAddress: string | null = null): Promise<unknown> {
-	return await invoke('plugin:profile|profile_run', { path, serverAddress })
-}
-
-export async function kill(path: string): Promise<void> {
-	return await invoke('plugin:profile|profile_kill', { path })
-}
-
-// Edits a profile
-export async function edit(path: string, editProfile: Partial<GameInstance>): Promise<void> {
-	return await invoke('plugin:profile|profile_edit', { path, editProfile })
-}
-
-// Edits a profile's icon
-export async function edit_icon(path: string, iconPath: string | null): Promise<void> {
-	return await invoke('plugin:profile|profile_edit_icon', { path, iconPath })
-}
-
-export async function finish_install(instance: GameInstance): Promise<void> {
-	if (instance.install_stage !== 'pack_installed') {
-		const linkedData = instance.linked_data
-		if (linkedData) {
-			await install_to_existing_profile(
-				linkedData.project_id,
-				linkedData.version_id,
-				instance.name,
-				instance.path,
-			)
-		}
-	} else {
-		await install(instance.path, false)
-	}
-}
diff --git a/apps/app-frontend/src/helpers/settings.ts b/apps/app-frontend/src/helpers/settings.ts
index 768a4f3016..a63dbe78e3 100644
--- a/apps/app-frontend/src/helpers/settings.ts
+++ b/apps/app-frontend/src/helpers/settings.ts
@@ -1,6 +1,6 @@
 /**
  * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
  *  and deserialized into a usable JS object.
  */
 import { invoke } from '@tauri-apps/api/core'
diff --git a/apps/app-frontend/src/helpers/state.ts b/apps/app-frontend/src/helpers/state.ts
index 516d657cf4..e31dd9794d 100644
--- a/apps/app-frontend/src/helpers/state.ts
+++ b/apps/app-frontend/src/helpers/state.ts
@@ -1,6 +1,6 @@
 /**
  * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
  *  and deserialized into a usable JS object.
  */
 import { invoke } from '@tauri-apps/api/core'
@@ -8,7 +8,7 @@ import { invoke } from '@tauri-apps/api/core'
 export interface LoadingBarType {
 	type?: string
 	version?: string
-	profile_path?: string
+	instance_id?: string
 	pack_name?: string
 	icon?: string | null
 }
diff --git a/apps/app-frontend/src/helpers/tags.js b/apps/app-frontend/src/helpers/tags.js
index 42fd29c5f5..fdfdb04d07 100644
--- a/apps/app-frontend/src/helpers/tags.js
+++ b/apps/app-frontend/src/helpers/tags.js
@@ -1,6 +1,6 @@
 /**
  * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
  *  and deserialized into a usable JS object.
  */
 import { invoke } from '@tauri-apps/api/core'
diff --git a/apps/app-frontend/src/helpers/types.d.ts b/apps/app-frontend/src/helpers/types.d.ts
index 143997702f..c1f4cacfc9 100644
--- a/apps/app-frontend/src/helpers/types.d.ts
+++ b/apps/app-frontend/src/helpers/types.d.ts
@@ -1,20 +1,23 @@
 import type { ModrinthId } from '@modrinth/utils'
 
 export type GameInstance = {
+	id: string
 	path: string
 	install_stage: InstallStage
+	launcher_feature_version: string
 
 	name: string
 	icon_path?: string
 
 	game_version: string
+	protocol_version?: number
 	loader: InstanceLoader
 	loader_version?: string
 
 	groups: string[]
 
-	linked_data?: LinkedData
-	preferred_update_channel: ReleaseChannel
+	link?: InstanceLink | null
+	update_channel: ReleaseChannel
 
 	created: Date
 	modified: Date
@@ -40,13 +43,52 @@ type InstallStage =
 	| 'pack_installing'
 	| 'not_installed'
 
-type LinkedData = {
-	project_id: ModrinthId
-	version_id: ModrinthId
-
-	locked: boolean
+type InstanceLinkIdentity = {
+	project_id?: ModrinthId | null
+	version_id?: ModrinthId | null
+	server_project_id?: ModrinthId | null
+	content_project_id?: ModrinthId | null
+	content_version_id?: ModrinthId | null
 }
 
+export type InstanceLink = InstanceLinkIdentity &
+	(
+		| {
+				type: 'modrinth_modpack'
+				project_id: ModrinthId
+				version_id: ModrinthId
+		  }
+		| {
+				type: 'server_project'
+				project_id: ModrinthId
+		  }
+		| {
+				type: 'server_project_modpack'
+				server_project_id: ModrinthId
+				content_project_id?: ModrinthId | null
+				content_version_id: ModrinthId
+				project_id?: ModrinthId
+				version_id?: ModrinthId
+		  }
+		| {
+				type: 'imported_modpack'
+				project_id?: ModrinthId | null
+				version_id?: ModrinthId | null
+		  }
+		| {
+				type: 'modrinth_hosting'
+				server_id: string
+				instance_ids: string[]
+				active_instance_id?: string | null
+		  }
+		| {
+				type: 'shared_instance'
+				shared_instance_id: string
+		  }
+	)
+
+export type Instance = GameInstance
+
 type ReleaseChannel = 'release' | 'beta' | 'alpha'
 
 export type InstanceLoader = 'vanilla' | 'forge' | 'fabric' | 'quilt' | 'neoforge'
diff --git a/apps/app-frontend/src/helpers/utils.js b/apps/app-frontend/src/helpers/utils.js
index d0dd6797c0..51c326ed8c 100644
--- a/apps/app-frontend/src/helpers/utils.js
+++ b/apps/app-frontend/src/helpers/utils.js
@@ -1,6 +1,6 @@
 import { invoke } from '@tauri-apps/api/core'
 
-import { get_full_path, get_mod_full_path } from '@/helpers/profile'
+import { get_full_path, get_mod_full_path } from '@/helpers/instance'
 
 export async function isDev() {
 	return await invoke('is_dev')
@@ -47,14 +47,14 @@ export async function showLauncherLogsFolder() {
 	return await invoke('plugin:utils|show_launcher_logs_folder', {})
 }
 
-// Opens a profile's folder in the OS file explorer
-export async function showProfileInFolder(path) {
-	const fullPath = await get_full_path(path)
+// Opens an instance's folder in the OS file explorer
+export async function showInstanceInFolder(instanceId) {
+	const fullPath = await get_full_path(instanceId)
 	return await openPath(fullPath)
 }
 
-export async function highlightModInProfile(profilePath, projectPath) {
-	const fullPath = await get_mod_full_path(profilePath, projectPath)
+export async function highlightModInInstance(instanceId, projectPath) {
+	const fullPath = await get_mod_full_path(instanceId, projectPath)
 	return await highlightInFolder(fullPath)
 }
 
diff --git a/apps/app-frontend/src/helpers/worlds.ts b/apps/app-frontend/src/helpers/worlds.ts
index fd25b945a2..a5a579d6a3 100644
--- a/apps/app-frontend/src/helpers/worlds.ts
+++ b/apps/app-frontend/src/helpers/worlds.ts
@@ -3,7 +3,7 @@ import { autoToHTML } from '@sfirew/minecraft-motd-parser'
 import { invoke } from '@tauri-apps/api/core'
 import dayjs from 'dayjs'
 
-import { get_full_path } from '@/helpers/profile'
+import { get_full_path } from '@/helpers/instance'
 import { openPath } from '@/helpers/utils'
 
 type BaseWorld = {
@@ -36,8 +36,8 @@ export type ServerWorld = BaseWorld & {
 
 export type World = SingleplayerWorld | ServerWorld
 
-export type WorldWithProfile = {
-	profile: string
+export type WorldWithInstance = {
+	instance_id: string
 } & World
 
 export type SingleplayerGameMode = 'survival' | 'creative' | 'adventure' | 'spectator'
@@ -88,12 +88,12 @@ export type ProtocolVersion = {
 export async function get_recent_worlds(
 	limit: number,
 	displayStatuses?: DisplayStatus[],
-): Promise<WorldWithProfile[]> {
+): Promise<WorldWithInstance[]> {
 	return await invoke('plugin:worlds|get_recent_worlds', { limit, displayStatuses })
 }
 
-export async function get_profile_worlds(path: string): Promise<World[]> {
-	return await invoke('plugin:worlds|get_profile_worlds', { path })
+export async function get_instance_worlds(instanceId: string): Promise<World[]> {
+	return await invoke('plugin:worlds|get_instance_worlds', { instanceId })
 }
 
 export async function get_singleplayer_world(
@@ -137,16 +137,16 @@ export async function delete_world(instance: string, world: string): Promise<voi
 	return await invoke('plugin:worlds|delete_world', { instance, world })
 }
 
-export async function add_server_to_profile(
-	path: string,
+export async function add_server_to_instance(
+	instanceId: string,
 	name: string,
 	address: string,
 	packStatus: ServerPackStatus,
 	projectId?: string,
 	contentKind?: string,
 ): Promise<number> {
-	return await invoke('plugin:worlds|add_server_to_profile', {
-		path,
+	return await invoke('plugin:worlds|add_server_to_instance', {
+		instanceId,
 		name,
 		address,
 		packStatus,
@@ -155,15 +155,15 @@ export async function add_server_to_profile(
 	})
 }
 
-export async function edit_server_in_profile(
-	path: string,
+export async function edit_server_in_instance(
+	instanceId: string,
 	index: number,
 	name: string,
 	address: string,
 	packStatus: ServerPackStatus,
 ): Promise<void> {
-	return await invoke('plugin:worlds|edit_server_in_profile', {
-		path,
+	return await invoke('plugin:worlds|edit_server_in_instance', {
+		instanceId,
 		index,
 		name,
 		address,
@@ -171,12 +171,17 @@ export async function edit_server_in_profile(
 	})
 }
 
-export async function remove_server_from_profile(path: string, index: number): Promise<void> {
-	return await invoke('plugin:worlds|remove_server_from_profile', { path, index })
+export async function remove_server_from_instance(
+	instanceId: string,
+	index: number,
+): Promise<void> {
+	return await invoke('plugin:worlds|remove_server_from_instance', { instanceId, index })
 }
 
-export async function get_profile_protocol_version(path: string): Promise<ProtocolVersion | null> {
-	return await invoke('plugin:worlds|get_profile_protocol_version', { path })
+export async function get_instance_protocol_version(
+	instanceId: string,
+): Promise<ProtocolVersion | null> {
+	return await invoke('plugin:worlds|get_instance_protocol_version', { instanceId })
 }
 
 export async function get_server_status(
@@ -186,16 +191,19 @@ export async function get_server_status(
 	return await invoke('plugin:worlds|get_server_status', { address, protocolVersion })
 }
 
-export async function start_join_singleplayer_world(path: string, world: string): Promise<unknown> {
-	return await invoke('plugin:worlds|start_join_singleplayer_world', { path, world })
+export async function start_join_singleplayer_world(
+	instanceId: string,
+	world: string,
+): Promise<unknown> {
+	return await invoke('plugin:worlds|start_join_singleplayer_world', { instanceId, world })
 }
 
-export async function start_join_server(path: string, address: string): Promise<unknown> {
-	return await invoke('plugin:worlds|start_join_server', { path, address })
+export async function start_join_server(instanceId: string, address: string): Promise<unknown> {
+	return await invoke('plugin:worlds|start_join_server', { instanceId, address })
 }
 
-export async function showWorldInFolder(instancePath: string, worldPath: string) {
-	const fullPath = await get_full_path(instancePath)
+export async function showWorldInFolder(instanceId: string, worldPath: string) {
+	const fullPath = await get_full_path(instanceId)
 	return await openPath(fullPath + '/saves/' + worldPath)
 }
 
@@ -420,9 +428,9 @@ export function refreshServers(
 	)
 }
 
-export async function refreshWorld(worlds: World[], instancePath: string, worldPath: string) {
+export async function refreshWorld(worlds: World[], instanceId: string, worldPath: string) {
 	const index = worlds.findIndex((w) => w.type === 'singleplayer' && w.path === worldPath)
-	const newWorld = await get_singleplayer_world(instancePath, worldPath)
+	const newWorld = await get_singleplayer_world(instanceId, worldPath)
 	if (index !== -1) {
 		worlds[index] = newWorld
 	} else {
@@ -432,13 +440,13 @@ export async function refreshWorld(worlds: World[], instancePath: string, worldP
 	sortWorlds(worlds)
 }
 
-export async function handleDefaultProfileUpdateEvent(
+export async function handleDefaultInstanceUpdateEvent(
 	worlds: World[],
-	instancePath: string,
-	e: ProfileEvent,
+	instanceId: string,
+	e: InstanceEvent,
 ) {
 	if (e.event === 'world_updated') {
-		await refreshWorld(worlds, instancePath, e.world)
+		await refreshWorld(worlds, instanceId, e.world)
 	}
 
 	if (e.event === 'server_joined') {
@@ -456,9 +464,9 @@ export async function handleDefaultProfileUpdateEvent(
 	}
 }
 
-export async function refreshWorlds(instancePath: string): Promise<World[]> {
-	const worlds = await get_profile_worlds(instancePath).catch((err) => {
-		console.error(`Error refreshing worlds for instance: ${instancePath}`, err)
+export async function refreshWorlds(instanceId: string): Promise<World[]> {
+	const worlds = await get_instance_worlds(instanceId).catch((err) => {
+		console.error(`Error refreshing worlds for instance: ${instanceId}`, err)
 	})
 	if (worlds) {
 		sortWorlds(worlds)
@@ -489,7 +497,7 @@ export function hasWorldQuickPlaySupport(gameVersions: GameVersion[], currentVer
 	return versionIndex !== -1 && targetIndex !== -1 && versionIndex <= targetIndex
 }
 
-export type ProfileEvent = { profile_path_id: string } & (
+export type InstanceEvent = { instance_id: string } & (
 	| {
 			event: 'servers_updated'
 	  }
diff --git a/apps/app-frontend/src/pages/Browse.vue b/apps/app-frontend/src/pages/Browse.vue
index 8ce11f96be..d4d38d34e1 100644
--- a/apps/app-frontend/src/pages/Browse.vue
+++ b/apps/app-frontend/src/pages/Browse.vue
@@ -41,14 +41,14 @@ import {
 	get_search_results_v3,
 	get_version_many,
 } from '@/helpers/cache.js'
-import { profile_listener } from '@/helpers/events.js'
-import { get_loader_versions as getLoaderManifest } from '@/helpers/metadata'
+import { instance_listener } from '@/helpers/events.js'
 import {
 	get as getInstance,
 	get_installed_project_ids as getInstalledProjectIds,
-} from '@/helpers/profile.js'
+} from '@/helpers/instance'
+import { get_loader_versions as getLoaderManifest } from '@/helpers/metadata'
 import { get_categories, get_game_versions, get_loaders } from '@/helpers/tags'
-import { get_profile_worlds } from '@/helpers/worlds'
+import { get_instance_worlds } from '@/helpers/worlds'
 import { injectContentInstall } from '@/providers/content-install'
 import { injectServerInstall } from '@/providers/server-install'
 import {
@@ -131,10 +131,10 @@ type Instance = {
 	install_stage: string
 	icon_path?: string
 	name: string
-	linked_data?: {
+	link?: {
+		type: string
 		project_id: string
 		version_id: string
-		locked: boolean
 	}
 }
 
@@ -186,7 +186,7 @@ async function refreshInstalledProjectIds() {
 	if (!route.query.i) return
 
 	if (route.query.from === 'worlds') {
-		const worlds = await get_profile_worlds(route.query.i as string).catch(handleError)
+		const worlds = await get_instance_worlds(route.query.i as string).catch(handleError)
 		if (!worlds) return
 
 		const serverProjectIds = worlds
@@ -224,10 +224,10 @@ async function initInstanceContext() {
 
 		await refreshInstalledProjectIds()
 
-		if (instance.value?.linked_data?.project_id) {
-			debugLog('checking linked project for server status', instance.value.linked_data.project_id)
+		if (instance.value?.link?.project_id) {
+			debugLog('checking linked project for server status', instance.value.link.project_id)
 			const projectV3 = await get_project_v3(
-				instance.value.linked_data.project_id,
+				instance.value.link.project_id,
 				'must_revalidate',
 			).catch(handleError)
 			if (projectV3?.minecraft_server != null) {
@@ -448,7 +448,7 @@ const browseTitle = computed(() =>
 )
 breadcrumbs.setName('BrowseTitle', browseTitle.value)
 if (instance.value) {
-	const instanceLink = `/instance/${encodeURIComponent(instance.value.path)}`
+	const instanceLink = `/instance/${encodeURIComponent(instance.value.id)}`
 	breadcrumbs.setContext({
 		name: instance.value.name,
 		link: isFromWorlds.value ? `${instanceLink}/worlds` : instanceLink,
@@ -578,7 +578,7 @@ const installContext = computed(() => {
 			loader: instance.value.loader,
 			gameVersion: instance.value.game_version,
 			iconSrc: instance.value.icon_path ? convertFileSrc(instance.value.icon_path) : null,
-			backUrl: `/instance/${encodeURIComponent(instance.value.path)}${isFromWorlds.value ? '/worlds' : ''}`,
+			backUrl: `/instance/${encodeURIComponent(instance.value.id)}${isFromWorlds.value ? '/worlds' : ''}`,
 			backLabel: formatMessage(messages.backToInstance),
 			heading: formatMessage(
 				isFromWorlds.value ? messages.addServersToInstance : commonMessages.installingContentLabel,
@@ -809,7 +809,7 @@ function getCardActions(
 					await installVersion(
 						projectResult.project_id,
 						selectedInstall.versionId,
-						instance.value ? instance.value.path : null,
+						instance.value ? instance.value.id : null,
 						'SearchCard',
 						(versionId, installedProjectIds) => {
 							setProjectInstalling(projectResult.project_id, false)
@@ -987,15 +987,11 @@ await searchState.refreshSearch()
 type UnlistenFn = () => void
 
 let isUnmounted = false
-let unlistenProfiles: UnlistenFn | null = null
+let unlistenInstances: UnlistenFn | null = null
 
 onMounted(() => {
-	profile_listener(async (event: { event: string; profile_path_id: string }) => {
-		if (
-			instance.value &&
-			event.profile_path_id === instance.value.path &&
-			event.event === 'synced'
-		) {
+	instance_listener(async (event: { event: string; instance_id: string }) => {
+		if (instance.value && event.instance_id === instance.value.id && event.event === 'synced') {
 			await refreshInstalledProjectIds()
 			await searchState.refreshSearch()
 		}
@@ -1006,14 +1002,14 @@ onMounted(() => {
 				return
 			}
 
-			unlistenProfiles = unlisten
+			unlistenInstances = unlisten
 		})
 		.catch(handleError)
 })
 
 onUnmounted(() => {
 	isUnmounted = true
-	unlistenProfiles?.()
+	unlistenInstances?.()
 })
 
 function getProjectBrowseQuery() {
diff --git a/apps/app-frontend/src/pages/Index.vue b/apps/app-frontend/src/pages/Index.vue
index 8a1f3557ef..16223dde1b 100644
--- a/apps/app-frontend/src/pages/Index.vue
+++ b/apps/app-frontend/src/pages/Index.vue
@@ -8,8 +8,8 @@ import { useRoute } from 'vue-router'
 import RowDisplay from '@/components/RowDisplay.vue'
 import RecentWorldsList from '@/components/ui/world/RecentWorldsList.vue'
 import { get_search_results } from '@/helpers/cache.js'
-import { profile_listener } from '@/helpers/events'
-import { list } from '@/helpers/profile.js'
+import { instance_listener } from '@/helpers/events'
+import { list } from '@/helpers/instance'
 import type { GameInstance } from '@/helpers/types'
 import { useBreadcrumbs } from '@/store/breadcrumbs'
 
@@ -49,8 +49,8 @@ async function fetchInstances() {
 
 	const filters = []
 	for (const instance of instances.value) {
-		if (instance.linked_data && instance.linked_data.project_id) {
-			filters.push(`NOT"project_id"="${instance.linked_data.project_id}"`)
+		if (instance.link && instance.link.project_id) {
+			filters.push(`NOT"project_id"="${instance.link.project_id}"`)
 		}
 	}
 	installedModpacksFilter.value = filters.join(' AND ')
@@ -85,8 +85,8 @@ async function refreshFeaturedProjects() {
 await fetchInstances()
 await refreshFeaturedProjects()
 
-const unlistenProfile = await profile_listener(
-	async (e: { event: string; profile_path_id: string }) => {
+const unlistenInstance = await instance_listener(
+	async (e: { event: string; instance_id: string }) => {
 		await fetchInstances()
 
 		if (e.event === 'added' || e.event === 'created' || e.event === 'removed') {
@@ -96,7 +96,7 @@ const unlistenProfile = await profile_listener(
 )
 
 onUnmounted(() => {
-	unlistenProfile()
+	unlistenInstance()
 })
 </script>
 
diff --git a/apps/app-frontend/src/pages/instance/Files.vue b/apps/app-frontend/src/pages/instance/Files.vue
index 72d75cfceb..488d81e09b 100644
--- a/apps/app-frontend/src/pages/instance/Files.vue
+++ b/apps/app-frontend/src/pages/instance/Files.vue
@@ -24,8 +24,8 @@ import {
 } from '@tauri-apps/plugin-fs'
 import { onUnmounted, ref, watch } from 'vue'
 
-import { profile_listener } from '@/helpers/events'
-import { get_full_path } from '@/helpers/profile'
+import { instance_listener } from '@/helpers/events'
+import { get_full_path } from '@/helpers/instance'
 import type { GameInstance } from '@/helpers/types'
 import { highlightInFolder } from '@/helpers/utils'
 
@@ -62,9 +62,9 @@ const error = ref<Error | null>(null)
 const currentPath = ref('')
 const editingFile = ref<EditingFile | null>(null)
 
-debug('setup: start, instance.path =', props.instance.path)
+debug('setup: start, instance.id =', props.instance.id)
 
-instanceRoot.value = await get_full_path(props.instance.path)
+instanceRoot.value = await get_full_path(props.instance.id)
 debug('setup: instanceRoot =', instanceRoot.value)
 await refresh()
 debug('setup: refresh complete, items =', items.value.length, 'error =', error.value)
@@ -221,7 +221,7 @@ async function handleWriteFile(path: string, content: string) {
 
 async function handleDownloadFile(path: string, _fileName: string) {
 	await invoke('plugin:files|file_save_as', {
-		instancePath: props.instance.path,
+		instancePath: props.instance.id,
 		filePath: path,
 	})
 }
@@ -275,7 +275,7 @@ async function handleUploadFiles(files: File[]) {
 async function handleExtractFile(path: string, override: boolean, dry: boolean) {
 	try {
 		return await invoke('plugin:files|file_extract_zip', {
-			instancePath: props.instance.path,
+			instancePath: props.instance.id,
 			filePath: path,
 			overrideConflicts: override,
 			dryRun: dry,
@@ -289,28 +289,28 @@ async function handleExtractFile(path: string, override: boolean, dry: boolean)
 	}
 }
 
-debug('setup: registering profile_listener')
-const unlistenProfiles = await profile_listener(
-	async (event: { event: string; profile_path_id: string }) => {
-		debug('profile_listener: event =', event.event, 'path =', event.profile_path_id)
-		if (event.profile_path_id === props.instance.path && event.event === 'synced') {
-			debug('profile_listener: synced event matched, calling refresh')
+debug('setup: registering instance_listener')
+const unlistenInstances = await instance_listener(
+	async (event: { event: string; instance_id: string }) => {
+		debug('instance_listener: event =', event.event, 'path =', event.instance_id)
+		if (event.instance_id === props.instance.id && event.event === 'synced') {
+			debug('instance_listener: synced event matched, calling refresh')
 			await refresh()
 		}
 	},
 )
-debug('setup: profile_listener registered')
+debug('setup: instance_listener registered')
 
 onUnmounted(() => {
-	unlistenProfiles()
+	unlistenInstances()
 })
 
 watch(
-	() => props.instance.path,
+	() => props.instance.id,
 	async () => {
-		debug('watch instance.path: changed to', props.instance.path)
+		debug('watch instance.id: changed to', props.instance.id)
 		firstPaintPending.value = true
-		instanceRoot.value = await get_full_path(props.instance.path)
+		instanceRoot.value = await get_full_path(props.instance.id)
 		currentPath.value = ''
 		await refresh()
 	},
diff --git a/apps/app-frontend/src/pages/instance/Index.vue b/apps/app-frontend/src/pages/instance/Index.vue
index 1e003a9235..0a800675a6 100644
--- a/apps/app-frontend/src/pages/instance/Index.vue
+++ b/apps/app-frontend/src/pages/instance/Index.vue
@@ -6,7 +6,7 @@
 		>
 			<ExportModal ref="exportModal" :instance="instance" />
 			<InstanceSettingsModal
-				:key="instance.path"
+				:key="instance.id"
 				ref="settingsModal"
 				:instance="instance"
 				:offline="offline"
@@ -19,7 +19,7 @@
 						:src="icon ? icon : undefined"
 						:alt="instance.name"
 						size="64px"
-						:tint-by="instance.path"
+						:tint-by="instance.id"
 					/>
 				</template>
 				<template #title>
@@ -78,7 +78,7 @@
 								<Avatar
 									:src="linkedProjectV3.icon_url"
 									:alt="linkedProjectV3.name"
-									:tint-by="instance.path"
+									:tint-by="instance.id"
 									size="24px"
 								/>
 								<router-link
@@ -190,7 +190,7 @@
 									{
 										id: 'open-folder',
 										action: () => {
-											if (instance) showProfileInFolder(instance.path)
+											if (instance) showInstanceInFolder(instance.id)
 										},
 									},
 									{
@@ -217,11 +217,11 @@
 			<RouterView
 				v-if="route.path.startsWith('/instance')"
 				v-slot="{ Component }"
-				:key="instance.path"
+				:key="instance.id"
 			>
 				<template v-if="Component">
 					<Suspense
-						:key="instance.path"
+						:key="instance.id"
 						@pending="subpagePending = true"
 						@resolve="subpagePending = false"
 					>
@@ -319,12 +319,12 @@ import UpdateToPlayModal from '@/components/ui/modal/UpdateToPlayModal.vue'
 import { useInstanceConsole } from '@/composables/useInstanceConsole'
 import { trackEvent } from '@/helpers/analytics'
 import { get_project_v3 } from '@/helpers/cache.js'
-import { process_listener, profile_listener } from '@/helpers/events'
+import { instance_listener, process_listener } from '@/helpers/events'
+import { finish_install, get, get_full_path, kill, run } from '@/helpers/instance'
 import { type InstanceContentData, loadInstanceContentData } from '@/helpers/instance-content'
-import { get_by_profile_path } from '@/helpers/process'
-import { finish_install, get, get_full_path, kill, run } from '@/helpers/profile'
+import { get_by_instance_id } from '@/helpers/process'
 import type { GameInstance } from '@/helpers/types'
-import { showProfileInFolder } from '@/helpers/utils.js'
+import { showInstanceInFolder } from '@/helpers/utils.js'
 import { get_server_status, refreshWorlds } from '@/helpers/worlds'
 import { injectServerInstall } from '@/providers/server-install'
 import { handleSevereError } from '@/store/error.js'
@@ -395,15 +395,12 @@ async function fetchInstance() {
 
 	const contentPreloadPromise =
 		nextInstance && isContentSubpageRoute()
-			? loadInstanceContentData(nextInstance.path, undefined, handleError)
+			? loadInstanceContentData(nextInstance.id, undefined, handleError)
 			: Promise.resolve(null)
 
-	if (!offline.value && nextInstance?.linked_data && nextInstance.linked_data.project_id) {
+	if (!offline.value && nextInstance?.link && nextInstance.link.project_id) {
 		try {
-			nextLinkedProjectV3 = await get_project_v3(
-				nextInstance.linked_data.project_id,
-				'must_revalidate',
-			)
+			nextLinkedProjectV3 = await get_project_v3(nextInstance.link.project_id, 'must_revalidate')
 
 			if (nextLinkedProjectV3?.minecraft_server != null) {
 				nextIsServerInstance = true
@@ -424,8 +421,8 @@ async function fetchInstance() {
 
 	if (nextInstance) {
 		queryClient.prefetchQuery({
-			queryKey: ['worlds', nextInstance.path],
-			queryFn: () => refreshWorlds(nextInstance.path),
+			queryKey: ['worlds', nextInstance.id],
+			queryFn: () => refreshWorlds(nextInstance.id),
 			staleTime: 30_000,
 		})
 	}
@@ -454,7 +451,7 @@ function fetchDeferredData() {
 
 async function updatePlayState() {
 	if (!route.params.id) return
-	const runningProcesses = await get_by_profile_path(route.params.id as string).catch(handleError)
+	const runningProcesses = await get_by_instance_id(route.params.id as string).catch(handleError)
 
 	playing.value = Array.isArray(runningProcesses) && runningProcesses.length > 0
 }
@@ -538,7 +535,7 @@ const startInstance = async (context: string) => {
 		await run(route.params.id as string)
 		playing.value = true
 	} catch (err) {
-		handleSevereError(err, { profilePath: route.params.id as string })
+		handleSevereError(err, { instanceId: route.params.id as string })
 	}
 	loading.value = false
 
@@ -564,10 +561,10 @@ const stopInstance = async (context: string) => {
 }
 
 const handlePlayServer = async () => {
-	if (!instance.value?.linked_data?.project_id) return
+	if (!instance.value?.link?.project_id) return
 	loading.value = true
 	try {
-		await playServerProject(instance.value.linked_data.project_id)
+		await playServerProject(instance.value.link.project_id)
 	} finally {
 		await updatePlayState()
 		loading.value = false
@@ -628,7 +625,7 @@ const handleOptionsClick = async (args: { option: string; item: unknown }) => {
 			})
 			break
 		case 'open_folder':
-			if (instance.value) await showProfileInFolder(instance.value.path)
+			if (instance.value) await showInstanceInFolder(instance.value.id)
 			break
 		case 'copy_path': {
 			if (instance.value) {
@@ -640,9 +637,9 @@ const handleOptionsClick = async (args: { option: string; item: unknown }) => {
 	}
 }
 
-const unlistenProfiles = await profile_listener(
-	async (event: { profile_path_id: string; event: string }) => {
-		if (event.profile_path_id !== route.params.id) return
+const unlistenInstances = await instance_listener(
+	async (event: { instance_id: string; event: string }) => {
+		if (event.instance_id !== route.params.id) return
 		if (event.event === 'removed' || route.path === '/') {
 			if (route.path !== '/') {
 				await router.push({ path: '/' })
@@ -656,20 +653,18 @@ const unlistenProfiles = await profile_listener(
 			}
 			return handleError(err)
 		})
-		if (!instance.value?.linked_data?.project_id) {
+		if (!instance.value?.link?.project_id) {
 			linkedProjectV3.value = undefined
 			isServerInstance.value = false
 		}
 	},
 )
 
-const unlistenProcesses = await process_listener(
-	(e: { event: string; profile_path_id: string }) => {
-		if (e.event === 'finished' && e.profile_path_id === route.params.id) {
-			playing.value = false
-		}
-	},
-)
+const unlistenProcesses = await process_listener((e: { event: string; instance_id: string }) => {
+	if (e.event === 'finished' && e.instance_id === route.params.id) {
+		playing.value = false
+	}
+})
 
 const icon = computed(() =>
 	instance.value?.icon_path ? convertFileSrc(instance.value.icon_path) : null,
@@ -701,10 +696,10 @@ const timePlayedHumanized = computed(() => {
 
 onUnmounted(() => {
 	unlistenProcesses()
-	unlistenProfiles()
-	const profilePath = route.params.id
-	if (profilePath) {
-		const { destroy } = useInstanceConsole(profilePath)
+	unlistenInstances()
+	const instanceId = route.params.id
+	if (instanceId) {
+		const { destroy } = useInstanceConsole(instanceId)
 		destroy()
 	}
 })
diff --git a/apps/app-frontend/src/pages/instance/Logs.vue b/apps/app-frontend/src/pages/instance/Logs.vue
index 0543463f5f..95621099ea 100644
--- a/apps/app-frontend/src/pages/instance/Logs.vue
+++ b/apps/app-frontend/src/pages/instance/Logs.vue
@@ -55,7 +55,7 @@ const props = defineProps({
 	},
 })
 
-const profilePathId = computed(() => route.params.id)
+const instanceId = computed(() => route.params.id)
 const {
 	liveConsole,
 	historicalConsole,
@@ -64,7 +64,7 @@ const {
 	getHistoricalContent,
 	invalidate,
 	clearLive,
-} = useInstanceConsole(profilePathId.value)
+} = useInstanceConsole(instanceId.value)
 
 await hydrate()
 
@@ -89,7 +89,7 @@ function buildLogList(rawLogs) {
 
 const logs = ref(buildLogList([]))
 
-void getHistoricalLogs(props.instance.path)
+void getHistoricalLogs(props.instance.id)
 	.then((allLogs) => {
 		logs.value = buildLogList(allLogs)
 	})
@@ -146,9 +146,9 @@ const deleteDisabled = computed(() => {
 async function deleteSelectedLog() {
 	const log = selectedLog.value
 	if (!log || log.live) return
-	await delete_logs_by_filename(props.instance.path, log.log_type, log.filename)
+	await delete_logs_by_filename(props.instance.id, log.log_type, log.filename)
 	invalidate()
-	const freshLogs = await getHistoricalLogs(props.instance.path)
+	const freshLogs = await getHistoricalLogs(props.instance.id)
 	logs.value = buildLogList(freshLogs)
 	selectedLogIndex.value = 0
 }
@@ -186,11 +186,9 @@ watch(selectedLogIndex, async (newIndex) => {
 		return
 	}
 
-	const output = await get_output_by_filename(
-		props.instance.path,
-		log.log_type,
-		log.filename,
-	).catch(handleError)
+	const output = await get_output_by_filename(props.instance.id, log.log_type, log.filename).catch(
+		handleError,
+	)
 	if (output) {
 		historicalConsole.clear()
 		historicalConsole.addLegacyLog(output)
@@ -204,7 +202,7 @@ if (!props.playing) {
 }
 
 const unlistenLog = await log_listener((payload) => {
-	if (payload.profile_path_id !== profilePathId.value) return
+	if (payload.instance_id !== instanceId.value) return
 
 	if (payload.type === 'log4j') {
 		liveConsole.addLog4jEvent(payload)
@@ -214,7 +212,7 @@ const unlistenLog = await log_listener((payload) => {
 })
 
 const unlistenProcesses = await process_listener(async (e) => {
-	if (e.profile_path_id !== profilePathId.value) return
+	if (e.instance_id !== instanceId.value) return
 	if (e.event === 'launched') {
 		liveConsole.clear()
 		invalidate()
@@ -222,7 +220,7 @@ const unlistenProcesses = await process_listener(async (e) => {
 	}
 	if (e.event === 'finished') {
 		invalidate()
-		const freshLogs = await getHistoricalLogs(props.instance.path)
+		const freshLogs = await getHistoricalLogs(props.instance.id)
 		logs.value = buildLogList(freshLogs)
 		void analyseForCrash()
 	}
diff --git a/apps/app-frontend/src/pages/instance/Mods.vue b/apps/app-frontend/src/pages/instance/Mods.vue
index 41af9d55be..8f190c325d 100644
--- a/apps/app-frontend/src/pages/instance/Mods.vue
+++ b/apps/app-frontend/src/pages/instance/Mods.vue
@@ -40,7 +40,7 @@
 					:current-loader="instance.loader"
 					:current-version-id="
 						updatingModpack
-							? (instance.linked_data?.version_id ?? '')
+							? (instance.link?.version_id ?? '')
 							: (updatingProject?.version?.id ?? '')
 					"
 					:is-app="true"
@@ -100,8 +100,7 @@ import ExportModal from '@/components/ui/ExportModal.vue'
 import ShareModalWrapper from '@/components/ui/modal/ShareModalWrapper.vue'
 import { trackEvent } from '@/helpers/analytics'
 import { get_project_versions, get_version, get_version_many } from '@/helpers/cache.js'
-import { profile_listener } from '@/helpers/events.js'
-import { type InstanceContentData, loadInstanceContentData } from '@/helpers/instance-content'
+import { instance_listener } from '@/helpers/events.js'
 import {
 	add_project_from_path,
 	add_project_from_version,
@@ -114,9 +113,10 @@ import {
 	toggle_disable_project,
 	update_managed_modrinth_version,
 	update_project,
-} from '@/helpers/profile'
+} from '@/helpers/instance'
+import { type InstanceContentData, loadInstanceContentData } from '@/helpers/instance-content'
 import type { CacheBehaviour, GameInstance } from '@/helpers/types'
-import { highlightModInProfile } from '@/helpers/utils.js'
+import { highlightModInInstance } from '@/helpers/utils.js'
 import { injectContentInstall } from '@/providers/content-install'
 import { installVersionDependencies } from '@/store/install'
 
@@ -168,7 +168,7 @@ const projects = ref<ContentItem[]>([])
 const installingBuffer = ref<ContentItem[]>([])
 
 watch(
-	() => installingItems.value.get(props.instance.path),
+	() => installingItems.value.get(props.instance.id),
 	(items) => {
 		if (items && items.length > 0) {
 			installingBuffer.value = [...items]
@@ -186,7 +186,7 @@ watch(projects, (newProjects) => {
 })
 
 const mergedProjects = computed<ContentItem[]>(() => {
-	const active = installingItems.value.get(props.instance.path)
+	const active = installingItems.value.get(props.instance.id)
 	const pending = active ?? installingBuffer.value
 	if (pending.length === 0) return projects.value
 	const realProjectIds = new Set(projects.value.map((p) => p.project?.id).filter(Boolean))
@@ -204,7 +204,11 @@ const linkedModpackUpdateVersionId = ref<string | null>(null)
 const isModpackUpdating = ref(false)
 const isBulkOperating = ref(false)
 const isInstanceBusy = computed(() => props.instance?.install_stage !== 'installed')
-const isPackLocked = computed(() => props.instance?.linked_data?.locked ?? false)
+const isPackLocked = computed(
+	() =>
+		props.instance?.link?.type === 'modrinth_modpack' ||
+		props.instance?.link?.type === 'server_project_modpack',
+)
 
 const shareModal = ref<InstanceType<typeof ShareModalWrapper> | null>()
 const exportModal = ref(null)
@@ -245,6 +249,10 @@ function hasContentOperation(item: ContentItem) {
 	return keys.some((key) => activeContentOperationKeys.value.has(key))
 }
 
+function canUpdateProject(item: ContentItem) {
+	return !!item.file_path && !!item.has_update && !!item.update_version_id
+}
+
 function setContentItemBusy(item: ContentItem, busy: boolean, originalFileName = item.file_name) {
 	item.installing = busy
 	modpackContentModal.value?.updateItem(originalFileName, {
@@ -353,7 +361,7 @@ async function handleBrowseContent() {
 	if (!props.instance) return
 	await router.push({
 		path: `/browse/${props.instance.loader === 'vanilla' ? 'resourcepack' : 'mod'}`,
-		query: { i: props.instance.path },
+		query: { i: props.instance.id },
 	})
 }
 
@@ -367,7 +375,7 @@ async function handleUploadFiles() {
 		const path = (file as { path?: string }).path ?? file
 		const fileName = typeof path === 'string' ? (path.split('/').pop() ?? path) : String(path)
 		try {
-			await add_project_from_path(props.instance.path, path)
+			await add_project_from_path(props.instance.id, path)
 			addedFiles.push(fileName)
 		} catch (e) {
 			handleError(e as Error)
@@ -399,7 +407,7 @@ async function toggleDisableMod(mod: ContentItem) {
 	if (!operation) return
 
 	try {
-		const newPath = await toggle_disable_project(props.instance.path, mod.file_path)
+		const newPath = await toggle_disable_project(props.instance.id, mod.file_path)
 		const newFileName = fileNameFromPath(newPath)
 		mod.file_path = newPath
 		mod.file_name = newFileName
@@ -434,7 +442,7 @@ async function removeMod(mod: ContentItem) {
 
 	try {
 		const removedPath = mod.file_path
-		await remove_project(props.instance.path, removedPath)
+		await remove_project(props.instance.id, removedPath)
 		projects.value = projects.value.filter((x) => removedPath !== x.file_path)
 
 		trackEvent('InstanceProjectRemove', {
@@ -509,22 +517,22 @@ async function getDeleteDependencyWarning(items: ContentItem[]) {
 }
 
 async function updateProject(mod: ContentItem) {
-	if (!mod.file_path) return
+	if (!canUpdateProject(mod)) return
 	const operation = beginContentOperation(mod)
 	if (!operation) return
 
 	try {
-		const updateVersionId = mod.update_version_id
-		await update_project(props.instance.path, mod.file_path)
+		const updateVersionId = mod.update_version_id!
+		await update_project(props.instance.id, mod.file_path)
 
 		if (updateVersionId) {
 			const versionData = await get_version(updateVersionId, 'must_revalidate').catch(handleError)
 
 			if (versionData) {
-				const profile = await get(props.instance.path).catch(handleError)
+				const instance = await get(props.instance.id).catch(handleError)
 
-				if (profile) {
-					await installVersionDependencies(profile, versionData, 'update').catch(handleError)
+				if (instance) {
+					await installVersionDependencies(instance, versionData, 'update').catch(handleError)
 				}
 			}
 		}
@@ -556,21 +564,21 @@ async function switchProjectVersion(mod: ContentItem, version: Labrinth.Versions
 	let shouldRemoveNewOnError = false
 
 	try {
-		newPath = await add_project_from_version(props.instance.path, version.id, 'update')
+		newPath = await add_project_from_version(props.instance.id, version.id, 'update')
 		shouldRemoveNewOnError = newPath !== oldPath
 
 		if (wasDisabled) {
-			newPath = await toggle_disable_project(props.instance.path, newPath)
+			newPath = await toggle_disable_project(props.instance.id, newPath)
 		}
 
-		const profile = await get(props.instance.path).catch(handleError)
-		if (profile) {
-			await installVersionDependencies(profile, version, 'update').catch(handleError)
+		const instance = await get(props.instance.id).catch(handleError)
+		if (instance) {
+			await installVersionDependencies(instance, version, 'update').catch(handleError)
 		}
 
 		shouldRemoveNewOnError = false
 		if (newPath !== oldPath) {
-			await remove_project(props.instance.path, oldPath)
+			await remove_project(props.instance.id, oldPath)
 		}
 
 		trackEvent('InstanceProjectUpdate', {
@@ -582,7 +590,7 @@ async function switchProjectVersion(mod: ContentItem, version: Labrinth.Versions
 		})
 	} catch (err) {
 		if (shouldRemoveNewOnError && newPath && newPath !== oldPath) {
-			await remove_project(props.instance.path, newPath).catch(() => {})
+			await remove_project(props.instance.id, newPath).catch(() => {})
 		}
 		handleError(err as Error)
 	} finally {
@@ -593,7 +601,7 @@ async function switchProjectVersion(mod: ContentItem, version: Labrinth.Versions
 
 async function handleUpdate(id: string) {
 	const item = projects.value.find((p) => getContentItemId(p) === id)
-	if (!item?.has_update || !item.project?.id || !item.version?.id) return
+	if (!item || !canUpdateProject(item) || !item.project?.id || !item.version?.id) return
 
 	const requestId = beginUpdateRequest()
 	const itemId = getContentItemId(item)
@@ -633,11 +641,11 @@ async function handleUpdate(id: string) {
 			updateVersionId: item.update_version_id,
 		},
 		instance: {
-			path: props.instance.path,
+			path: props.instance.id,
 			name: props.instance.name,
 			gameVersion: props.instance.game_version,
 			loader: props.instance.loader,
-			linkedData: props.instance.linked_data,
+			link: props.instance.link,
 		},
 		modalStateBeforeFetch: {
 			updatingModpack: updatingModpack.value,
@@ -738,11 +746,11 @@ async function handleModpackContentBulkToggle(items: ContentItem[]) {
 }
 
 async function handleModpackContent() {
-	if (!props.instance?.path) return
+	if (!props.instance?.id) return
 
 	modpackContentModal.value?.showLoading()
 
-	const contentItems = await get_linked_modpack_content(props.instance.path).catch(handleError)
+	const contentItems = await get_linked_modpack_content(props.instance.id).catch(handleError)
 
 	if (contentItems) {
 		modpackContentModal.value?.show(contentItems)
@@ -752,9 +760,9 @@ async function handleModpackContent() {
 }
 
 async function refreshModpackContentItems(cacheBehaviour?: CacheBehaviour) {
-	if (!props.instance?.path) return
+	if (!props.instance?.id) return
 
-	const contentItems = await get_linked_modpack_content(props.instance.path, cacheBehaviour).catch(
+	const contentItems = await get_linked_modpack_content(props.instance.id, cacheBehaviour).catch(
 		handleError,
 	)
 
@@ -769,7 +777,7 @@ async function refreshContentState(cacheBehaviour?: CacheBehaviour) {
 }
 
 async function handleModpackUpdate() {
-	if (!props.instance?.linked_data?.project_id) return
+	if (!props.instance?.link?.project_id) return
 
 	const requestId = beginUpdateRequest()
 
@@ -782,7 +790,7 @@ async function handleModpackUpdate() {
 	await nextTick()
 
 	const initialVersionId =
-		linkedModpackUpdateVersionId.value ?? props.instance?.linked_data?.version_id ?? undefined
+		linkedModpackUpdateVersionId.value ?? props.instance?.link?.version_id ?? undefined
 	debug('handleModpackUpdate: opening modpack updater modal', {
 		type: 'modpack',
 		initialVersionId,
@@ -791,11 +799,11 @@ async function handleModpackUpdate() {
 		linkedModpackVersion: linkedModpackVersion.value,
 		linkedModpackHasUpdate: linkedModpackHasUpdate.value,
 		instance: {
-			path: props.instance.path,
+			path: props.instance.id,
 			name: props.instance.name,
 			gameVersion: props.instance.game_version,
 			loader: props.instance.loader,
-			linkedData: props.instance.linked_data,
+			link: props.instance.link,
 		},
 		modalStateBeforeFetch: {
 			updatingModpack: updatingModpack.value,
@@ -811,10 +819,7 @@ async function handleModpackUpdate() {
 	})
 	contentUpdaterModal.value?.show(initialVersionId)
 
-	const versions = await getUpdaterProjectVersions(
-		props.instance.linked_data.project_id,
-		initialVersionId,
-	)
+	const versions = await getUpdaterProjectVersions(props.instance.link.project_id, initialVersionId)
 
 	if (!isActiveUpdateRequest(requestId) || !updatingModpack.value) return
 
@@ -839,7 +844,7 @@ async function handleModpackUpdate() {
 			: null,
 		versionCount: versions.length,
 		linkedModpackUpdateVersionId: linkedModpackUpdateVersionId.value,
-		currentLinkedVersionId: props.instance.linked_data.version_id,
+		currentLinkedVersionId: props.instance.link.version_id,
 	})
 
 	updatingProjectVersions.value = versions
@@ -891,7 +896,7 @@ function resetUpdateState() {
 async function handleModpackUpdateRequest(selectedVersion: Labrinth.Versions.v2.Version) {
 	pendingModpackUpdateVersion.value = selectedVersion
 
-	const currentVersionId = props.instance?.linked_data?.version_id
+	const currentVersionId = props.instance?.link?.version_id
 	const currentVersion = updatingProjectVersions.value.find((v) => v.id === currentVersionId)
 	isModpackUpdateDowngrade.value = currentVersion
 		? new Date(selectedVersion.date_published) < new Date(currentVersion.date_published)
@@ -909,7 +914,7 @@ async function handleModpackUpdateRequest(selectedVersion: Labrinth.Versions.v2.
 }
 
 async function handleModpackUpdateConfirm() {
-	if (!pendingModpackUpdateVersion.value || !props.instance?.path) return
+	if (!pendingModpackUpdateVersion.value || !props.instance?.id) return
 
 	const version = pendingModpackUpdateVersion.value
 	pendingModpackUpdateVersion.value = null
@@ -917,7 +922,7 @@ async function handleModpackUpdateConfirm() {
 	contentUpdaterModal.value?.hide()
 	isModpackUpdating.value = true
 	try {
-		await update_managed_modrinth_version(props.instance.path, version.id)
+		await update_managed_modrinth_version(props.instance.id, version.id)
 		await initProjects()
 	} finally {
 		isModpackUpdating.value = false
@@ -955,9 +960,9 @@ async function handleModalUpdate(
 	}
 }
 
-async function unpairProfile() {
-	await edit(props.instance.path, {
-		linked_data: null as unknown as undefined,
+async function unpairInstance() {
+	await edit(props.instance.id, {
+		link: null as unknown as undefined,
 	})
 	linkedModpackProject.value = null
 	linkedModpackVersion.value = null
@@ -1007,7 +1012,7 @@ function getOverflowOptions(item: ContentItem): OverflowMenuOption[] {
 	options.push({
 		id: formatMessage(commonMessages.showFileButton),
 		icon: FolderOpenIcon,
-		action: () => highlightModInProfile(props.instance.path, item.file_path),
+		action: () => highlightModInInstance(props.instance.id, item.file_path),
 	})
 
 	if (item.project?.slug) {
@@ -1028,23 +1033,22 @@ function getOverflowOptions(item: ContentItem): OverflowMenuOption[] {
 async function initProjects(cacheBehaviour?: CacheBehaviour) {
 	if (!props.instance) return
 
-	const contentData = await loadInstanceContentData(
-		props.instance.path,
-		cacheBehaviour,
-		handleError,
-	)
+	const contentData = await loadInstanceContentData(props.instance.id, cacheBehaviour, handleError)
 	applyContentData(contentData)
 }
 
 function applyContentData(contentData: InstanceContentData) {
-	if (contentData.path !== props.instance.path) return false
+	if (contentData.path !== props.instance.id) return false
 
 	if (!contentData.contentItems) {
 		loading.value = false
 		return true
 	}
 
-	projects.value = contentData.contentItems
+	projects.value = contentData.contentItems.map((item) => ({
+		...item,
+		has_update: canUpdateProject(item),
+	}))
 
 	if (contentData.modpack) {
 		linkedModpackProject.value = contentData.modpack.project
@@ -1068,14 +1072,14 @@ function applyContentData(contentData: InstanceContentData) {
 
 provideAppBackup({
 	async createBackup() {
-		const allProfiles = await list()
+		const allInstances = await list()
 		const prefix = `${props.instance.name} - Backup #`
-		const existingNums = allProfiles
+		const existingNums = allInstances
 			.filter((p) => p.name.startsWith(prefix))
 			.map((p) => parseInt(p.name.slice(prefix.length), 10))
 			.filter((n) => !isNaN(n))
 		const nextNum = existingNums.length > 0 ? Math.max(...existingNums) + 1 : 1
-		const newPath = await duplicate(props.instance.path)
+		const newPath = await duplicate(props.instance.id)
 		await edit(newPath, { name: `${prefix}${nextNum}` })
 	},
 })
@@ -1097,14 +1101,14 @@ provideContentManager({
 					project: linkedModpackProject.value,
 					projectLink: {
 						path: `/project/${linkedModpackProject.value.slug ?? linkedModpackProject.value.id}`,
-						query: { i: props.instance.path },
+						query: { i: props.instance.id },
 					},
 					version: linkedModpackVersion.value ?? undefined,
 					versionLink:
 						linkedModpackProject.value && linkedModpackVersion.value
 							? {
 									path: `/project/${linkedModpackProject.value.slug ?? linkedModpackProject.value.id}/version/${linkedModpackVersion.value.id}`,
-									query: { i: props.instance.path },
+									query: { i: props.instance.id },
 								}
 							: undefined,
 					owner: linkedModpackOwner.value
@@ -1148,9 +1152,11 @@ provideContentManager({
 	hasUpdateSupport: true,
 	updateItem: handleUpdate,
 	bulkUpdateItem: updateProject,
+	bulkUpdateItems: (items: ContentItem[]) =>
+		Promise.all(items.filter(canUpdateProject).map((item) => updateProject(item))).then(() => {}),
 	updateModpack: props.isServerInstance ? undefined : handleModpackUpdate,
 	viewModpackContent: handleModpackContent,
-	unlinkModpack: unpairProfile,
+	unlinkModpack: unpairInstance,
 	openSettings: props.openSettings,
 	switchVersion: handleSwitchVersion,
 	getOverflowOptions,
@@ -1167,7 +1173,7 @@ provideContentManager({
 			icon_url: null,
 		},
 		projectLink: item.project?.id
-			? { path: `/project/${item.project.id}`, query: { i: props.instance.path } }
+			? { path: `/project/${item.project.id}`, query: { i: props.instance.id } }
 			: undefined,
 		version: item.version ?? {
 			id: item.file_name,
@@ -1178,7 +1184,7 @@ provideContentManager({
 			item.project?.id && item.version?.id
 				? {
 						path: `/project/${item.project.id}/version/${item.version.id}`,
-						query: { i: props.instance.path },
+						query: { i: props.instance.id },
 					}
 				: undefined,
 		owner: item.owner
@@ -1190,7 +1196,7 @@ provideContentManager({
 		enabled: item.enabled,
 		installing: item.installing,
 	}),
-	filterPersistKey: props.instance.path,
+	filterPersistKey: props.instance.id,
 })
 
 type UnlistenFn = () => void
@@ -1223,7 +1229,7 @@ const removeBeforeEach = router.beforeEach(() => {
 
 let isUnmounted = false
 let unlistenDragDrop: UnlistenFn | null = null
-let unlistenProfiles: UnlistenFn | null = null
+let unlistenInstances: UnlistenFn | null = null
 
 onMounted(() => {
 	void getCurrentWebview()
@@ -1232,7 +1238,7 @@ onMounted(() => {
 
 			for (const file of event.payload.paths) {
 				if (file.endsWith('.mrpack')) continue
-				await add_project_from_path(props.instance.path, file).catch(handleError)
+				await add_project_from_path(props.instance.id, file).catch(handleError)
 			}
 			await initProjects()
 		})
@@ -1246,10 +1252,10 @@ onMounted(() => {
 		})
 		.catch(handleError)
 
-	void profile_listener(async (event: { event: string; profile_path_id: string }) => {
+	void instance_listener(async (event: { event: string; instance_id: string }) => {
 		if (
 			props.instance &&
-			event.profile_path_id === props.instance.path &&
+			event.instance_id === props.instance.id &&
 			event.event === 'synced' &&
 			props.instance.install_stage !== 'pack_installing' &&
 			!isBulkOperating.value
@@ -1263,7 +1269,7 @@ onMounted(() => {
 				return
 			}
 
-			unlistenProfiles = unlisten
+			unlistenInstances = unlisten
 		})
 		.catch(handleError)
 })
@@ -1280,16 +1286,16 @@ watch(
 )
 
 watch(
-	() => props.instance?.linked_data,
-	async (newLinkedData, oldLinkedData) => {
-		if (oldLinkedData && !newLinkedData) {
+	() => props.instance?.link,
+	async (newInstanceLink, oldInstanceLink) => {
+		if (oldInstanceLink && !newInstanceLink) {
 			await initProjects('must_revalidate')
 		}
 	},
 )
 
 watch(
-	() => props.instance?.preferred_update_channel,
+	() => props.instance?.update_channel,
 	async (newValue, oldValue) => {
 		if (newValue !== oldValue) {
 			await initProjects('must_revalidate')
@@ -1301,6 +1307,6 @@ onUnmounted(() => {
 	isUnmounted = true
 	removeBeforeEach()
 	unlistenDragDrop?.()
-	unlistenProfiles?.()
+	unlistenInstances?.()
 })
 </script>
diff --git a/apps/app-frontend/src/pages/instance/Worlds.vue b/apps/app-frontend/src/pages/instance/Worlds.vue
index ec7f745175..933cd5d0f1 100644
--- a/apps/app-frontend/src/pages/instance/Worlds.vue
+++ b/apps/app-frontend/src/pages/instance/Worlds.vue
@@ -64,7 +64,7 @@
 						<button
 							class="!h-10 flex items-center gap-2"
 							@click="
-								router.push({ path: '/browse/server', query: { i: instance.path, from: 'worlds' } })
+								router.push({ path: '/browse/server', query: { i: instance.id, from: 'worlds' } })
 							"
 						>
 							<CompassIcon class="size-5" />
@@ -129,7 +129,7 @@
 									: editServerModal?.show(world)
 					"
 					@delete="() => !isManagedServerWorld(world) && promptToRemoveWorld(world)"
-					@open-folder="(world: SingleplayerWorld) => showWorldInFolder(instance.path, world.path)"
+					@open-folder="(world: SingleplayerWorld) => showWorldInFolder(instance.id, world.path)"
 				/>
 			</div>
 		</div>
@@ -150,7 +150,7 @@
 					<button
 						class="!h-10 flex items-center gap-2"
 						@click="
-							router.push({ path: '/browse/server', query: { i: instance.path, from: 'worlds' } })
+							router.push({ path: '/browse/server', query: { i: instance.id, from: 'worlds' } })
 						"
 					>
 						<CompassIcon class="size-5" />
@@ -189,25 +189,25 @@ import EditWorldModal from '@/components/ui/world/modal/EditSingleplayerWorldMod
 import WorldItem from '@/components/ui/world/WorldItem.vue'
 import { trackEvent } from '@/helpers/analytics'
 import { get_project, get_project_v3 } from '@/helpers/cache.js'
-import { profile_listener } from '@/helpers/events'
+import { instance_listener } from '@/helpers/events'
 import { get_game_versions } from '@/helpers/tags'
 import type { GameInstance } from '@/helpers/types'
 import {
 	delete_world,
-	get_profile_protocol_version,
+	get_instance_protocol_version,
 	getServerDomainKey,
 	getWorldIdentifier,
-	handleDefaultProfileUpdateEvent,
+	handleDefaultInstanceUpdateEvent,
 	hasServerQuickPlaySupport,
 	hasWorldQuickPlaySupport,
+	type InstanceEvent,
 	normalizeServerAddress,
-	type ProfileEvent,
 	type ProtocolVersion,
 	refreshServerData,
 	refreshServers,
 	refreshWorld,
 	refreshWorlds,
-	remove_server_from_profile,
+	remove_server_from_instance,
 	resolveManagedServerWorld,
 	type ServerData,
 	type ServerWorld,
@@ -357,8 +357,8 @@ const startingInstance = ref(false)
 const worldPlaying = ref<World>()
 
 const worldsQuery = useQuery({
-	queryKey: computed(() => ['worlds', instance.value.path]),
-	queryFn: () => refreshWorlds(instance.value.path),
+	queryKey: computed(() => ['worlds', instance.value.id]),
+	queryFn: () => refreshWorlds(instance.value.id),
 	staleTime: 30_000,
 })
 
@@ -406,12 +406,12 @@ function isManagedServerWorld(world: World): world is ServerWorld {
 
 async function refreshManagedServerMetadata() {
 	await ensureManagedServerWorldExists(
-		instance.value.path,
+		instance.value.id,
 		managedServerName.value,
 		managedServerAddress.value,
 	)
 
-	const projectId = instance.value.linked_data?.project_id
+	const projectId = instance.value.link?.project_id
 	if (!projectId) {
 		managedServerName.value = null
 		managedServerAddress.value = null
@@ -441,7 +441,7 @@ async function refreshManagedServerMetadata() {
 		managedServerAddress.value = serverAddress
 	} catch (err) {
 		console.error(
-			`Failed to resolve managed server metadata for profile: ${instance.value.path}`,
+			`Failed to resolve managed server metadata for instance: ${instance.value.id}`,
 			err,
 		)
 		managedServerName.value = null
@@ -450,22 +450,22 @@ async function refreshManagedServerMetadata() {
 }
 
 watch(
-	() => instance.value.linked_data?.project_id,
+	() => instance.value.link?.project_id,
 	async () => {
 		await refreshManagedServerMetadata()
 	},
 	{ immediate: true },
 )
 
-let unlistenProfile: (() => void) | null = null
+let unlistenInstance: (() => void) | null = null
 let worldsTabAlive = true
 
 async function initWorldsTab() {
-	const [_unlistenProfile, resolvedProtocolVersion, resolvedGameVersions] = await Promise.all([
-		profile_listener(async (e: ProfileEvent) => {
-			if (e.profile_path_id !== instance.value.path) return
+	const [_unlistenInstance, resolvedProtocolVersion, resolvedGameVersions] = await Promise.all([
+		instance_listener(async (e: InstanceEvent) => {
+			if (e.instance_id !== instance.value.id) return
 
-			console.info(`Handling profile event '${e.event}' for profile: ${e.profile_path_id}`)
+			console.info(`Handling instance event '${e.event}' for instance: ${e.instance_id}`)
 
 			if (e.event === 'servers_updated') {
 				if (isLinux && linuxRefreshCount.value >= MAX_LINUX_REFRESHES) return
@@ -474,18 +474,18 @@ async function initWorldsTab() {
 				await refreshAllWorlds()
 			}
 
-			await handleDefaultProfileUpdateEvent(worlds.value, instance.value.path, e)
+			await handleDefaultInstanceUpdateEvent(worlds.value, instance.value.id, e)
 		}),
-		get_profile_protocol_version(instance.value.path).catch(() => null),
+		get_instance_protocol_version(instance.value.id).catch(() => null),
 		get_game_versions().catch(() => [] as GameVersion[]),
 	])
 
 	if (!worldsTabAlive) {
-		_unlistenProfile()
+		_unlistenInstance()
 		return
 	}
 
-	unlistenProfile = _unlistenProfile
+	unlistenInstance = _unlistenInstance
 	protocolVersion.value = resolvedProtocolVersion
 	gameVersions.value = resolvedGameVersions
 }
@@ -508,7 +508,7 @@ async function refreshAllWorlds() {
 	}
 
 	refreshingAll.value = true
-	await queryClient.invalidateQueries({ queryKey: ['worlds', instance.value.path] })
+	await queryClient.invalidateQueries({ queryKey: ['worlds', instance.value.id] })
 	refreshingAll.value = false
 }
 
@@ -534,7 +534,7 @@ async function editServer(server: ServerWorld) {
 }
 
 async function removeServer(server: ServerWorld) {
-	await remove_server_from_profile(instance.value.path, server.index).catch(handleError)
+	await remove_server_from_instance(instance.value.id, server.index).catch(handleError)
 	worlds.value = worlds.value.filter((w) => w.type !== 'server' || w.index !== server.index)
 	let serverIdx = 0
 	for (const w of worlds.value) {
@@ -559,12 +559,12 @@ async function editWorld(path: string, name: string, removeIcon: boolean) {
 }
 
 async function deleteWorld(world: SingleplayerWorld) {
-	await delete_world(instance.value.path, world.path).catch(handleError)
+	await delete_world(instance.value.id, world.path).catch(handleError)
 	worlds.value = worlds.value.filter((w) => w.type !== 'singleplayer' || w.path !== world.path)
 }
 
 function handleJoinError(err: Error) {
-	handleSevereError(err, { profilePath: instance.value.path })
+	handleSevereError(err, { instanceId: instance.value.id })
 	startingInstance.value = false
 	worldPlaying.value = undefined
 }
@@ -574,7 +574,7 @@ async function joinWorld(world: World) {
 	startingInstance.value = true
 	worldPlaying.value = world
 	if (world.type === 'server') {
-		const managedProjectId = instance.value.linked_data?.project_id
+		const managedProjectId = instance.value.link?.project_id
 		if (managedProjectId && isManagedServerWorld(world)) {
 			await playServerProject(managedProjectId).catch(handleJoinError)
 			trackEvent('InstanceStart', {
@@ -585,14 +585,14 @@ async function joinWorld(world: World) {
 			startingInstance.value = false
 			return
 		}
-		await start_join_server(instance.value.path, world.address).catch(handleJoinError)
+		await start_join_server(instance.value.id, world.address).catch(handleJoinError)
 		trackEvent('InstanceStart', {
 			loader: instance.value.loader,
 			game_version: instance.value.game_version,
 			source: 'WorldsPage',
 		})
 	} else if (world.type === 'singleplayer') {
-		await start_join_singleplayer_world(instance.value.path, world.path).catch(handleJoinError)
+		await start_join_singleplayer_world(instance.value.id, world.path).catch(handleJoinError)
 	}
 	play(world)
 	startingInstance.value = false
@@ -607,7 +607,7 @@ watch(
 			setTimeout(async () => {
 				for (const world of worlds.value) {
 					if (world.type === 'singleplayer' && world.locked) {
-						await refreshWorld(worlds.value, instance.value.path, world.path)
+						await refreshWorld(worlds.value, instance.value.id, world.path)
 					}
 				}
 			}, 1000)
@@ -775,6 +775,6 @@ async function proceedDeleteWorld() {
 
 onBeforeUnmount(() => {
 	worldsTabAlive = false
-	unlistenProfile?.()
+	unlistenInstance?.()
 })
 </script>
diff --git a/apps/app-frontend/src/pages/library/Custom.vue b/apps/app-frontend/src/pages/library/Custom.vue
index b0e6dd4352..25b9f16fed 100644
--- a/apps/app-frontend/src/pages/library/Custom.vue
+++ b/apps/app-frontend/src/pages/library/Custom.vue
@@ -12,6 +12,6 @@ defineProps({
 	<GridDisplay
 		v-if="instances && instances.length > 0"
 		label="Instances"
-		:instances="instances.filter((i) => !i.linked_data)"
+		:instances="instances.filter((i) => !i.link)"
 	/>
 </template>
diff --git a/apps/app-frontend/src/pages/library/Downloaded.vue b/apps/app-frontend/src/pages/library/Downloaded.vue
index 98bd030d1a..78a1be9453 100644
--- a/apps/app-frontend/src/pages/library/Downloaded.vue
+++ b/apps/app-frontend/src/pages/library/Downloaded.vue
@@ -12,6 +12,6 @@ defineProps({
 	<GridDisplay
 		v-if="instances && instances.length > 0"
 		label="Instances"
-		:instances="instances.filter((i) => i.linked_data)"
+		:instances="instances.filter((i) => i.link)"
 	/>
 </template>
diff --git a/apps/app-frontend/src/pages/library/Index.vue b/apps/app-frontend/src/pages/library/Index.vue
index 222aaab16a..b9a83bffc8 100644
--- a/apps/app-frontend/src/pages/library/Index.vue
+++ b/apps/app-frontend/src/pages/library/Index.vue
@@ -5,8 +5,8 @@ import { inject, onUnmounted, ref, shallowRef } from 'vue'
 import { useRoute } from 'vue-router'
 
 import { NewInstanceImage } from '@/assets/icons'
-import { profile_listener } from '@/helpers/events.js'
-import { list } from '@/helpers/profile.js'
+import { instance_listener } from '@/helpers/events.js'
+import { list } from '@/helpers/instance'
 import { useBreadcrumbs } from '@/store/breadcrumbs.js'
 
 const { handleError } = injectNotificationManager()
@@ -26,11 +26,11 @@ window.addEventListener('online', () => {
 	offline.value = false
 })
 
-const unlistenProfile = await profile_listener(async () => {
+const unlistenInstance = await instance_listener(async () => {
 	instances.value = await list().catch(handleError)
 })
 onUnmounted(() => {
-	unlistenProfile()
+	unlistenInstance()
 })
 </script>
 
diff --git a/apps/app-frontend/src/pages/library/Modpacks.vue b/apps/app-frontend/src/pages/library/Modpacks.vue
index 245592dd4b..259e2b236d 100644
--- a/apps/app-frontend/src/pages/library/Modpacks.vue
+++ b/apps/app-frontend/src/pages/library/Modpacks.vue
@@ -13,11 +13,11 @@ const props = defineProps({
 
 const serverProjectIds = ref(new Set())
 
-const linkedInstances = computed(() => props.instances.filter((i) => i.linked_data))
+const linkedInstances = computed(() => props.instances.filter((i) => i.link))
 
 watchEffect(async () => {
 	const projectIds = [
-		...new Set(linkedInstances.value.map((i) => i.linked_data?.project_id).filter(Boolean)),
+		...new Set(linkedInstances.value.map((i) => i.link?.project_id).filter(Boolean)),
 	]
 	if (projectIds.length === 0) {
 		serverProjectIds.value = new Set()
@@ -35,7 +35,7 @@ watchEffect(async () => {
 })
 
 const filteredInstances = computed(() =>
-	linkedInstances.value.filter((i) => !serverProjectIds.value.has(i.linked_data?.project_id)),
+	linkedInstances.value.filter((i) => !serverProjectIds.value.has(i.link?.project_id)),
 )
 </script>
 <template>
diff --git a/apps/app-frontend/src/pages/library/Servers.vue b/apps/app-frontend/src/pages/library/Servers.vue
index 092166be68..11470787b4 100644
--- a/apps/app-frontend/src/pages/library/Servers.vue
+++ b/apps/app-frontend/src/pages/library/Servers.vue
@@ -13,11 +13,11 @@ const props = defineProps({
 
 const serverProjectIds = ref(new Set())
 
-const linkedInstances = computed(() => props.instances.filter((i) => i.linked_data))
+const linkedInstances = computed(() => props.instances.filter((i) => i.link))
 
 watchEffect(async () => {
 	const projectIds = [
-		...new Set(linkedInstances.value.map((i) => i.linked_data?.project_id).filter(Boolean)),
+		...new Set(linkedInstances.value.map((i) => i.link?.project_id).filter(Boolean)),
 	]
 	if (projectIds.length === 0) {
 		serverProjectIds.value = new Set()
@@ -35,7 +35,7 @@ watchEffect(async () => {
 })
 
 const filteredInstances = computed(() =>
-	linkedInstances.value.filter((i) => serverProjectIds.value.has(i.linked_data?.project_id)),
+	linkedInstances.value.filter((i) => serverProjectIds.value.has(i.link?.project_id)),
 )
 </script>
 <template>
diff --git a/apps/app-frontend/src/pages/project/Index.vue b/apps/app-frontend/src/pages/project/Index.vue
index 7d5b24dd36..69a9d6ce37 100644
--- a/apps/app-frontend/src/pages/project/Index.vue
+++ b/apps/app-frontend/src/pages/project/Index.vue
@@ -304,14 +304,14 @@ import {
 	get_version_many,
 } from '@/helpers/cache.js'
 import { process_listener } from '@/helpers/events'
-import { get_loader_versions as getLoaderManifest } from '@/helpers/metadata'
-import { get_by_profile_path } from '@/helpers/process'
 import {
 	get as getInstance,
 	get_projects as getInstanceProjects,
 	kill,
 	list as listInstances,
-} from '@/helpers/profile'
+} from '@/helpers/instance'
+import { get_loader_versions as getLoaderManifest } from '@/helpers/metadata'
+import { get_by_instance_id } from '@/helpers/process'
 import { get_categories, get_game_versions, get_loaders } from '@/helpers/tags'
 import { getServerLatency } from '@/helpers/worlds'
 import { injectContentInstall } from '@/providers/content-install'
@@ -529,10 +529,10 @@ async function handleClickPlay() {
 async function updateServerPlayState() {
 	if (!isServerProject.value || !data.value) return
 	const packs = await listInstances()
-	const inst = packs.find((p) => p.linked_data?.project_id === data.value.id)
+	const inst = packs.find((p) => p.link?.project_id === data.value.id)
 	if (inst) {
-		serverInstancePath.value = inst.path
-		const processes = await get_by_profile_path(inst.path).catch(() => [])
+		serverInstancePath.value = inst.id
+		const processes = await get_by_instance_id(inst.id).catch(() => [])
 		serverPlaying.value = Array.isArray(processes) && processes.length > 0
 	} else {
 		serverInstancePath.value = null
@@ -662,7 +662,7 @@ process_listener((e) => {
 	if (
 		e.event === 'finished' &&
 		serverInstancePath.value &&
-		e.profile_path_id === serverInstancePath.value
+		e.instance_id === serverInstancePath.value
 	) {
 		serverPlaying.value = false
 	}
@@ -737,7 +737,7 @@ async function install(version) {
 	await installVersion(
 		data.value.id,
 		version,
-		instance.value ? instance.value.path : null,
+		instance.value ? instance.value.id : null,
 		'ProjectPage',
 		(version, installedProjectIds) => {
 			installing.value = false
diff --git a/apps/app-frontend/src/providers/content-install.ts b/apps/app-frontend/src/providers/content-install.ts
index 62314b23ea..206cc4ffc7 100644
--- a/apps/app-frontend/src/providers/content-install.ts
+++ b/apps/app-frontend/src/providers/content-install.ts
@@ -15,7 +15,6 @@ import {
 	get_team,
 	get_version_many,
 } from '@/helpers/cache.js'
-import { create_profile_and_install as packInstall } from '@/helpers/pack'
 import {
 	add_project_from_version,
 	check_installed_batch,
@@ -24,7 +23,8 @@ import {
 	get_projects,
 	list,
 	remove_project,
-} from '@/helpers/profile.js'
+} from '@/helpers/instance'
+import { create_instance_and_install as packInstall } from '@/helpers/pack'
 import { get_game_versions } from '@/helpers/tags'
 import type { GameInstance, InstanceLoader } from '@/helpers/types'
 import {
@@ -39,7 +39,7 @@ interface ModalRef {
 }
 
 interface ModpackAlreadyInstalledModalRef {
-	show: (instanceName: string, instancePath: string) => void
+	show: (instanceName: string, instanceId: string) => void
 }
 
 export type ContentInstallCallback = (versionId?: string, installedProjectIds?: string[]) => void
@@ -87,7 +87,7 @@ export interface ContentInstallContext {
 	setContentInstallModal: (ref: ModalRef) => void
 	setModpackAlreadyInstalledModal: (ref: ModpackAlreadyInstalledModalRef) => void
 	handleModpackDuplicateCreateAnyway: () => Promise<void>
-	handleModpackDuplicateGoToInstance: (instancePath: string) => void
+	handleModpackDuplicateGoToInstance: (instanceId: string) => void
 	setIncompatibilityWarningModal: (ref: ModalRef) => void
 	incompatibilityWarningVersions: Ref<Labrinth.Versions.v2.Version[]>
 	incompatibilityWarningCurrentGameVersion: Ref<string>
@@ -102,10 +102,10 @@ export interface ContentInstallContext {
 	install: (
 		projectId: string,
 		versionId?: string | null,
-		instancePath?: string | null,
+		instanceId?: string | null,
 		source?: string,
 		callback?: ContentInstallCallback,
-		createInstanceCallback?: (profile: string) => void,
+		createInstanceCallback?: (instanceId: string) => void,
 		hints?: { preferredLoader?: string; preferredGameVersion?: string; showProjectInfo?: boolean },
 	) => Promise<void>
 	installingItems: Ref<Map<string, ContentItem[]>>
@@ -142,7 +142,7 @@ export function createContentInstall(opts: {
 	const incompatibilityWarningInstalling = ref(false)
 
 	function addInstallingItem(
-		instancePath: string,
+		instanceId: string,
 		project: {
 			id: string
 			slug?: string | null
@@ -178,15 +178,15 @@ export function createContentInstall(opts: {
 			installing: true,
 		}
 		const next = new Map(installingItems.value)
-		const items = next.get(instancePath) ?? []
+		const items = next.get(instanceId) ?? []
 		if (items.some((i) => i.file_name === placeholder.file_name)) return
-		next.set(instancePath, [...items, placeholder])
+		next.set(instanceId, [...items, placeholder])
 		installingItems.value = next
 
 		if (project.organization) {
 			get_organization(project.organization)
 				.then((org: { id: string; slug: string; name: string; icon_url?: string }) => {
-					updateInstallingItem(instancePath, placeholder.file_name, {
+					updateInstallingItem(instanceId, placeholder.file_name, {
 						owner: {
 							id: org.id,
 							name: org.name,
@@ -207,7 +207,7 @@ export function createContentInstall(opts: {
 					) => {
 						const owner = members.find((m) => m.is_owner)
 						if (owner) {
-							updateInstallingItem(instancePath, placeholder.file_name, {
+							updateInstallingItem(instanceId, placeholder.file_name, {
 								owner: {
 									id: owner.user.id,
 									name: owner.user.username,
@@ -223,31 +223,31 @@ export function createContentInstall(opts: {
 	}
 
 	function updateInstallingItem(
-		instancePath: string,
+		instanceId: string,
 		fileName: string,
 		updates: Partial<ContentItem>,
 	) {
 		const next = new Map(installingItems.value)
-		const items = next.get(instancePath)
+		const items = next.get(instanceId)
 		if (!items) return
 		const index = items.findIndex((i) => i.file_name === fileName)
 		if (index === -1) return
 		const updated = [...items]
 		updated[index] = { ...updated[index], ...updates }
-		next.set(instancePath, updated)
+		next.set(instanceId, updated)
 		installingItems.value = next
 	}
 
-	function removeInstallingItems(instancePath: string, projectIds: string[]) {
+	function removeInstallingItems(instanceId: string, projectIds: string[]) {
 		const next = new Map(installingItems.value)
-		const items = next.get(instancePath)
+		const items = next.get(instanceId)
 		if (items) {
 			const idsToRemove = new Set(projectIds.map((id) => `__installing_${id}`))
 			const filtered = items.filter((i) => !idsToRemove.has(i.file_name))
 			if (filtered.length > 0) {
-				next.set(instancePath, filtered)
+				next.set(instanceId, filtered)
 			} else {
-				next.delete(instancePath)
+				next.delete(instanceId)
 			}
 			installingItems.value = next
 		}
@@ -259,7 +259,7 @@ export function createContentInstall(opts: {
 	let currentProject: Labrinth.Projects.v2.Project | null = null
 	let currentVersions: Labrinth.Versions.v2.Version[] = []
 	let currentCallback: ContentInstallCallback = () => {}
-	let profileMap: Record<string, GameInstance> = {}
+	let instanceMap: Record<string, GameInstance> = {}
 	let incompatibilityWarningInstance: GameInstance | null = null
 	let incompatibilityWarningProject: Labrinth.Projects.v2.Project | null = null
 	let incompatibilityWarningCallback: ContentInstallCallback = () => {}
@@ -270,7 +270,7 @@ export function createContentInstall(opts: {
 		version: string
 		source: string
 		callback: ContentInstallCallback
-		createInstanceCallback: (profile: string) => void
+		createInstanceCallback: (instanceId: string) => void
 	} | null = null
 
 	async function showModInstallModal(
@@ -378,11 +378,11 @@ export function createContentInstall(opts: {
 				: null
 
 		try {
-			let profiles = await list()
+			let availableInstances = await list()
 
-			const linkedProjectIds = profiles
-				.filter((p) => p.linked_data?.project_id)
-				.map((p) => p.linked_data!.project_id)
+			const linkedProjectIds = availableInstances
+				.filter((p) => p.link?.project_id)
+				.map((p) => p.link!.project_id)
 			if (linkedProjectIds.length > 0) {
 				const linkedProjects = await get_project_v3_many(linkedProjectIds, 'must_revalidate').catch(
 					() => [],
@@ -392,27 +392,27 @@ export function createContentInstall(opts: {
 						.filter((p: { id: string; minecraft_server?: unknown }) => p?.minecraft_server != null)
 						.map((p: { id: string }) => p.id),
 				)
-				profiles = profiles.filter(
-					(p) => !p.linked_data?.project_id || !serverProjectIds.has(p.linked_data.project_id),
+				availableInstances = availableInstances.filter(
+					(p) => !p.link?.project_id || !serverProjectIds.has(p.link.project_id),
 				)
 			}
 
-			const newProfileMap: Record<string, GameInstance> = {}
+			const newInstanceMap: Record<string, GameInstance> = {}
 			const installedMap = await check_installed_batch(project.id)
 
-			const newInstances: ContentInstallInstance[] = profiles.map((profile) => {
-				newProfileMap[profile.path] = profile
+			const newInstances: ContentInstallInstance[] = availableInstances.map((instance) => {
+				newInstanceMap[instance.id] = instance
 				return {
-					id: profile.path,
-					name: profile.name,
-					iconUrl: profile.icon_path ? convertFileSrc(profile.icon_path) : null,
-					installed: installedMap[profile.path] ?? false,
-					compatible: versions.some((v) => isVersionCompatible(v, project, profile)),
+					id: instance.id,
+					name: instance.name,
+					iconUrl: instance.icon_path ? convertFileSrc(instance.icon_path) : null,
+					installed: installedMap[instance.id] ?? false,
+					compatible: versions.some((v) => isVersionCompatible(v, project, instance)),
 					installing: false,
 				}
 			})
 
-			profileMap = newProfileMap
+			instanceMap = newInstanceMap
 			instances.value = newInstances
 
 			if (!newInstances.some((i) => i.compatible && !i.installed)) {
@@ -428,14 +428,14 @@ export function createContentInstall(opts: {
 	}
 
 	async function handleInstallToInstance(instance: ContentInstallInstance) {
-		const profile = profileMap[instance.id]
+		const selectedInstance = instanceMap[instance.id]
 		const storeInstance = instances.value.find((i) => i.id === instance.id)
-		if (!currentProject || !profile) {
+		if (!currentProject || !selectedInstance) {
 			opts.handleError('No project or instance found')
 			return
 		}
 
-		const version = findPreferredVersion(currentVersions, currentProject, profile)
+		const version = findPreferredVersion(currentVersions, currentProject, selectedInstance)
 		if (!version) {
 			if (currentVersions.length > 0 && incompatibilityWarningModalRef) {
 				const onIncompatibleInstall = (versionId?: string) => {
@@ -445,7 +445,7 @@ export function createContentInstall(opts: {
 					currentCallback(versionId, versionId && currentProject ? [currentProject.id] : undefined)
 				}
 				await showIncompatibilityWarning(
-					profile,
+					selectedInstance,
 					currentProject,
 					currentVersions,
 					currentVersions[0],
@@ -468,7 +468,7 @@ export function createContentInstall(opts: {
 		try {
 			await add_project_from_version(instance.id, version.id, 'standalone')
 			await installVersionDependencies(
-				profile,
+				selectedInstance,
 				version,
 				'dependency',
 				(depProject: Labrinth.Projects.v2.Project, depVersion?: Labrinth.Versions.v2.Version) => {
@@ -481,8 +481,8 @@ export function createContentInstall(opts: {
 				storeInstance.installing = false
 			}
 			trackEvent('ProjectInstall', {
-				loader: profile.loader,
-				game_version: profile.game_version,
+				loader: selectedInstance.loader,
+				game_version: selectedInstance.game_version,
 				id: currentProject!.id,
 				version_id: version.id,
 				project_type: currentProject!.project_type,
@@ -535,7 +535,7 @@ export function createContentInstall(opts: {
 
 		incompatibilityWarningInstalling.value = true
 		try {
-			await add_project_from_version(incompatibilityWarningInstance.path, version.id, 'standalone')
+			await add_project_from_version(incompatibilityWarningInstance.id, version.id, 'standalone')
 		} catch (err) {
 			opts.handleError(err)
 			incompatibilityWarningInstalling.value = false
@@ -630,10 +630,10 @@ export function createContentInstall(opts: {
 	async function install(
 		projectId: string,
 		versionId?: string | null,
-		instancePath?: string | null,
+		instanceId?: string | null,
 		source: string = 'unknown',
 		callback: ContentInstallCallback = () => {},
-		createInstanceCallback: (profile: string) => void = () => {},
+		createInstanceCallback: (instanceId: string) => void = () => {},
 		hints?: { preferredLoader?: string; preferredGameVersion?: string; showProjectInfo?: boolean },
 	) {
 		const project: Labrinth.Projects.v2.Project = await get_project(projectId, 'must_revalidate')
@@ -641,11 +641,11 @@ export function createContentInstall(opts: {
 		if (project.project_type === 'modpack') {
 			const version = versionId ?? project.versions[project.versions.length - 1]
 			const packs = await list()
-			const existingPack = packs.find((pack) => pack.linked_data?.project_id === project.id)
+			const existingPack = packs.find((pack) => pack.link?.project_id === project.id)
 
 			if (existingPack) {
 				pendingModpackInstall = { project, version, source, callback, createInstanceCallback }
-				modpackAlreadyInstalledModalRef?.show(existingPack.name, existingPack.path)
+				modpackAlreadyInstalledModalRef?.show(existingPack.name, existingPack.id)
 				return
 			}
 
@@ -663,10 +663,10 @@ export function createContentInstall(opts: {
 				source,
 			})
 			callback(version)
-		} else if (instancePath) {
+		} else if (instanceId) {
 			const [instanceOrNull, instanceProjects, versions] = await Promise.all([
-				get(instancePath),
-				get_projects(instancePath),
+				get(instanceId),
+				get_projects(instanceId),
 				get_version_many(project.versions, 'must_revalidate') as Promise<
 					Labrinth.Versions.v2.Version[]
 				>,
@@ -686,14 +686,14 @@ export function createContentInstall(opts: {
 			if (isVersionCompatible(version, project, instance)) {
 				for (const [path, file] of Object.entries(instanceProjects)) {
 					if (file.metadata?.project_id === project.id) {
-						await remove_project(instance.path, path)
+						await remove_project(instance.id, path)
 					}
 				}
 
 				const installedProjectIds: string[] = [project.id]
-				addInstallingItem(instancePath, project, version)
+				addInstallingItem(instanceId, project, version)
 				try {
-					await add_project_from_version(instance.path, version.id, 'standalone')
+					await add_project_from_version(instance.id, version.id, 'standalone')
 					await installVersionDependencies(
 						instance,
 						version,
@@ -702,7 +702,7 @@ export function createContentInstall(opts: {
 							depProject: Labrinth.Projects.v2.Project,
 							depVersion?: Labrinth.Versions.v2.Version,
 						) => {
-							addInstallingItem(instancePath, depProject, depVersion)
+							addInstallingItem(instanceId, depProject, depVersion)
 							installedProjectIds.push(depProject.id)
 						},
 					)
@@ -718,7 +718,7 @@ export function createContentInstall(opts: {
 					})
 					callback(version.id, installedProjectIds)
 				} finally {
-					removeInstallingItems(instancePath, installedProjectIds)
+					removeInstallingItems(instanceId, installedProjectIds)
 				}
 			} else {
 				await showIncompatibilityWarning(instance, project, projectVersions, version, callback)
@@ -771,9 +771,9 @@ export function createContentInstall(opts: {
 			})
 			callback(version)
 		},
-		handleModpackDuplicateGoToInstance(instancePath: string) {
+		handleModpackDuplicateGoToInstance(instanceId: string) {
 			pendingModpackInstall = null
-			opts.router.push(`/instance/${encodeURIComponent(instancePath)}`)
+			opts.router.push(`/instance/${encodeURIComponent(instanceId)}`)
 		},
 		setIncompatibilityWarningModal(ref: ModalRef) {
 			incompatibilityWarningModalRef = ref
diff --git a/apps/app-frontend/src/providers/server-install.ts b/apps/app-frontend/src/providers/server-install.ts
index ed7f507618..2160dd93ab 100644
--- a/apps/app-frontend/src/providers/server-install.ts
+++ b/apps/app-frontend/src/providers/server-install.ts
@@ -6,8 +6,8 @@ import type { Router } from 'vue-router'
 
 import { trackEvent } from '@/helpers/analytics'
 import { get_project, get_project_v3, get_version } from '@/helpers/cache.js'
-import { install_to_existing_profile } from '@/helpers/pack.js'
-import { create, edit, edit_icon, get, install as installProfile, list } from '@/helpers/profile.js'
+import { create, edit, edit_icon, get, install as installInstance, list } from '@/helpers/instance'
+import { install_to_existing_instance } from '@/helpers/pack.js'
 import type { GameInstance } from '@/helpers/types'
 import { start_join_server } from '@/helpers/worlds.ts'
 import { handleSevereError } from '@/store/error.js'
@@ -99,14 +99,14 @@ export function createServerInstall(opts: {
 		return installingServerProjects.value.includes(projectId)
 	}
 
-	async function joinServer(profilePath: string, serverAddress: string | null) {
+	async function joinServer(instanceId: string, serverAddress: string | null) {
 		if (!serverAddress) return
-		await start_join_server(profilePath, serverAddress)
+		await start_join_server(instanceId, serverAddress)
 	}
 
 	async function findInstalledInstance(projectId: string) {
 		const packs = await list()
-		return packs.find((pack) => pack.linked_data?.project_id === projectId) ?? null
+		return packs.find((pack) => pack.link?.project_id === projectId) ?? null
 	}
 
 	async function createVanillaInstance(
@@ -114,7 +114,7 @@ export function createServerInstall(opts: {
 		gameVersion: string,
 		serverAddress: string | null,
 	) {
-		const profilePath = await create(
+		const instanceId = await create(
 			project.title,
 			gameVersion,
 			'vanilla',
@@ -122,22 +122,21 @@ export function createServerInstall(opts: {
 			project.icon_url ?? null,
 			false,
 			{
+				type: 'server_project',
 				project_id: project.id,
-				version_id: '',
-				locked: true,
 			},
 		)
 
-		await ensureManagedServerWorldExists(profilePath, project.title, serverAddress)
+		await ensureManagedServerWorldExists(instanceId, project.title, serverAddress)
 
-		return profilePath
+		return instanceId
 	}
 
 	async function updateVanillaGameVersion(instance: GameInstance, targetGameVersion: string) {
 		if (instance.game_version === targetGameVersion) return
 
-		await edit(instance.path, { game_version: targetGameVersion })
-		await installProfile(instance.path, false)
+		await edit(instance.id, { game_version: targetGameVersion })
+		await installInstance(instance.id, false)
 	}
 
 	function showModpackInstallSuccess(project: GameInstance, serverAddress: string | null) {
@@ -152,14 +151,14 @@ export function createServerInstall(opts: {
 								label: 'Launch game',
 								action: async () => {
 									try {
-										await joinServer(project.path, serverAddress)
+										await joinServer(project.id, serverAddress)
 										trackEvent('InstanceStart', {
 											loader: project.loader,
 											game_version: project.game_version,
 											source: 'ServerProject',
 										})
 									} catch (err) {
-										handleSevereError(err, { profilePath: project.path })
+										handleSevereError(err, { instanceId: project.id })
 									}
 								},
 								color: 'brand' as const,
@@ -168,7 +167,7 @@ export function createServerInstall(opts: {
 					: []),
 				{
 					label: 'Instance',
-					action: () => opts.router.push(`/instance/${encodeURIComponent(project.path)}`),
+					action: () => opts.router.push(`/instance/${encodeURIComponent(project.id)}`),
 				},
 			],
 			autoCloseMs: null,
@@ -187,14 +186,14 @@ export function createServerInstall(opts: {
 								label: 'Launch game',
 								action: async () => {
 									try {
-										if (serverAddress) await start_join_server(instance.path, serverAddress)
+										if (serverAddress) await start_join_server(instance.id, serverAddress)
 										trackEvent('InstanceStart', {
 											loader: instance.loader,
 											game_version: instance.game_version,
 											source: 'ServerProject',
 										})
 									} catch (err) {
-										handleSevereError(err, { profilePath: instance.path })
+										handleSevereError(err, { instanceId: instance.id })
 									}
 								},
 								color: 'brand' as const,
@@ -203,7 +202,7 @@ export function createServerInstall(opts: {
 					: []),
 				{
 					label: 'Instance',
-					action: () => opts.router.push(`/instance/${encodeURIComponent(instance.path)}`),
+					action: () => opts.router.push(`/instance/${encodeURIComponent(instance.id)}`),
 				},
 			],
 			autoCloseMs: null,
@@ -211,8 +210,8 @@ export function createServerInstall(opts: {
 	}
 
 	/**
-	 * Server projects that use modpack content have linked_data.project_id as
-	 * the server project id and linked_data.version_id as the modpack content version id.
+	 * Server projects that use modpack content have link.project_id as
+	 * the server project id and link.version_id as the modpack content version id.
 	 * The modpack content version can be of the same server project, or from a different project.
 	 */
 	async function installServerProject(serverProjectId: string) {
@@ -231,7 +230,7 @@ export function createServerInstall(opts: {
 		const contentProjectId = contentVersion.project_id
 		const gameVersion = contentVersion.game_versions?.[0] ?? ''
 
-		const profilePath = await create(
+		const instanceId = await create(
 			project.title,
 			gameVersion,
 			'vanilla',
@@ -239,36 +238,42 @@ export function createServerInstall(opts: {
 			project.icon_url,
 			true,
 			{
+				type: 'server_project_modpack',
+				server_project_id: serverProjectId,
+				content_project_id: contentProjectId,
+				content_version_id: contentVersionId,
 				project_id: serverProjectId,
 				version_id: contentVersionId,
-				locked: true,
 			},
 		)
 
 		// Save the icon path before pack install overwrites it
-		const profileBeforeInstall = await get(profilePath)
-		const originalIconPath = profileBeforeInstall?.icon_path ?? null
+		const instanceBeforeInstall = await get(instanceId)
+		const originalIconPath = instanceBeforeInstall?.icon_path ?? null
 
-		await install_to_existing_profile(
+		await install_to_existing_instance(
 			contentProjectId,
 			contentVersionId,
 			project.title,
-			profilePath,
+			instanceId,
 		)
 
-		// Pack install overwrites name, icon, and linked_data with the content project's values.
+		// Pack install overwrites name, icon, and link with the content project's values.
 		// Restore them to point to the server project.
-		await edit(profilePath, {
+		await edit(instanceId, {
 			name: project.title,
-			linked_data: {
+			link: {
+				type: 'server_project_modpack',
+				server_project_id: serverProjectId,
+				content_project_id: contentProjectId,
+				content_version_id: contentVersionId,
 				project_id: serverProjectId,
 				version_id: contentVersionId,
-				locked: true,
 			},
 		})
-		await edit_icon(profilePath, originalIconPath)
+		await edit_icon(instanceId, originalIconPath)
 
-		await ensureManagedServerWorldExists(profilePath, project.title, serverAddress)
+		await ensureManagedServerWorldExists(instanceId, project.title, serverAddress)
 	}
 
 	/**
@@ -303,9 +308,13 @@ export function createServerInstall(opts: {
 			if (installingServerProjects.value.includes(projectId)) return
 			startInstallingServer(projectId)
 			try {
-				const path = await createVanillaInstance(project, recommendedGameVersion, serverAddress)
-				if (path) {
-					instance = await get(path)
+				const instanceId = await createVanillaInstance(
+					project,
+					recommendedGameVersion,
+					serverAddress,
+				)
+				if (instanceId) {
+					instance = await get(instanceId)
 					if (instance) showModpackInstallSuccess(instance, serverAddress)
 				}
 			} finally {
@@ -324,10 +333,10 @@ export function createServerInstall(opts: {
 
 		if (!instance) return
 
-		await ensureManagedServerWorldExists(instance.path, project.title, serverAddress)
+		await ensureManagedServerWorldExists(instance.id, project.title, serverAddress)
 
 		// Update existing instance if needed
-		if (isModpack && instance.linked_data?.version_id !== modpackVersionId) {
+		if (isModpack && instance.link?.version_id !== modpackVersionId) {
 			updateToPlayModalRef?.show(instance, modpackVersionId, () => {
 				showUpdateSuccess(instance, serverAddress)
 			})
@@ -347,14 +356,14 @@ export function createServerInstall(opts: {
 
 		// Join server
 		try {
-			await joinServer(instance.path, serverAddress)
+			await joinServer(instance.id, serverAddress)
 			trackEvent('InstanceStart', {
 				loader: instance.loader,
 				game_version: instance.game_version,
 				source: 'ServerProject',
 			})
 		} catch (err) {
-			handleSevereError(err, { profilePath: instance.path })
+			handleSevereError(err, { instanceId: instance.id })
 		}
 	}
 
diff --git a/apps/app-frontend/src/providers/setup/creation-modal.ts b/apps/app-frontend/src/providers/setup/creation-modal.ts
index 21e0b51f61..1caae2bd6c 100644
--- a/apps/app-frontend/src/providers/setup/creation-modal.ts
+++ b/apps/app-frontend/src/providers/setup/creation-modal.ts
@@ -14,9 +14,9 @@ import type ModpackAlreadyInstalledModal from '@/components/ui/modal/ModpackAlre
 import { trackEvent } from '@/helpers/analytics'
 import { get_project_versions, get_search_results } from '@/helpers/cache.js'
 import { import_instance } from '@/helpers/import.js'
+import { create, list } from '@/helpers/instance'
 import { get_loader_versions as getLoaderManifest } from '@/helpers/metadata.js'
-import { create_profile_and_install, create_profile_and_install_from_file } from '@/helpers/pack'
-import { create, list } from '@/helpers/profile.js'
+import { create_instance_and_install, create_instance_and_install_from_file } from '@/helpers/pack'
 import type { InstanceLoader } from '@/helpers/types'
 
 export function setupCreationModal(
@@ -65,7 +65,7 @@ export function setupCreationModal(
 		name: string,
 		iconUrl?: string,
 	) {
-		await create_profile_and_install(projectId, versionId, name, iconUrl).catch(handleError)
+		await create_instance_and_install(projectId, versionId, name, iconUrl).catch(handleError)
 		trackEvent('InstanceCreate', { source: 'CreationModalModpack' })
 	}
 
@@ -75,12 +75,12 @@ export function setupCreationModal(
 				const { projectId, versionId, name, iconUrl } = config.modpackSelection.value
 
 				const instances = await list().catch(handleError)
-				const existingInstance = instances?.find((i) => i.linked_data?.project_id === projectId)
+				const existingInstance = instances?.find((i) => i.link?.project_id === projectId)
 
 				if (existingInstance) {
 					pendingModpackCreation.value = { projectId, versionId, name, iconUrl }
 					installationModal.value?.hide()
-					modpackAlreadyInstalledModal.value?.show(existingInstance.name, existingInstance.path)
+					modpackAlreadyInstalledModal.value?.show(existingInstance.name, existingInstance.id)
 					return
 				}
 			}
@@ -118,11 +118,11 @@ export function setupCreationModal(
 					waiting: true,
 				})
 
-				await create_profile_and_install_from_file(
+				await create_instance_and_install_from_file(
 					config.modpackFilePath.value,
-					(createProfile, fileName) => {
+					(createInstance, fileName) => {
 						popupNotificationManager.removeNotification(waitingNotification.id)
-						unknownPackWarningModal.value?.show(createProfile, fileName)
+						unknownPackWarningModal.value?.show(createInstance, fileName)
 					},
 				).catch(handleError)
 				popupNotificationManager.removeNotification(waitingNotification.id)
@@ -171,9 +171,9 @@ export function setupCreationModal(
 		await proceedWithModpackCreation(projectId, versionId, name, iconUrl)
 	}
 
-	function handleModpackDuplicateGoToInstance(instancePath: string) {
+	function handleModpackDuplicateGoToInstance(instanceId: string) {
 		pendingModpackCreation.value = null
-		router.push(`/instance/${encodeURIComponent(instancePath)}/`)
+		router.push(`/instance/${encodeURIComponent(instanceId)}/`)
 	}
 
 	function handleBrowseModpacks() {
diff --git a/apps/app-frontend/src/store/install.js b/apps/app-frontend/src/store/install.js
index 1c245eb53d..b68266443b 100644
--- a/apps/app-frontend/src/store/install.js
+++ b/apps/app-frontend/src/store/install.js
@@ -3,10 +3,10 @@
 import dayjs from 'dayjs'
 
 import { get_project, get_version, get_version_many } from '@/helpers/cache.js'
-import { add_project_from_version, check_installed } from '@/helpers/profile.js'
+import { add_project_from_version, check_installed } from '@/helpers/instance'
 import {
-	add_server_to_profile,
-	get_profile_worlds,
+	add_server_to_instance,
+	get_instance_worlds,
 	resolveManagedServerWorld,
 } from '@/helpers/worlds.ts'
 
@@ -48,7 +48,7 @@ export const isVersionCompatible = (version, project, instance) => {
 	)
 }
 
-export const installVersionDependencies = async (profile, version, reason, onDepInstalling) => {
+export const installVersionDependencies = async (instance, version, reason, onDepInstalling) => {
 	const projectNames = new Map()
 	const storeProjectName = (p) => {
 		if (p?.id && p.title) projectNames.set(p.id, p.title)
@@ -66,7 +66,7 @@ export const installVersionDependencies = async (profile, version, reason, onDep
 		if (installedProjectCache.has(projectId)) {
 			return installedProjectCache.get(projectId)
 		}
-		const installed = await check_installed(profile.path, projectId)
+		const installed = await check_installed(instance.id, projectId)
 		installedProjectCache.set(projectId, installed)
 		return installed
 	}
@@ -134,7 +134,7 @@ export const installVersionDependencies = async (profile, version, reason, onDep
 			depVersion = findPreferredVersion(
 				depVersions.sort((a, b) => dayjs(b.date_published) - dayjs(a.date_published)),
 				dep,
-				profile,
+				instance,
 			)
 			if (!depVersion) return null
 
@@ -157,7 +157,7 @@ export const installVersionDependencies = async (profile, version, reason, onDep
 
 		for (const dep of inputVersion.dependencies ?? []) {
 			if (dep.dependency_type !== 'required') continue
-			if (dep.project_id === 'P7dR8mSH' && profile.loader === 'quilt') continue
+			if (dep.project_id === 'P7dR8mSH' && instance.loader === 'quilt') continue
 
 			const resolved = await resolveDependency(dep, inputVersion)
 			if (!resolved) continue
@@ -181,7 +181,7 @@ export const installVersionDependencies = async (profile, version, reason, onDep
 		const batch = queuedInstalls.slice(i, i + batchSize)
 		await Promise.all(
 			batch.map(async ({ versionId, dependentOnVersionId }) => {
-				await add_project_from_version(profile.path, versionId, reason, dependentOnVersionId)
+				await add_project_from_version(instance.id, versionId, reason, dependentOnVersionId)
 			}),
 		)
 	}
@@ -193,13 +193,13 @@ export const getServerAddress = (javaServer) => {
 	return address
 }
 
-export const ensureManagedServerWorldExists = async (profilePath, serverName, serverAddress) => {
-	if (!profilePath || !serverAddress) return
+export const ensureManagedServerWorldExists = async (instanceId, serverName, serverAddress) => {
+	if (!instanceId || !serverAddress) return
 	try {
-		const worlds = await get_profile_worlds(profilePath)
+		const worlds = await get_instance_worlds(instanceId)
 		const managedWorld = resolveManagedServerWorld(worlds, serverName, serverAddress)
 		if (!managedWorld) {
-			await add_server_to_profile(profilePath, serverName, serverAddress, 'prompt')
+			await add_server_to_instance(instanceId, serverName, serverAddress, 'prompt')
 		}
 	} catch (err) {
 		console.error('Failed to ensure managed server world exists:', err)
diff --git a/apps/app/build.rs b/apps/app/build.rs
index 1f78fcce47..28e0b2f33d 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -144,7 +144,7 @@ fn main() {
             .plugin(
                 "pack",
                 InlinedPlugin::new()
-                    .commands(&["pack_install", "pack_get_profile_from_pack"])
+                    .commands(&["pack_install", "pack_get_instance_from_pack"])
                     .default_permission(
                         DefaultPermissionRule::AllowAllCommands,
                     ),
@@ -154,7 +154,7 @@ fn main() {
                 InlinedPlugin::new()
                     .commands(&[
                         "process_get_all",
-                        "process_get_by_profile_path",
+                        "process_get_by_instance_id",
                         "process_kill",
                         "process_wait_for",
                     ])
@@ -163,52 +163,47 @@ fn main() {
                     ),
             )
             .plugin(
-                "profile",
+                "instance",
                 InlinedPlugin::new()
                     .commands(&[
-                        "profile_remove",
-                        "profile_get",
-                        "profile_get_many",
-                        "profile_get_projects",
-                        "profile_get_installed_project_ids",
-                        "profile_get_content_items",
-                        "profile_get_dependencies_as_content_items",
-                        "profile_get_linked_modpack_info",
-                        "profile_get_linked_modpack_content",
-                        "profile_get_optimal_jre_key",
-                        "profile_get_full_path",
-                        "profile_get_mod_full_path",
-                        "profile_list",
-                        "profile_check_installed",
-                        "profile_check_installed_batch",
-                        "profile_install",
-                        "profile_update_all",
-                        "profile_update_project",
-                        "profile_add_project_from_version",
-                        "profile_add_project_from_path",
-                        "profile_toggle_disable_project",
-                        "profile_remove_project",
-                        "profile_update_managed_modrinth_version",
-                        "profile_repair_managed_modrinth",
-                        "profile_run",
-                        "profile_kill",
-                        "profile_edit",
-                        "profile_edit_icon",
-                        "profile_export_mrpack",
-                        "profile_get_pack_export_candidates",
+                        "instance_remove",
+                        "instance_get",
+                        "instance_get_many",
+                        "instance_get_projects",
+                        "instance_get_installed_project_ids",
+                        "instance_content",
+                        "instance_get_content_items",
+                        "instance_get_dependencies_as_content_items",
+                        "instance_get_linked_modpack_info",
+                        "instance_get_linked_modpack_content",
+                        "instance_get_optimal_jre_key",
+                        "instance_get_full_path",
+                        "instance_get_mod_full_path",
+                        "instance_list",
+                        "instance_check_installed",
+                        "instance_check_installed_batch",
+                        "instance_install",
+                        "instance_update_all",
+                        "instance_update_project",
+                        "instance_add_project_from_version",
+                        "instance_add_project_from_path",
+                        "instance_toggle_disable_project",
+                        "instance_remove_project",
+                        "instance_update_managed_modrinth_version",
+                        "instance_repair_managed_modrinth",
+                        "instance_run",
+                        "instance_kill",
+                        "instance_edit",
+                        "instance_edit_icon",
+                        "instance_export_mrpack",
+                        "instance_get_pack_export_candidates",
+                        "instance_create",
+                        "instance_duplicate",
                     ])
                     .default_permission(
                         DefaultPermissionRule::AllowAllCommands,
                     ),
             )
-            .plugin(
-                "profile-create",
-                InlinedPlugin::new()
-                    .commands(&["profile_create", "profile_duplicate"])
-                    .default_permission(
-                        DefaultPermissionRule::AllowAllCommands,
-                    ),
-            )
             .plugin(
                 "settings",
                 InlinedPlugin::new()
@@ -298,17 +293,17 @@ fn main() {
                 InlinedPlugin::new()
                     .commands(&[
                         "get_recent_worlds",
-                        "get_profile_worlds",
+                        "get_instance_worlds",
                         "get_singleplayer_world",
                         "set_world_display_status",
                         "rename_world",
                         "reset_world_icon",
                         "backup_world",
                         "delete_world",
-                        "add_server_to_profile",
-                        "edit_server_in_profile",
-                        "remove_server_from_profile",
-                        "get_profile_protocol_version",
+                        "add_server_to_instance",
+                        "edit_server_in_instance",
+                        "remove_server_from_instance",
+                        "get_instance_protocol_version",
                         "get_server_status",
                         "start_join_singleplayer_world",
                         "start_join_server",
diff --git a/apps/app/capabilities/plugins.json b/apps/app/capabilities/plugins.json
index 9bf2ad0b31..db693514bc 100644
--- a/apps/app/capabilities/plugins.json
+++ b/apps/app/capabilities/plugins.json
@@ -99,10 +99,9 @@
 		"metadata:default",
 		"minecraft-skins:default",
 		"mr-auth:default",
-		"profile-create:default",
+		"instance:default",
 		"pack:default",
 		"process:default",
-		"profile:default",
 		"cache:default",
 		"files:default",
 		"settings:default",
diff --git a/apps/app/src/api/files.rs b/apps/app/src/api/files.rs
index 81cb235953..5b33f8e120 100644
--- a/apps/app/src/api/files.rs
+++ b/apps/app/src/api/files.rs
@@ -4,7 +4,7 @@ use serde::Serialize;
 use std::io::Cursor;
 use tauri::Runtime;
 use tauri_plugin_dialog::DialogExt;
-use theseus::profile::get_full_path;
+use theseus::instance::get_full_path;
 
 pub fn init<R: Runtime>() -> tauri::plugin::TauriPlugin<R> {
     tauri::plugin::Builder::new("files")
diff --git a/apps/app/src/api/import.rs b/apps/app/src/api/import.rs
index 0cab81cd5f..f753bec04c 100644
--- a/apps/app/src/api/import.rs
+++ b/apps/app/src/api/import.rs
@@ -28,17 +28,16 @@ pub async fn get_importable_instances(
 }
 
 /// Import an instance from a launcher type and base path
-/// profile_path should be a blank profile for this purpose- if the function fails, it will be deleted
 /// eg: import_instance(ImportLauncherType::MultiMC, PathBuf::from("C:/MultiMC"), "Instance 1")
 #[tauri::command]
 pub async fn import_instance(
-    profile_path: &str,
+    instance_id: &str,
     launcher_type: ImportLauncherType,
     base_path: PathBuf,
     instance_folder: String,
 ) -> Result<()> {
     import::import_instance(
-        profile_path,
+        instance_id,
         launcher_type,
         base_path,
         instance_folder,
diff --git a/apps/app/src/api/instance.rs b/apps/app/src/api/instance.rs
new file mode 100644
index 0000000000..1f539b3e18
--- /dev/null
+++ b/apps/app/src/api/instance.rs
@@ -0,0 +1,735 @@
+use crate::api::Result;
+use dashmap::DashMap;
+use path_util::SafeRelativeUtf8UnixPathBuf;
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+use std::path::{Path, PathBuf};
+use theseus::DownloadReason;
+use theseus::data::{
+    AppliedContentSetPatch, ContentItem, Dependency,
+    EditInstance as CoreEditInstance, InstanceLaunchOverridesPatch,
+    InstanceLink as CoreInstanceLink, InstanceMetadata, LinkedModpackInfo,
+};
+use theseus::instance::QuickPlayType;
+use theseus::prelude::*;
+use theseus::server_address::ServerAddress;
+
+pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
+    tauri::plugin::Builder::new("instance")
+        .invoke_handler(tauri::generate_handler![
+            instance_remove,
+            instance_get,
+            instance_get_many,
+            instance_list,
+            instance_create,
+            instance_duplicate,
+            instance_get_projects,
+            instance_get_installed_project_ids,
+            instance_content,
+            instance_get_content_items,
+            instance_get_dependencies_as_content_items,
+            instance_get_linked_modpack_info,
+            instance_get_linked_modpack_content,
+            instance_get_optimal_jre_key,
+            instance_get_full_path,
+            instance_get_mod_full_path,
+            instance_check_installed,
+            instance_check_installed_batch,
+            instance_install,
+            instance_update_all,
+            instance_update_project,
+            instance_add_project_from_version,
+            instance_add_project_from_path,
+            instance_toggle_disable_project,
+            instance_remove_project,
+            instance_update_managed_modrinth_version,
+            instance_repair_managed_modrinth,
+            instance_run,
+            instance_kill,
+            instance_edit,
+            instance_edit_icon,
+            instance_export_mrpack,
+            instance_get_pack_export_candidates,
+        ])
+        .build()
+}
+
+#[derive(Serialize, Debug, Clone)]
+pub struct Instance {
+    pub id: String,
+    pub path: String,
+    pub install_stage: String,
+    pub launcher_feature_version: String,
+    pub name: String,
+    pub icon_path: Option<String>,
+    pub game_version: String,
+    pub protocol_version: Option<u32>,
+    pub loader: ModLoader,
+    pub loader_version: Option<String>,
+    pub groups: Vec<String>,
+    pub link: Option<InstanceLink>,
+    pub update_channel: ReleaseChannel,
+    pub created: chrono::DateTime<chrono::Utc>,
+    pub modified: chrono::DateTime<chrono::Utc>,
+    pub last_played: Option<chrono::DateTime<chrono::Utc>>,
+    pub submitted_time_played: u64,
+    pub recent_time_played: u64,
+    pub java_path: Option<String>,
+    pub extra_launch_args: Option<Vec<String>>,
+    pub custom_env_vars: Option<Vec<(String, String)>>,
+    pub memory: Option<MemorySettings>,
+    pub force_fullscreen: Option<bool>,
+    pub game_resolution: Option<WindowSize>,
+    pub hooks: Hooks,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(tag = "type", rename_all = "snake_case")]
+pub enum InstanceLink {
+    ModrinthModpack {
+        project_id: String,
+        version_id: String,
+    },
+    ServerProject {
+        project_id: String,
+    },
+    ServerProjectModpack {
+        server_project_id: String,
+        content_project_id: Option<String>,
+        content_version_id: String,
+    },
+    ImportedModpack {
+        project_id: Option<String>,
+        version_id: Option<String>,
+    },
+    ModrinthHosting {
+        server_id: String,
+        instance_ids: Vec<String>,
+        active_instance_id: Option<String>,
+    },
+    SharedInstance {
+        shared_instance_id: String,
+    },
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct EditInstance {
+    pub name: Option<String>,
+
+    pub game_version: Option<String>,
+    pub loader: Option<ModLoader>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        with = "serde_with::rust::double_option"
+    )]
+    pub loader_version: Option<Option<String>>,
+
+    pub groups: Option<Vec<String>>,
+
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        with = "serde_with::rust::double_option"
+    )]
+    pub link: Option<Option<InstanceLink>>,
+    pub update_channel: Option<ReleaseChannel>,
+
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        with = "serde_with::rust::double_option"
+    )]
+    pub java_path: Option<Option<String>>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        with = "serde_with::rust::double_option"
+    )]
+    pub extra_launch_args: Option<Option<Vec<String>>>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        with = "serde_with::rust::double_option"
+    )]
+    pub custom_env_vars: Option<Option<Vec<(String, String)>>>,
+
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        with = "serde_with::rust::double_option"
+    )]
+    pub memory: Option<Option<MemorySettings>>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        with = "serde_with::rust::double_option"
+    )]
+    pub force_fullscreen: Option<Option<bool>>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        with = "serde_with::rust::double_option"
+    )]
+    pub game_resolution: Option<Option<WindowSize>>,
+    pub hooks: Option<Hooks>,
+}
+
+impl From<InstanceMetadata> for Instance {
+    fn from(metadata: InstanceMetadata) -> Self {
+        Self {
+            id: metadata.instance.id,
+            path: metadata.instance.path,
+            install_stage: metadata.instance.install_stage.as_str().to_string(),
+            launcher_feature_version: metadata
+                .instance
+                .launcher_feature_version
+                .as_str()
+                .to_string(),
+            name: metadata.instance.name,
+            icon_path: metadata.instance.icon_path,
+            game_version: metadata.applied_content_set.game_version,
+            protocol_version: metadata.applied_content_set.protocol_version,
+            loader: metadata.applied_content_set.loader,
+            loader_version: metadata.applied_content_set.loader_version,
+            groups: metadata.groups,
+            link: InstanceLink::from_core(metadata.link),
+            update_channel: metadata.instance.update_channel,
+            created: metadata.instance.created,
+            modified: metadata.instance.modified,
+            last_played: metadata.instance.last_played,
+            submitted_time_played: metadata.instance.submitted_time_played,
+            recent_time_played: metadata.instance.recent_time_played,
+            java_path: metadata.launch_overrides.java_path,
+            extra_launch_args: metadata.launch_overrides.extra_launch_args,
+            custom_env_vars: metadata.launch_overrides.custom_env_vars,
+            memory: metadata.launch_overrides.memory,
+            force_fullscreen: metadata.launch_overrides.force_fullscreen,
+            game_resolution: metadata.launch_overrides.game_resolution,
+            hooks: metadata.launch_overrides.hooks,
+        }
+    }
+}
+
+impl InstanceLink {
+    fn from_core(link: CoreInstanceLink) -> Option<Self> {
+        match link {
+            CoreInstanceLink::Unmanaged => None,
+            CoreInstanceLink::ModrinthModpack {
+                project_id,
+                version_id,
+            } => Some(Self::ModrinthModpack {
+                project_id,
+                version_id,
+            }),
+            CoreInstanceLink::ServerProject { project_id } => {
+                Some(Self::ServerProject { project_id })
+            }
+            CoreInstanceLink::ServerProjectModpack {
+                server_project_id,
+                content_project_id,
+                content_version_id,
+            } => Some(Self::ServerProjectModpack {
+                server_project_id,
+                content_project_id: Some(content_project_id),
+                content_version_id,
+            }),
+            CoreInstanceLink::ImportedModpack {
+                project_id,
+                version_id,
+            } => Some(Self::ImportedModpack {
+                project_id,
+                version_id,
+            }),
+            CoreInstanceLink::ModrinthHosting {
+                server_id,
+                instance_ids,
+                active_instance_id,
+            } => Some(Self::ModrinthHosting {
+                server_id: server_id.to_string(),
+                instance_ids: instance_ids
+                    .into_iter()
+                    .map(|id| id.to_string())
+                    .collect(),
+                active_instance_id: active_instance_id.map(|id| id.to_string()),
+            }),
+            CoreInstanceLink::SharedInstance { shared_instance_id } => {
+                Some(Self::SharedInstance {
+                    shared_instance_id: shared_instance_id.to_string(),
+                })
+            }
+        }
+    }
+
+    fn into_core(self) -> Result<CoreInstanceLink> {
+        match self {
+            Self::ModrinthModpack {
+                project_id,
+                version_id,
+            } => Ok(CoreInstanceLink::ModrinthModpack {
+                project_id,
+                version_id,
+            }),
+            Self::ServerProject { project_id } => {
+                Ok(CoreInstanceLink::ServerProject { project_id })
+            }
+            Self::ServerProjectModpack {
+                server_project_id,
+                content_project_id,
+                content_version_id,
+            } => Ok(CoreInstanceLink::ServerProjectModpack {
+                server_project_id,
+                content_project_id: content_project_id.unwrap_or_default(),
+                content_version_id,
+            }),
+            Self::ImportedModpack {
+                project_id,
+                version_id,
+            } => Ok(CoreInstanceLink::ImportedModpack {
+                project_id,
+                version_id,
+            }),
+            Self::ModrinthHosting {
+                server_id,
+                instance_ids,
+                active_instance_id,
+            } => Ok(CoreInstanceLink::ModrinthHosting {
+                server_id: server_id.parse().map_err(|err| {
+                    theseus::Error::from(theseus::ErrorKind::InputError(
+                        format!("Invalid server id: {err}"),
+                    ))
+                })?,
+                instance_ids: instance_ids
+                    .into_iter()
+                    .map(|id| {
+                        id.parse().map_err(|err| {
+                            theseus::Error::from(
+                                theseus::ErrorKind::InputError(format!(
+                                    "Invalid hosted instance id: {err}"
+                                )),
+                            )
+                        })
+                    })
+                    .collect::<std::result::Result<Vec<_>, _>>()?,
+                active_instance_id: active_instance_id
+                    .map(|id| {
+                        id.parse().map_err(|err| {
+                            theseus::Error::from(
+                                theseus::ErrorKind::InputError(format!(
+                                    "Invalid active instance id: {err}"
+                                )),
+                            )
+                        })
+                    })
+                    .transpose()?,
+            }),
+            Self::SharedInstance { shared_instance_id } => {
+                Ok(CoreInstanceLink::SharedInstance {
+                    shared_instance_id: shared_instance_id.parse().map_err(
+                        |err| {
+                            theseus::Error::from(
+                                theseus::ErrorKind::InputError(format!(
+                                    "Invalid shared instance id: {err}"
+                                )),
+                            )
+                        },
+                    )?,
+                })
+            }
+        }
+    }
+}
+
+fn edit_to_core(edit_instance: EditInstance) -> Result<CoreEditInstance> {
+    Ok(CoreEditInstance {
+        install_stage: None,
+        launcher_feature_version: None,
+        name: edit_instance.name,
+        icon_path: None,
+        update_channel: edit_instance.update_channel,
+        groups: edit_instance.groups,
+        link: edit_instance
+            .link
+            .map(|link| match link {
+                Some(link) => link.into_core(),
+                None => Ok(CoreInstanceLink::Unmanaged),
+            })
+            .transpose()?,
+        launch_overrides: Some(InstanceLaunchOverridesPatch {
+            java_path: edit_instance.java_path,
+            extra_launch_args: edit_instance.extra_launch_args,
+            custom_env_vars: edit_instance.custom_env_vars,
+            memory: edit_instance.memory,
+            force_fullscreen: edit_instance.force_fullscreen,
+            game_resolution: edit_instance.game_resolution,
+            hooks: edit_instance.hooks,
+        }),
+        content_set_patch: Some(AppliedContentSetPatch {
+            game_version: edit_instance.game_version,
+            protocol_version: Some(None),
+            loader: edit_instance.loader,
+            loader_version: edit_instance.loader_version,
+        }),
+        last_played: None,
+        submitted_time_played: None,
+        recent_time_played: None,
+    })
+}
+
+#[tauri::command]
+pub async fn instance_remove(instance_id: &str) -> Result<()> {
+    theseus::instance::remove(instance_id).await?;
+    Ok(())
+}
+
+#[tauri::command]
+pub async fn instance_get(instance_id: &str) -> Result<Option<Instance>> {
+    Ok(theseus::instance::get(instance_id)
+        .await?
+        .map(Instance::from))
+}
+
+#[tauri::command]
+pub async fn instance_get_many(
+    instance_ids: Vec<String>,
+) -> Result<Vec<Instance>> {
+    let ids = instance_ids.iter().map(|x| &**x).collect::<Vec<&str>>();
+    Ok(theseus::instance::get_many(&ids)
+        .await?
+        .into_iter()
+        .map(Instance::from)
+        .collect())
+}
+
+#[tauri::command]
+pub async fn instance_list() -> Result<Vec<Instance>> {
+    Ok(theseus::instance::list()
+        .await?
+        .into_iter()
+        .map(Instance::from)
+        .collect())
+}
+
+#[tauri::command]
+pub async fn instance_create(
+    name: String,
+    game_version: String,
+    modloader: ModLoader,
+    loader_version: Option<String>,
+    icon: Option<String>,
+    skip_install: Option<bool>,
+    link: Option<InstanceLink>,
+) -> Result<String> {
+    let link = match link {
+        Some(link) => link.into_core()?,
+        None => CoreInstanceLink::Unmanaged,
+    };
+    let metadata = theseus::instance::create(
+        name,
+        game_version,
+        modloader,
+        loader_version,
+        icon,
+        link,
+        skip_install,
+    )
+    .await?;
+    Ok(metadata.instance.id)
+}
+
+#[tauri::command]
+pub async fn instance_duplicate(instance_id: &str) -> Result<String> {
+    Ok(theseus::instance::duplicate(instance_id).await?)
+}
+
+#[tauri::command]
+pub async fn instance_get_projects(
+    instance_id: &str,
+    cache_behaviour: Option<CacheBehaviour>,
+) -> Result<DashMap<String, ContentFile>> {
+    Ok(theseus::instance::get_projects(instance_id, cache_behaviour).await?)
+}
+
+#[tauri::command]
+pub async fn instance_get_installed_project_ids(
+    instance_id: &str,
+) -> Result<Vec<String>> {
+    Ok(theseus::instance::get_installed_project_ids(instance_id).await?)
+}
+
+#[tauri::command]
+pub async fn instance_content(
+    instance_id: &str,
+    cache_behaviour: Option<CacheBehaviour>,
+) -> Result<Vec<ContentItem>> {
+    instance_get_content_items(instance_id, cache_behaviour).await
+}
+
+#[tauri::command]
+pub async fn instance_get_content_items(
+    instance_id: &str,
+    cache_behaviour: Option<CacheBehaviour>,
+) -> Result<Vec<ContentItem>> {
+    Ok(
+        theseus::instance::get_content_items(instance_id, cache_behaviour)
+            .await?,
+    )
+}
+
+#[tauri::command]
+pub async fn instance_get_dependencies_as_content_items(
+    dependencies: Vec<Dependency>,
+    cache_behaviour: Option<CacheBehaviour>,
+) -> Result<Vec<ContentItem>> {
+    Ok(theseus::instance::get_dependencies_as_content_items(
+        dependencies,
+        cache_behaviour,
+    )
+    .await?)
+}
+
+#[tauri::command]
+pub async fn instance_get_linked_modpack_info(
+    instance_id: &str,
+    cache_behaviour: Option<CacheBehaviour>,
+) -> Result<Option<LinkedModpackInfo>> {
+    Ok(
+        theseus::instance::get_linked_modpack_info(
+            instance_id,
+            cache_behaviour,
+        )
+        .await?,
+    )
+}
+
+#[tauri::command]
+pub async fn instance_get_linked_modpack_content(
+    instance_id: &str,
+    cache_behaviour: Option<CacheBehaviour>,
+) -> Result<Vec<ContentItem>> {
+    Ok(theseus::instance::get_linked_modpack_content(
+        instance_id,
+        cache_behaviour,
+    )
+    .await?)
+}
+
+#[tauri::command]
+pub async fn instance_get_full_path(instance_id: &str) -> Result<PathBuf> {
+    Ok(theseus::instance::get_full_path(instance_id).await?)
+}
+
+#[tauri::command]
+pub async fn instance_get_mod_full_path(
+    instance_id: &str,
+    project_path: &str,
+) -> Result<PathBuf> {
+    Ok(theseus::instance::get_mod_full_path(instance_id, project_path).await?)
+}
+
+#[tauri::command]
+pub async fn instance_get_optimal_jre_key(
+    instance_id: &str,
+) -> Result<Option<JavaVersion>> {
+    Ok(theseus::instance::get_optimal_jre_key(instance_id).await?)
+}
+
+#[tauri::command]
+pub async fn instance_check_installed(
+    instance_id: &str,
+    project_id: &str,
+) -> Result<bool> {
+    let check_project_id = project_id;
+
+    if let Ok(projects) =
+        theseus::instance::get_projects(instance_id, None).await
+    {
+        Ok(projects.into_iter().any(|(_, project)| {
+            project
+                .metadata
+                .as_ref()
+                .is_some_and(|metadata| check_project_id == metadata.project_id)
+        }))
+    } else {
+        Ok(false)
+    }
+}
+
+#[tauri::command]
+pub async fn instance_check_installed_batch(
+    project_id: &str,
+) -> Result<HashMap<String, bool>> {
+    let instances = theseus::instance::list().await?;
+    let mut result = HashMap::new();
+    for instance in instances {
+        let instance_id = instance.instance.id.clone();
+        let installed = if let Ok(projects) =
+            theseus::instance::get_projects(&instance_id, None).await
+        {
+            projects.into_iter().any(|(_, pf)| {
+                pf.metadata
+                    .as_ref()
+                    .is_some_and(|m| m.project_id == project_id)
+            })
+        } else {
+            false
+        };
+        result.insert(instance_id, installed);
+    }
+    Ok(result)
+}
+
+#[tauri::command]
+pub async fn instance_install(instance_id: &str, force: bool) -> Result<()> {
+    theseus::instance::install(instance_id, force).await?;
+    Ok(())
+}
+
+#[tauri::command]
+pub async fn instance_update_all(
+    instance_id: &str,
+) -> Result<HashMap<String, String>> {
+    Ok(theseus::instance::update_all_projects(instance_id).await?)
+}
+
+#[tauri::command]
+pub async fn instance_update_project(
+    instance_id: &str,
+    project_path: &str,
+) -> Result<String> {
+    Ok(
+        theseus::instance::update_project(instance_id, project_path, None)
+            .await?,
+    )
+}
+
+#[tauri::command]
+pub async fn instance_add_project_from_version(
+    instance_id: &str,
+    version_id: &str,
+    reason: DownloadReason,
+    dependent_on_version_id: Option<String>,
+) -> Result<String> {
+    Ok(theseus::instance::add_project_from_version(
+        instance_id,
+        version_id,
+        reason,
+        dependent_on_version_id,
+    )
+    .await?)
+}
+
+#[tauri::command]
+pub async fn instance_add_project_from_path(
+    instance_id: &str,
+    project_path: &Path,
+    project_type: Option<ProjectType>,
+) -> Result<String> {
+    Ok(theseus::instance::add_project_from_path(
+        instance_id,
+        project_path,
+        project_type,
+    )
+    .await?)
+}
+
+#[tauri::command]
+pub async fn instance_toggle_disable_project(
+    instance_id: &str,
+    project_path: &str,
+) -> Result<String> {
+    Ok(
+        theseus::instance::toggle_disable_project(instance_id, project_path)
+            .await?,
+    )
+}
+
+#[tauri::command]
+pub async fn instance_remove_project(
+    instance_id: &str,
+    project_path: &str,
+) -> Result<()> {
+    theseus::instance::remove_project(instance_id, project_path).await?;
+    Ok(())
+}
+
+#[tauri::command]
+pub async fn instance_update_managed_modrinth_version(
+    instance_id: String,
+    version_id: String,
+) -> Result<()> {
+    Ok(theseus::instance::update_managed_modrinth_version(
+        &instance_id,
+        &version_id,
+    )
+    .await?)
+}
+
+#[tauri::command]
+pub async fn instance_repair_managed_modrinth(instance_id: &str) -> Result<()> {
+    Ok(theseus::instance::repair_managed_modrinth(instance_id).await?)
+}
+
+#[tauri::command]
+pub async fn instance_export_mrpack(
+    instance_id: &str,
+    export_location: PathBuf,
+    included_overrides: Vec<String>,
+    version_id: Option<String>,
+    description: Option<String>,
+    name: Option<String>,
+) -> Result<()> {
+    theseus::instance::export_mrpack(
+        instance_id,
+        export_location,
+        included_overrides,
+        version_id,
+        description,
+        name,
+    )
+    .await?;
+    Ok(())
+}
+
+#[tauri::command]
+pub async fn instance_get_pack_export_candidates(
+    instance_id: &str,
+) -> Result<Vec<SafeRelativeUtf8UnixPathBuf>> {
+    Ok(theseus::instance::get_pack_export_candidates(instance_id).await?)
+}
+
+#[tauri::command]
+pub async fn instance_run(
+    instance_id: &str,
+    server_address: Option<String>,
+) -> Result<ProcessMetadata> {
+    let quick_play = match server_address {
+        Some(addr) => QuickPlayType::Server(ServerAddress::Unresolved(addr)),
+        None => QuickPlayType::None,
+    };
+    Ok(theseus::instance::run(instance_id, quick_play).await?)
+}
+
+#[tauri::command]
+pub async fn instance_kill(instance_id: &str) -> Result<()> {
+    theseus::instance::kill(instance_id).await?;
+    Ok(())
+}
+
+#[tauri::command]
+pub async fn instance_edit(
+    instance_id: &str,
+    edit_instance: EditInstance,
+) -> Result<()> {
+    theseus::instance::edit(instance_id, edit_to_core(edit_instance)?).await?;
+    Ok(())
+}
+
+#[tauri::command]
+pub async fn instance_edit_icon(
+    instance_id: &str,
+    icon_path: Option<&Path>,
+) -> Result<()> {
+    theseus::instance::edit_icon(instance_id, icon_path).await?;
+    Ok(())
+}
diff --git a/apps/app/src/api/logs.rs b/apps/app/src/api/logs.rs
index cf68519e14..e938efac07 100644
--- a/apps/app/src/api/logs.rs
+++ b/apps/app/src/api/logs.rs
@@ -27,76 +27,73 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
         .build()
 }
 
-/// Get all Logs for a profile, sorted by filename
+/// Get all logs for an instance, sorted by filename.
 #[tauri::command]
 pub async fn logs_get_logs(
-    profile_path: &str,
+    instance_id: &str,
     clear_contents: Option<bool>,
 ) -> Result<Vec<Logs>> {
-    let val = logs::get_logs(profile_path, clear_contents).await?;
+    let val = logs::get_logs(instance_id, clear_contents).await?;
 
     Ok(val)
 }
 
-/// Get a Log struct for a profile by profile id and filename string
+/// Get a log struct for an instance by filename.
 #[tauri::command]
 pub async fn logs_get_logs_by_filename(
-    profile_path: &str,
+    instance_id: &str,
     log_type: LogType,
     filename: String,
 ) -> Result<Logs> {
-    Ok(logs::get_logs_by_filename(profile_path, log_type, filename).await?)
+    Ok(logs::get_logs_by_filename(instance_id, log_type, filename).await?)
 }
 
-/// Get the stdout for a profile by profile id and filename string
+/// Get the output for an instance by filename.
 #[tauri::command]
 pub async fn logs_get_output_by_filename(
-    profile_path: &str,
+    instance_id: &str,
     log_type: LogType,
     filename: String,
 ) -> Result<CensoredString> {
-    Ok(logs::get_output_by_filename(profile_path, log_type, &filename).await?)
+    Ok(logs::get_output_by_filename(instance_id, log_type, &filename).await?)
 }
 
-/// Delete all logs for a profile by profile id
+/// Delete all logs for an instance.
 #[tauri::command]
-pub async fn logs_delete_logs(profile_path: &str) -> Result<()> {
-    Ok(logs::delete_logs(profile_path).await?)
+pub async fn logs_delete_logs(instance_id: &str) -> Result<()> {
+    Ok(logs::delete_logs(instance_id).await?)
 }
 
-/// Delete a log for a profile by profile id and filename string
+/// Delete a log for an instance by filename.
 #[tauri::command]
 pub async fn logs_delete_logs_by_filename(
-    profile_path: &str,
+    instance_id: &str,
     log_type: LogType,
     filename: String,
 ) -> Result<()> {
-    Ok(
-        logs::delete_logs_by_filename(profile_path, log_type, &filename)
-            .await?,
-    )
+    Ok(logs::delete_logs_by_filename(instance_id, log_type, &filename).await?)
 }
 
 /// Get live log from a cursor
 #[tauri::command]
 pub async fn logs_get_latest_log_cursor(
-    profile_path: &str,
+    instance_id: &str,
     cursor: u64, // 0 to start at beginning of file
 ) -> Result<LatestLogCursor> {
-    Ok(logs::get_latest_log_cursor(profile_path, cursor).await?)
+    Ok(logs::get_latest_log_cursor(instance_id, cursor).await?)
 }
 
-/// Get all buffered live log lines for a profile
+/// Get all buffered live log lines for an instance.
 #[tauri::command]
 pub async fn logs_get_live_log_buffer(
-    profile_path: &str,
+    instance_id: &str,
 ) -> Result<CensoredString> {
-    Ok(logs::get_live_log_buffer(profile_path).await?)
+    Ok(logs::get_live_log_buffer(instance_id).await?)
 }
 
-/// Clear the live log buffer for a profile
+/// Clear the live log buffer for an instance.
 #[tauri::command]
-pub async fn logs_clear_live_log_buffer(profile_path: &str) -> Result<()> {
-    logs::clear_live_log_buffer(profile_path);
+pub async fn logs_clear_live_log_buffer(instance_id: &str) -> Result<()> {
+    logs::clear_live_log_buffer(instance_id);
     Ok(())
 }
diff --git a/apps/app/src/api/mod.rs b/apps/app/src/api/mod.rs
index 9cea479b19..295db287bd 100644
--- a/apps/app/src/api/mod.rs
+++ b/apps/app/src/api/mod.rs
@@ -4,6 +4,7 @@ use thiserror::Error;
 
 pub mod auth;
 pub mod import;
+pub mod instance;
 pub mod jre;
 pub mod logs;
 pub mod metadata;
@@ -11,8 +12,6 @@ pub mod minecraft_skins;
 pub mod mr_auth;
 pub mod pack;
 pub mod process;
-pub mod profile;
-pub mod profile_create;
 pub mod settings;
 pub mod tags;
 pub mod utils;
diff --git a/apps/app/src/api/pack.rs b/apps/app/src/api/pack.rs
index 0774a72e7c..c449b6831e 100644
--- a/apps/app/src/api/pack.rs
+++ b/apps/app/src/api/pack.rs
@@ -2,7 +2,7 @@ use crate::api::Result;
 
 use theseus::{
     pack::{
-        install_from::{CreatePackLocation, CreatePackProfile},
+        install_from::{CreatePackInstance, CreatePackLocation},
         install_mrpack::install_zipped_mrpack,
     },
     prelude::*,
@@ -12,7 +12,7 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
     tauri::plugin::Builder::new("pack")
         .invoke_handler(tauri::generate_handler![
             pack_install,
-            pack_get_profile_from_pack,
+            pack_get_instance_from_pack,
         ])
         .build()
 }
@@ -20,14 +20,14 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
 #[tauri::command]
 pub async fn pack_install(
     location: CreatePackLocation,
-    profile: String,
+    instance_id: String,
 ) -> Result<String> {
-    Ok(install_zipped_mrpack(location, profile).await?)
+    Ok(install_zipped_mrpack(location, instance_id).await?)
 }
 
 #[tauri::command]
-pub async fn pack_get_profile_from_pack(
+pub async fn pack_get_instance_from_pack(
     location: CreatePackLocation,
-) -> Result<CreatePackProfile> {
-    Ok(pack::install_from::get_profile_from_pack(location).await?)
+) -> Result<CreatePackInstance> {
+    Ok(pack::install_from::get_instance_from_pack(location).await?)
 }
diff --git a/apps/app/src/api/process.rs b/apps/app/src/api/process.rs
index 41a09979d5..d9fb092695 100644
--- a/apps/app/src/api/process.rs
+++ b/apps/app/src/api/process.rs
@@ -6,7 +6,7 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
     tauri::plugin::Builder::new("process")
         .invoke_handler(tauri::generate_handler![
             process_get_all,
-            process_get_by_profile_path,
+            process_get_by_instance_id,
             process_kill,
             process_wait_for,
         ])
@@ -19,10 +19,10 @@ pub async fn process_get_all() -> Result<Vec<ProcessMetadata>> {
 }
 
 #[tauri::command]
-pub async fn process_get_by_profile_path(
-    path: &str,
+pub async fn process_get_by_instance_id(
+    instance_id: &str,
 ) -> Result<Vec<ProcessMetadata>> {
-    Ok(process::get_by_profile_path(path).await?)
+    Ok(process::get_by_instance_id(instance_id).await?)
 }
 
 #[tauri::command]
diff --git a/apps/app/src/api/profile.rs b/apps/app/src/api/profile.rs
deleted file mode 100644
index ab41af5887..0000000000
--- a/apps/app/src/api/profile.rs
+++ /dev/null
@@ -1,510 +0,0 @@
-use crate::api::Result;
-use dashmap::DashMap;
-use path_util::SafeRelativeUtf8UnixPathBuf;
-use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use std::path::{Path, PathBuf};
-use theseus::DownloadReason;
-use theseus::data::{ContentItem, Dependency, LinkedModpackInfo};
-use theseus::prelude::*;
-use theseus::profile::QuickPlayType;
-use theseus::server_address::ServerAddress;
-
-pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
-    tauri::plugin::Builder::new("profile")
-        .invoke_handler(tauri::generate_handler![
-            profile_remove,
-            profile_get,
-            profile_get_many,
-            profile_get_projects,
-            profile_get_installed_project_ids,
-            profile_get_content_items,
-            profile_get_dependencies_as_content_items,
-            profile_get_linked_modpack_info,
-            profile_get_linked_modpack_content,
-            profile_get_optimal_jre_key,
-            profile_get_full_path,
-            profile_get_mod_full_path,
-            profile_list,
-            profile_check_installed,
-            profile_check_installed_batch,
-            profile_install,
-            profile_update_all,
-            profile_update_project,
-            profile_add_project_from_version,
-            profile_add_project_from_path,
-            profile_toggle_disable_project,
-            profile_remove_project,
-            profile_update_managed_modrinth_version,
-            profile_repair_managed_modrinth,
-            profile_run,
-            profile_kill,
-            profile_edit,
-            profile_edit_icon,
-            profile_export_mrpack,
-            profile_get_pack_export_candidates,
-        ])
-        .build()
-}
-
-// Remove a profile
-// invoke('plugin:profile|profile_add_path',path)
-#[tauri::command]
-pub async fn profile_remove(path: &str) -> Result<()> {
-    profile::remove(path).await?;
-    Ok(())
-}
-
-// Get a profile by path
-// invoke('plugin:profile|profile_add_path',path)
-#[tauri::command]
-pub async fn profile_get(path: &str) -> Result<Option<Profile>> {
-    let res = profile::get(path).await?;
-    Ok(res)
-}
-
-#[tauri::command]
-pub async fn profile_get_many(paths: Vec<String>) -> Result<Vec<Profile>> {
-    let ids = paths.iter().map(|x| &**x).collect::<Vec<&str>>();
-    let entries = profile::get_many(&ids).await?;
-    Ok(entries)
-}
-
-#[tauri::command]
-pub async fn profile_get_projects(
-    path: &str,
-    cache_behaviour: Option<CacheBehaviour>,
-) -> Result<DashMap<String, ProfileFile>> {
-    let res = profile::get_projects(path, cache_behaviour).await?;
-    Ok(res)
-}
-
-#[tauri::command]
-pub async fn profile_get_installed_project_ids(
-    path: &str,
-) -> Result<Vec<String>> {
-    let res = profile::get_installed_project_ids(path).await?;
-    Ok(res)
-}
-
-/// Get content items with rich metadata for a profile
-///
-/// Returns content items filtered to exclude modpack files (if linked),
-/// sorted alphabetically by project name.
-#[tauri::command]
-pub async fn profile_get_content_items(
-    path: &str,
-    cache_behaviour: Option<CacheBehaviour>,
-) -> Result<Vec<ContentItem>> {
-    let res = profile::get_content_items(path, cache_behaviour).await?;
-    Ok(res)
-}
-
-/// Convert a list of dependencies into ContentItems with rich metadata
-#[tauri::command]
-pub async fn profile_get_dependencies_as_content_items(
-    dependencies: Vec<Dependency>,
-    cache_behaviour: Option<CacheBehaviour>,
-) -> Result<Vec<ContentItem>> {
-    let res = profile::get_dependencies_as_content_items(
-        dependencies,
-        cache_behaviour,
-    )
-    .await?;
-    Ok(res)
-}
-
-/// Get linked modpack info for a profile
-///
-/// Returns project, version, and owner information for the linked modpack,
-/// or None if the profile is not linked to a modpack.
-#[tauri::command]
-pub async fn profile_get_linked_modpack_info(
-    path: &str,
-    cache_behaviour: Option<CacheBehaviour>,
-) -> Result<Option<LinkedModpackInfo>> {
-    let res = profile::get_linked_modpack_info(path, cache_behaviour).await?;
-    Ok(res)
-}
-
-/// Get content items that are part of the linked modpack
-///
-/// Returns the modpack's dependencies as ContentItem list.
-/// Returns empty vec if the profile is not linked to a modpack.
-#[tauri::command]
-pub async fn profile_get_linked_modpack_content(
-    path: &str,
-    cache_behaviour: Option<CacheBehaviour>,
-) -> Result<Vec<ContentItem>> {
-    let res =
-        profile::get_linked_modpack_content(path, cache_behaviour).await?;
-    Ok(res)
-}
-
-// Get a profile's full path
-// invoke('plugin:profile|profile_get_full_path',path)
-#[tauri::command]
-pub async fn profile_get_full_path(path: &str) -> Result<PathBuf> {
-    let res = profile::get_full_path(path).await?;
-    Ok(res)
-}
-
-// Get's a mod's full path
-// invoke('plugin:profile|profile_get_mod_full_path',path)
-#[tauri::command]
-pub async fn profile_get_mod_full_path(
-    path: &str,
-    project_path: &str,
-) -> Result<PathBuf> {
-    let res = profile::get_mod_full_path(path, project_path).await?;
-    Ok(res)
-}
-
-// Get optimal java version from profile
-#[tauri::command]
-pub async fn profile_get_optimal_jre_key(
-    path: &str,
-) -> Result<Option<JavaVersion>> {
-    let res = profile::get_optimal_jre_key(path).await?;
-    Ok(res)
-}
-
-// Get a copy of the profile set
-// invoke('plugin:profile|profile_list')
-#[tauri::command]
-pub async fn profile_list() -> Result<Vec<Profile>> {
-    let res = profile::list().await?;
-    Ok(res)
-}
-
-#[tauri::command]
-pub async fn profile_check_installed(
-    path: &str,
-    project_id: &str,
-) -> Result<bool> {
-    let check_project_id = project_id;
-
-    if let Ok(projects) = profile::get_projects(path, None).await {
-        Ok(projects.into_iter().any(|(_, project)| {
-            if let Some(metadata) = &project.metadata {
-                check_project_id == metadata.project_id
-            } else {
-                false
-            }
-        }))
-    } else {
-        Ok(false)
-    }
-}
-
-#[tauri::command]
-pub async fn profile_check_installed_batch(
-    project_id: &str,
-) -> Result<HashMap<String, bool>> {
-    let profiles = profile::list().await?;
-    let mut result = HashMap::new();
-    for p in profiles {
-        let installed =
-            if let Ok(projects) = profile::get_projects(&p.path, None).await {
-                projects.into_iter().any(|(_, pf)| {
-                    pf.metadata
-                        .as_ref()
-                        .is_some_and(|m| m.project_id == project_id)
-                })
-            } else {
-                false
-            };
-        result.insert(p.path.clone(), installed);
-    }
-    Ok(result)
-}
-
-/// Installs/Repairs a profile
-/// invoke('plugin:profile|profile_install')
-#[tauri::command]
-pub async fn profile_install(path: &str, force: bool) -> Result<()> {
-    profile::install(path, force).await?;
-    Ok(())
-}
-
-/// Updates all of the profile's projects
-/// invoke('plugin:profile|profile_update_all')
-#[tauri::command]
-pub async fn profile_update_all(path: &str) -> Result<HashMap<String, String>> {
-    Ok(profile::update_all_projects(path).await?)
-}
-
-/// Updates a specified project
-/// invoke('plugin:profile|profile_update_project')
-#[tauri::command]
-pub async fn profile_update_project(
-    path: &str,
-    project_path: &str,
-) -> Result<String> {
-    Ok(profile::update_project(path, project_path, None).await?)
-}
-
-// Adds a project to a profile from a version ID
-// invoke('plugin:profile|profile_add_project_from_version')
-#[tauri::command]
-pub async fn profile_add_project_from_version(
-    path: &str,
-    version_id: &str,
-    reason: DownloadReason,
-    dependent_on_version_id: Option<String>,
-) -> Result<String> {
-    Ok(profile::add_project_from_version(
-        path,
-        version_id,
-        reason,
-        dependent_on_version_id,
-    )
-    .await?)
-}
-
-// Adds a project to a profile from a path
-// invoke('plugin:profile|profile_add_project_from_path')
-#[tauri::command]
-pub async fn profile_add_project_from_path(
-    path: &str,
-    project_path: &Path,
-    project_type: Option<ProjectType>,
-) -> Result<String> {
-    let res = profile::add_project_from_path(path, project_path, project_type)
-        .await?;
-    Ok(res)
-}
-
-// Toggles disabling a project from its path
-// invoke('plugin:profile|profile_toggle_disable_project')
-#[tauri::command]
-pub async fn profile_toggle_disable_project(
-    path: &str,
-    project_path: &str,
-) -> Result<String> {
-    Ok(profile::toggle_disable_project(path, project_path).await?)
-}
-
-// Removes a project from a profile
-// invoke('plugin:profile|profile_remove_project')
-#[tauri::command]
-pub async fn profile_remove_project(
-    path: &str,
-    project_path: &str,
-) -> Result<()> {
-    profile::remove_project(path, project_path).await?;
-    Ok(())
-}
-
-// Updates a managed Modrinth profile to a version of version_id
-#[tauri::command]
-pub async fn profile_update_managed_modrinth_version(
-    path: String,
-    version_id: String,
-) -> Result<()> {
-    Ok(
-        profile::update::update_managed_modrinth_version(&path, &version_id)
-            .await?,
-    )
-}
-
-// Repairs a managed Modrinth profile by updating it to the current version
-#[tauri::command]
-pub async fn profile_repair_managed_modrinth(path: &str) -> Result<()> {
-    Ok(profile::update::repair_managed_modrinth(path).await?)
-}
-
-// Exports a profile to a .mrpack file (export_location should end in .mrpack)
-// invoke('profile_export_mrpack')
-#[tauri::command]
-pub async fn profile_export_mrpack(
-    path: &str,
-    export_location: PathBuf,
-    included_overrides: Vec<String>,
-    version_id: Option<String>,
-    description: Option<String>,
-    name: Option<String>, // only used to cache
-) -> Result<()> {
-    profile::export_mrpack(
-        path,
-        export_location,
-        included_overrides,
-        version_id,
-        description,
-        name,
-    )
-    .await?;
-    Ok(())
-}
-
-/// See [`profile::get_pack_export_candidates`]
-#[tauri::command]
-pub async fn profile_get_pack_export_candidates(
-    profile_path: &str,
-) -> Result<Vec<SafeRelativeUtf8UnixPathBuf>> {
-    let candidates = profile::get_pack_export_candidates(profile_path).await?;
-    Ok(candidates)
-}
-
-// Run minecraft using a profile using the default credentials
-// Returns the UUID, which can be used to poll
-// for the actual Child in the state.
-// invoke('plugin:profile|profile_run', path)
-#[tauri::command]
-pub async fn profile_run(
-    path: &str,
-    server_address: Option<String>,
-) -> Result<ProcessMetadata> {
-    let quick_play = match server_address {
-        Some(addr) => QuickPlayType::Server(ServerAddress::Unresolved(addr)),
-        None => QuickPlayType::None,
-    };
-    let process = profile::run(path, quick_play).await?;
-
-    Ok(process)
-}
-
-#[tauri::command]
-pub async fn profile_kill(path: &str) -> Result<()> {
-    profile::kill(path).await?;
-
-    Ok(())
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct EditProfile {
-    pub name: Option<String>,
-
-    pub game_version: Option<String>,
-    pub loader: Option<ModLoader>,
-    #[serde(
-        default,
-        skip_serializing_if = "Option::is_none",
-        with = "serde_with::rust::double_option"
-    )]
-    pub loader_version: Option<Option<String>>,
-
-    pub groups: Option<Vec<String>>,
-
-    #[serde(
-        default,
-        skip_serializing_if = "Option::is_none",
-        with = "serde_with::rust::double_option"
-    )]
-    pub linked_data: Option<Option<LinkedData>>,
-    pub preferred_update_channel: Option<ReleaseChannel>,
-
-    #[serde(
-        default,
-        skip_serializing_if = "Option::is_none",
-        with = "serde_with::rust::double_option"
-    )]
-    pub java_path: Option<Option<String>>,
-    #[serde(
-        default,
-        skip_serializing_if = "Option::is_none",
-        with = "serde_with::rust::double_option"
-    )]
-    pub extra_launch_args: Option<Option<Vec<String>>>,
-    #[serde(
-        default,
-        skip_serializing_if = "Option::is_none",
-        with = "serde_with::rust::double_option"
-    )]
-    pub custom_env_vars: Option<Option<Vec<(String, String)>>>,
-
-    #[serde(
-        default,
-        skip_serializing_if = "Option::is_none",
-        with = "serde_with::rust::double_option"
-    )]
-    pub memory: Option<Option<MemorySettings>>,
-    #[serde(
-        default,
-        skip_serializing_if = "Option::is_none",
-        with = "serde_with::rust::double_option"
-    )]
-    pub force_fullscreen: Option<Option<bool>>,
-    #[serde(
-        default,
-        skip_serializing_if = "Option::is_none",
-        with = "serde_with::rust::double_option"
-    )]
-    pub game_resolution: Option<Option<WindowSize>>,
-    pub hooks: Option<Hooks>,
-}
-
-// Edits a profile
-// invoke('plugin:profile|profile_edit', {path, editProfile})
-#[tauri::command]
-pub async fn profile_edit(path: &str, edit_profile: EditProfile) -> Result<()> {
-    profile::edit(path, |prof| {
-        if let Some(name) = edit_profile.name.clone() {
-            prof.name = name;
-        }
-        if let Some(game_version) = edit_profile.game_version.clone() {
-            if game_version != prof.game_version {
-                prof.protocol_version = None;
-            }
-            prof.game_version = game_version;
-        }
-        if let Some(loader) = edit_profile.loader {
-            prof.loader = loader;
-        }
-        if let Some(loader_version) = edit_profile.loader_version.clone() {
-            prof.loader_version = loader_version;
-        }
-        if let Some(linked_data) = edit_profile.linked_data.clone() {
-            prof.linked_data = linked_data;
-        }
-        if let Some(preferred_update_channel) =
-            edit_profile.preferred_update_channel
-        {
-            prof.preferred_update_channel = preferred_update_channel;
-        }
-        if let Some(groups) = edit_profile.groups.clone() {
-            prof.groups = groups;
-        }
-        if let Some(java_path) = edit_profile.java_path.clone() {
-            prof.java_path = java_path;
-        }
-        if let Some(memory) = edit_profile.memory {
-            prof.memory = memory;
-        }
-        if let Some(game_resolution) = edit_profile.game_resolution {
-            prof.game_resolution = game_resolution;
-        }
-        if let Some(force_fullscreen) = edit_profile.force_fullscreen {
-            prof.force_fullscreen = force_fullscreen;
-        }
-        if let Some(hooks) = edit_profile.hooks.clone() {
-            prof.hooks = hooks;
-        }
-
-        prof.modified = chrono::Utc::now();
-
-        if let Some(custom_env_vars) = edit_profile.custom_env_vars.clone() {
-            prof.custom_env_vars = custom_env_vars;
-        }
-        if let Some(extra_launch_args) = edit_profile.extra_launch_args.clone()
-        {
-            prof.extra_launch_args = extra_launch_args;
-        }
-
-        async { Ok(()) }
-    })
-    .await?;
-
-    Ok(())
-}
-
-// Edits a profile's icon
-// invoke('plugin:profile|profile_edit_icon')
-#[tauri::command]
-pub async fn profile_edit_icon(
-    path: &str,
-    icon_path: Option<&Path>,
-) -> Result<()> {
-    profile::edit_icon(path, icon_path).await?;
-    Ok(())
-}
diff --git a/apps/app/src/api/profile_create.rs b/apps/app/src/api/profile_create.rs
deleted file mode 100644
index a3006adc6d..0000000000
--- a/apps/app/src/api/profile_create.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use crate::api::Result;
-use theseus::prelude::*;
-
-pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
-    tauri::plugin::Builder::new("profile-create")
-        .invoke_handler(tauri::generate_handler![
-            profile_create,
-            profile_duplicate
-        ])
-        .build()
-}
-
-// Creates a profile at  the given filepath and adds it to the in-memory state
-// invoke('plugin:profile-create|profile_add',profile)
-#[tauri::command]
-pub async fn profile_create(
-    name: String,         // the name of the profile, and relative path
-    game_version: String, // the game version of the profile
-    modloader: ModLoader, // the modloader to use
-    loader_version: Option<String>, // the modloader version to use, set to "latest", "stable", or the ID of your chosen loader
-    icon: Option<String>,           // the icon for the profile
-    skip_install: Option<bool>,
-    linked_data: Option<LinkedData>,
-) -> Result<String> {
-    let res = profile::create::profile_create(
-        name,
-        game_version,
-        modloader,
-        loader_version,
-        icon,
-        linked_data,
-        skip_install,
-    )
-    .await?;
-    Ok(res)
-}
-
-// Creates a profile from a duplicate
-// invoke('plugin:profile-create|profile_duplicate',profile)
-#[tauri::command]
-pub async fn profile_duplicate(path: &str) -> Result<String> {
-    let res = profile::create::profile_create_from_duplicate(path).await?;
-    Ok(res)
-}
diff --git a/apps/app/src/api/worlds.rs b/apps/app/src/api/worlds.rs
index ba16ecb720..afa743e0eb 100644
--- a/apps/app/src/api/worlds.rs
+++ b/apps/app/src/api/worlds.rs
@@ -2,30 +2,30 @@ use crate::api::Result;
 use either::Either;
 use enumset::EnumSet;
 use tauri::{AppHandle, Manager, Runtime};
+use theseus::instance::{self, QuickPlayType, get_full_path};
 use theseus::prelude::ProcessMetadata;
-use theseus::profile::{QuickPlayType, get_full_path};
 use theseus::server_address::ServerAddress;
+use theseus::worlds;
 use theseus::worlds::{
     DisplayStatus, ProtocolVersion, ServerPackStatus, ServerStatus, World,
-    WorldType, WorldWithProfile,
+    WorldType, WorldWithInstance,
 };
-use theseus::{profile, worlds};
 
 pub fn init<R: Runtime>() -> tauri::plugin::TauriPlugin<R> {
     tauri::plugin::Builder::new("worlds")
         .invoke_handler(tauri::generate_handler![
             get_recent_worlds,
-            get_profile_worlds,
+            get_instance_worlds,
             get_singleplayer_world,
             set_world_display_status,
             rename_world,
             reset_world_icon,
             backup_world,
             delete_world,
-            add_server_to_profile,
-            edit_server_in_profile,
-            remove_server_from_profile,
-            get_profile_protocol_version,
+            add_server_to_instance,
+            edit_server_in_instance,
+            remove_server_from_instance,
+            get_instance_protocol_version,
             get_server_status,
             start_join_singleplayer_world,
             start_join_server,
@@ -38,7 +38,7 @@ pub async fn get_recent_worlds<R: Runtime>(
     app_handle: AppHandle<R>,
     limit: usize,
     display_statuses: Option<EnumSet<DisplayStatus>>,
-) -> Result<Vec<WorldWithProfile>> {
+) -> Result<Vec<WorldWithInstance>> {
     let mut result = worlds::get_recent_worlds(
         limit,
         display_statuses.unwrap_or(EnumSet::all()),
@@ -51,11 +51,11 @@ pub async fn get_recent_worlds<R: Runtime>(
 }
 
 #[tauri::command]
-pub async fn get_profile_worlds<R: Runtime>(
+pub async fn get_instance_worlds<R: Runtime>(
     app_handle: AppHandle<R>,
-    path: &str,
+    instance_id: &str,
 ) -> Result<Vec<World>> {
-    let mut result = worlds::get_profile_worlds(path).await?;
+    let mut result = worlds::get_instance_worlds(instance_id).await?;
     for world in &mut result {
         adapt_world_icon(&app_handle, world);
     }
@@ -146,18 +146,16 @@ pub async fn delete_world(instance: &str, world: &str) -> Result<()> {
 }
 
 #[tauri::command]
-pub async fn add_server_to_profile(
-    path: &str,
+pub async fn add_server_to_instance(
+    instance_id: &str,
     name: String,
     address: String,
     pack_status: ServerPackStatus,
     project_id: Option<String>,
     content_kind: Option<String>,
 ) -> Result<usize> {
-    let full_path = get_full_path(path).await?;
-    Ok(worlds::add_server_to_profile(
-        &full_path,
-        path,
+    Ok(worlds::add_server_to_instance(
+        instance_id,
         name,
         address,
         pack_status,
@@ -168,34 +166,38 @@ pub async fn add_server_to_profile(
 }
 
 #[tauri::command]
-pub async fn edit_server_in_profile(
-    path: &str,
+pub async fn edit_server_in_instance(
+    instance_id: &str,
     index: usize,
     name: String,
     address: String,
     pack_status: ServerPackStatus,
 ) -> Result<()> {
-    let path = get_full_path(path).await?;
-    worlds::edit_server_in_profile(&path, index, name, address, pack_status)
-        .await?;
+    worlds::edit_server_in_instance(
+        instance_id,
+        index,
+        name,
+        address,
+        pack_status,
+    )
+    .await?;
     Ok(())
 }
 
 #[tauri::command]
-pub async fn remove_server_from_profile(
-    path: &str,
+pub async fn remove_server_from_instance(
+    instance_id: &str,
     index: usize,
 ) -> Result<()> {
-    let path = get_full_path(path).await?;
-    worlds::remove_server_from_profile(&path, index).await?;
+    worlds::remove_server_from_instance(instance_id, index).await?;
     Ok(())
 }
 
 #[tauri::command]
-pub async fn get_profile_protocol_version(
-    path: &str,
+pub async fn get_instance_protocol_version(
+    instance_id: &str,
 ) -> Result<Option<ProtocolVersion>> {
-    Ok(worlds::get_profile_protocol_version(path).await?)
+    Ok(worlds::get_instance_protocol_version(instance_id).await?)
 }
 
 #[tauri::command]
@@ -208,22 +210,22 @@ pub async fn get_server_status(
 
 #[tauri::command]
 pub async fn start_join_singleplayer_world(
-    path: &str,
+    instance_id: &str,
     world: String,
 ) -> Result<ProcessMetadata> {
     let process =
-        profile::run(path, QuickPlayType::Singleplayer(world)).await?;
+        instance::run(instance_id, QuickPlayType::Singleplayer(world)).await?;
 
     Ok(process)
 }
 
 #[tauri::command]
 pub async fn start_join_server(
-    path: &str,
+    instance_id: &str,
     address: &str,
 ) -> Result<ProcessMetadata> {
-    let process = profile::run(
-        path,
+    let process = instance::run(
+        instance_id,
         QuickPlayType::Server(ServerAddress::Unresolved(address.to_owned())),
     )
     .await?;
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
index 33d2da8796..ce8d32d48a 100644
--- a/apps/app/src/main.rs
+++ b/apps/app/src/main.rs
@@ -38,7 +38,7 @@ async fn initialize_state(app: tauri::AppHandle) -> api::Result<()> {
     app.asset_protocol_scope()
         .allow_directory(state.directories.caches_dir().join("icons"), true)?;
     app.fs_scope()
-        .allow_directory(state.directories.profiles_dir(), true)?;
+        .allow_directory(state.directories.instances_dir(), true)?;
 
     Ok(())
 }
@@ -233,14 +233,13 @@ fn main() {
         .plugin(api::auth::init())
         .plugin(api::mr_auth::init())
         .plugin(api::import::init())
+        .plugin(api::instance::init())
         .plugin(api::logs::init())
         .plugin(api::jre::init())
         .plugin(api::metadata::init())
         .plugin(api::minecraft_skins::init())
         .plugin(api::pack::init())
         .plugin(api::process::init())
-        .plugin(api::profile::init())
-        .plugin(api::profile_create::init())
         .plugin(api::settings::init())
         .plugin(api::tags::init())
         .plugin(api::utils::init())
diff --git a/packages/app-lib/migrations/20260526120001_drop-default-minecraft-capes-triggers.sql b/packages/app-lib/migrations/20260526120001_drop-default-minecraft-capes-triggers.sql
new file mode 100644
index 0000000000..9e83b0444f
--- /dev/null
+++ b/packages/app-lib/migrations/20260526120001_drop-default-minecraft-capes-triggers.sql
@@ -0,0 +1,3 @@
+DROP TRIGGER IF EXISTS default_minecraft_capes_user_uuid_insert_check;
+DROP TRIGGER IF EXISTS default_minecraft_capes_user_uuid_update_check;
+DROP TRIGGER IF EXISTS default_minecraft_capes_user_uuid_update_cascade;
diff --git a/packages/app-lib/migrations/20260611120000_instances-content-foundation.sql b/packages/app-lib/migrations/20260611120000_instances-content-foundation.sql
new file mode 100644
index 0000000000..461f61a342
--- /dev/null
+++ b/packages/app-lib/migrations/20260611120000_instances-content-foundation.sql
@@ -0,0 +1,379 @@
+CREATE TABLE instances (
+	id TEXT NOT NULL,
+	path TEXT NOT NULL,
+	applied_content_set_id TEXT NULL,
+
+	install_stage TEXT NOT NULL,
+	launcher_feature_version TEXT NOT NULL,
+	update_channel TEXT NOT NULL DEFAULT 'release',
+
+	name TEXT NOT NULL,
+	icon_path TEXT NULL,
+
+	created INTEGER NOT NULL,
+	modified INTEGER NOT NULL,
+	last_played INTEGER NULL,
+
+	submitted_time_played INTEGER NOT NULL DEFAULT 0,
+	recent_time_played INTEGER NOT NULL DEFAULT 0,
+
+	PRIMARY KEY (id),
+	UNIQUE (path)
+);
+
+CREATE INDEX instances_path ON instances(path);
+CREATE INDEX instances_applied_content_set_id
+	ON instances(applied_content_set_id);
+
+CREATE TABLE instance_links (
+	instance_id TEXT NOT NULL,
+	link_kind TEXT NOT NULL,
+
+	modrinth_project_id TEXT NULL,
+	modrinth_version_id TEXT NULL,
+
+	server_project_id TEXT NULL,
+
+	content_project_id TEXT NULL,
+	content_version_id TEXT NULL,
+
+	hosting_server_id TEXT NULL,
+	hosting_instance_ids JSONB NULL,
+	hosting_active_instance_id TEXT NULL,
+
+	shared_instance_id TEXT NULL,
+
+	PRIMARY KEY (instance_id),
+	FOREIGN KEY (instance_id) REFERENCES instances(id) ON DELETE CASCADE
+);
+
+CREATE INDEX instance_links_link_kind ON instance_links(link_kind);
+CREATE INDEX instance_links_modrinth_project_id
+	ON instance_links(modrinth_project_id);
+CREATE INDEX instance_links_server_project_id
+	ON instance_links(server_project_id);
+CREATE INDEX instance_links_hosting_server_id
+	ON instance_links(hosting_server_id);
+CREATE INDEX instance_links_hosting_active_instance_id
+	ON instance_links(hosting_active_instance_id);
+CREATE INDEX instance_links_shared_instance_id
+	ON instance_links(shared_instance_id);
+
+CREATE TABLE instance_groups (
+	instance_id TEXT NOT NULL,
+	group_name TEXT NOT NULL,
+
+	PRIMARY KEY (instance_id, group_name),
+	FOREIGN KEY (instance_id) REFERENCES instances(id) ON DELETE CASCADE
+);
+
+CREATE INDEX instance_groups_group_name ON instance_groups(group_name);
+
+CREATE TABLE instance_launch_overrides (
+	instance_id TEXT NOT NULL,
+
+	java_path TEXT NULL,
+	extra_launch_args JSONB NULL,
+	custom_env_vars JSONB NULL,
+
+	memory INTEGER NULL,
+	force_fullscreen INTEGER NULL,
+	game_resolution_x INTEGER NULL,
+	game_resolution_y INTEGER NULL,
+
+	hook_pre_launch TEXT NULL,
+	hook_wrapper TEXT NULL,
+	hook_post_exit TEXT NULL,
+
+	PRIMARY KEY (instance_id),
+	FOREIGN KEY (instance_id) REFERENCES instances(id) ON DELETE CASCADE
+);
+
+CREATE TABLE instance_content_sets (
+	id TEXT NOT NULL,
+	instance_id TEXT NOT NULL,
+
+	name TEXT NOT NULL,
+	source_kind TEXT NOT NULL,
+	status TEXT NOT NULL,
+
+	game_version TEXT NOT NULL,
+	protocol_version INTEGER NULL,
+	loader TEXT NOT NULL,
+	loader_version TEXT NULL,
+
+	created INTEGER NOT NULL,
+	modified INTEGER NOT NULL,
+
+	PRIMARY KEY (id),
+	FOREIGN KEY (instance_id) REFERENCES instances(id) ON DELETE CASCADE
+);
+
+CREATE INDEX instance_content_sets_instance_id
+	ON instance_content_sets(instance_id);
+
+CREATE TABLE instance_content_set_remote_refs (
+	content_set_id TEXT NOT NULL,
+	ref_type TEXT NOT NULL,
+	ref_id TEXT NOT NULL,
+
+	PRIMARY KEY (content_set_id, ref_type),
+	FOREIGN KEY (content_set_id)
+		REFERENCES instance_content_sets(id)
+		ON DELETE CASCADE
+);
+
+CREATE INDEX instance_content_set_remote_refs_ref
+	ON instance_content_set_remote_refs(ref_type, ref_id);
+
+CREATE TABLE instance_content_set_sync_state (
+	content_set_id TEXT NOT NULL,
+	provider TEXT NOT NULL,
+
+	applied_update_id TEXT NULL,
+	latest_available_update_id TEXT NULL,
+	checked_at INTEGER NULL,
+	status TEXT NOT NULL,
+
+	PRIMARY KEY (content_set_id),
+	FOREIGN KEY (content_set_id)
+		REFERENCES instance_content_sets(id)
+		ON DELETE CASCADE
+);
+
+CREATE INDEX instance_content_set_sync_state_provider
+	ON instance_content_set_sync_state(provider);
+
+CREATE INDEX instance_content_set_sync_state_latest_available_update_id
+	ON instance_content_set_sync_state(latest_available_update_id);
+
+CREATE TABLE instance_files (
+	id TEXT NOT NULL,
+	instance_id TEXT NOT NULL,
+
+	relative_path TEXT NOT NULL,
+	file_name TEXT NOT NULL,
+	enabled INTEGER NOT NULL,
+
+	sha1 TEXT NOT NULL,
+	size INTEGER NOT NULL,
+	missing INTEGER NOT NULL DEFAULT 0,
+
+	added_at INTEGER NOT NULL,
+	modified_at INTEGER NOT NULL,
+
+	PRIMARY KEY (id),
+	UNIQUE (instance_id, relative_path),
+	FOREIGN KEY (instance_id) REFERENCES instances(id) ON DELETE CASCADE
+);
+
+CREATE INDEX instance_files_instance_id ON instance_files(instance_id);
+CREATE INDEX instance_files_sha1 ON instance_files(sha1);
+CREATE INDEX instance_files_missing ON instance_files(missing);
+
+CREATE TABLE instance_content_entries (
+	id TEXT NOT NULL,
+	instance_id TEXT NOT NULL,
+	content_set_id TEXT NOT NULL,
+	file_id TEXT NULL,
+
+	project_type TEXT NOT NULL,
+	project_id TEXT NULL,
+	version_id TEXT NULL,
+
+	source_kind TEXT NOT NULL,
+	server_requirement TEXT NOT NULL,
+	client_requirement TEXT NOT NULL,
+	enabled INTEGER NOT NULL DEFAULT 1,
+
+	added_at INTEGER NOT NULL,
+	modified_at INTEGER NOT NULL,
+
+	PRIMARY KEY (id),
+	FOREIGN KEY (instance_id) REFERENCES instances(id) ON DELETE CASCADE,
+	FOREIGN KEY (content_set_id)
+		REFERENCES instance_content_sets(id)
+		ON DELETE CASCADE,
+	FOREIGN KEY (file_id) REFERENCES instance_files(id) ON DELETE SET NULL
+);
+
+CREATE INDEX instance_content_entries_instance_id
+	ON instance_content_entries(instance_id);
+CREATE INDEX instance_content_entries_content_set_id
+	ON instance_content_entries(content_set_id);
+CREATE INDEX instance_content_entries_file_id
+	ON instance_content_entries(file_id);
+CREATE INDEX instance_content_entries_project_id
+	ON instance_content_entries(project_id);
+CREATE INDEX instance_content_entries_version_id
+	ON instance_content_entries(version_id);
+CREATE INDEX instance_content_entries_source_kind
+	ON instance_content_entries(source_kind);
+
+CREATE TABLE instance_content_update_checks (
+	content_entry_id TEXT NOT NULL,
+
+	update_channel TEXT NOT NULL,
+	update_version_id TEXT NULL,
+	checked_at INTEGER NOT NULL,
+
+	PRIMARY KEY (content_entry_id),
+	FOREIGN KEY (content_entry_id)
+		REFERENCES instance_content_entries(id)
+		ON DELETE CASCADE
+);
+
+CREATE INDEX instance_content_update_checks_update_version_id
+	ON instance_content_update_checks(update_version_id);
+
+INSERT INTO instances (
+	id,
+	path,
+	applied_content_set_id,
+	install_stage,
+	launcher_feature_version,
+	update_channel,
+	name,
+	icon_path,
+	created,
+	modified,
+	last_played,
+	submitted_time_played,
+	recent_time_played
+)
+SELECT
+	'legacy:' || path,
+	path,
+	'legacy:' || path || ':default',
+	install_stage,
+	launcher_feature_version,
+	preferred_update_channel,
+	name,
+	icon_path,
+	created,
+	modified,
+	last_played,
+	submitted_time_played,
+	recent_time_played
+FROM profiles;
+
+INSERT INTO instance_content_sets (
+	id,
+	instance_id,
+	name,
+	source_kind,
+	status,
+	game_version,
+	protocol_version,
+	loader,
+	loader_version,
+	created,
+	modified
+)
+SELECT
+	'legacy:' || path || ':default',
+	'legacy:' || path,
+	'Default',
+	CASE
+		WHEN linked_project_id IS NOT NULL
+			AND linked_version_id IS NOT NULL
+			AND linked_version_id != ''
+			THEN 'modrinth_modpack'
+		WHEN linked_project_id IS NOT NULL
+			AND (linked_version_id IS NULL OR linked_version_id = '')
+			THEN 'server_project'
+		ELSE 'local'
+	END,
+	'available',
+	game_version,
+	protocol_version,
+	mod_loader,
+	mod_loader_version,
+	created,
+	modified
+FROM profiles;
+
+INSERT INTO instance_links (
+	instance_id,
+	link_kind,
+	modrinth_project_id,
+	modrinth_version_id,
+	server_project_id,
+	content_project_id,
+	content_version_id,
+	hosting_server_id,
+	hosting_instance_ids,
+	hosting_active_instance_id,
+	shared_instance_id
+)
+SELECT
+	'legacy:' || path,
+	CASE
+		WHEN linked_project_id IS NULL
+			THEN 'unmanaged'
+		WHEN linked_version_id IS NULL OR linked_version_id = ''
+			THEN 'server_project'
+		ELSE 'modrinth_modpack'
+	END,
+	CASE
+		WHEN linked_version_id IS NOT NULL AND linked_version_id != ''
+			THEN linked_project_id
+		ELSE NULL
+	END,
+	CASE
+		WHEN linked_version_id IS NOT NULL AND linked_version_id != ''
+			THEN linked_version_id
+		ELSE NULL
+	END,
+	CASE
+		WHEN linked_project_id IS NOT NULL
+			AND (linked_version_id IS NULL OR linked_version_id = '')
+			THEN linked_project_id
+		ELSE NULL
+	END,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL
+FROM profiles;
+
+INSERT OR IGNORE INTO instance_groups (instance_id, group_name)
+SELECT
+	'legacy:' || profiles.path,
+	json_each.value
+FROM profiles, json_each(profiles.groups);
+
+INSERT INTO instance_launch_overrides (
+	instance_id,
+	java_path,
+	extra_launch_args,
+	custom_env_vars,
+	memory,
+	force_fullscreen,
+	game_resolution_x,
+	game_resolution_y,
+	hook_pre_launch,
+	hook_wrapper,
+	hook_post_exit
+)
+SELECT
+	'legacy:' || path,
+	override_java_path,
+	CASE
+		WHEN json_type(override_extra_launch_args) = 'null' THEN NULL
+		ELSE override_extra_launch_args
+	END,
+	CASE
+		WHEN json_type(override_custom_env_vars) = 'null' THEN NULL
+		ELSE override_custom_env_vars
+	END,
+	override_mc_memory_max,
+	override_mc_force_fullscreen,
+	override_mc_game_resolution_x,
+	override_mc_game_resolution_y,
+	override_hook_pre_launch,
+	override_hook_wrapper,
+	override_hook_post_exit
+FROM profiles;
diff --git a/packages/app-lib/migrations/20260619120000_finish-instance-profile-migration.sql b/packages/app-lib/migrations/20260619120000_finish-instance-profile-migration.sql
new file mode 100644
index 0000000000..08f2141e7b
--- /dev/null
+++ b/packages/app-lib/migrations/20260619120000_finish-instance-profile-migration.sql
@@ -0,0 +1,129 @@
+CREATE TEMP TABLE finish_instance_profile_migration_validation (
+	error_count INTEGER NOT NULL CHECK (error_count = 0)
+);
+
+INSERT INTO finish_instance_profile_migration_validation (error_count)
+SELECT COUNT(*)
+FROM profiles
+LEFT JOIN instances ON instances.path = profiles.path
+WHERE instances.id IS NULL;
+
+INSERT INTO finish_instance_profile_migration_validation (error_count)
+SELECT COUNT(*)
+FROM instances
+LEFT JOIN instance_content_sets
+	ON instance_content_sets.id = instances.applied_content_set_id
+	AND instance_content_sets.instance_id = instances.id
+WHERE instances.applied_content_set_id IS NULL
+	OR instance_content_sets.id IS NULL;
+
+DROP TABLE finish_instance_profile_migration_validation;
+
+DROP INDEX processes_profile_path;
+ALTER TABLE processes RENAME TO processes_old;
+
+CREATE TABLE processes (
+	pid INTEGER NOT NULL,
+	start_time INTEGER NOT NULL,
+	name TEXT NOT NULL,
+	executable TEXT NOT NULL,
+	instance_id TEXT NOT NULL,
+	post_exit_command TEXT NULL,
+
+	UNIQUE (pid),
+	PRIMARY KEY (pid),
+	FOREIGN KEY (instance_id) REFERENCES instances(id) ON DELETE CASCADE
+);
+
+INSERT INTO processes (
+	pid,
+	start_time,
+	name,
+	executable,
+	instance_id,
+	post_exit_command
+)
+SELECT
+	processes_old.pid,
+	processes_old.start_time,
+	processes_old.name,
+	processes_old.executable,
+	instances.id,
+	processes_old.post_exit_command
+FROM processes_old
+JOIN instances ON instances.path = processes_old.profile_path;
+
+DROP TABLE processes_old;
+
+CREATE INDEX processes_instance_id ON processes(instance_id);
+
+DROP INDEX join_log_profile_path;
+ALTER TABLE join_log RENAME TO join_log_old;
+
+CREATE TABLE join_log (
+	instance_id TEXT NOT NULL,
+	host TEXT NOT NULL,
+	port INTEGER NOT NULL,
+	join_time INTEGER NOT NULL,
+
+	PRIMARY KEY (instance_id, host, port),
+	FOREIGN KEY (instance_id) REFERENCES instances(id) ON DELETE CASCADE
+);
+
+INSERT INTO join_log (
+	instance_id,
+	host,
+	port,
+	join_time
+)
+SELECT
+	instances.id,
+	join_log_old.host,
+	join_log_old.port,
+	join_log_old.join_time
+FROM join_log_old
+JOIN instances ON instances.path = join_log_old.profile_path;
+
+DROP TABLE join_log_old;
+
+CREATE INDEX join_log_instance_id ON join_log(instance_id);
+
+DROP INDEX attached_world_data_profile_path;
+ALTER TABLE attached_world_data RENAME TO attached_world_data_old;
+
+CREATE TABLE attached_world_data (
+	instance_id TEXT NOT NULL,
+	world_type TEXT CHECK ( world_type in ('singleplayer', 'server') ) NOT NULL,
+	world_id TEXT NOT NULL,
+	display_status TEXT NOT NULL DEFAULT 'normal',
+	project_id TEXT NULL,
+	content_kind TEXT NULL,
+
+	PRIMARY KEY (instance_id, world_type, world_id),
+	FOREIGN KEY (instance_id) REFERENCES instances(id) ON DELETE CASCADE
+);
+
+INSERT INTO attached_world_data (
+	instance_id,
+	world_type,
+	world_id,
+	display_status,
+	project_id,
+	content_kind
+)
+SELECT
+	instances.id,
+	attached_world_data_old.world_type,
+	attached_world_data_old.world_id,
+	attached_world_data_old.display_status,
+	attached_world_data_old.project_id,
+	attached_world_data_old.content_kind
+FROM attached_world_data_old
+JOIN instances ON instances.path = attached_world_data_old.profile_path;
+
+DROP TABLE attached_world_data_old;
+
+CREATE INDEX attached_world_data_instance_id
+	ON attached_world_data(instance_id);
+
+DROP TABLE profiles;
diff --git a/packages/app-lib/src/api/instance.rs b/packages/app-lib/src/api/instance.rs
new file mode 100644
index 0000000000..e017280875
--- /dev/null
+++ b/packages/app-lib/src/api/instance.rs
@@ -0,0 +1,1147 @@
+//! Theseus instance management interface
+
+use crate::event::emit::{emit_instance, emit_loading, init_loading};
+use crate::event::{InstancePayloadType, LoadingBarType};
+use crate::pack::install_from::{
+    EnvType, PackDependency, PackFile, PackFileHash, PackFormat,
+};
+use crate::server_address::ServerAddress;
+use crate::state::{
+    CacheBehaviour, CachedEntry, ContentFile, ContentItem, ContentSet,
+    CreateInstance, Credentials, Dependency, EditInstance,
+    InstanceInstallStage, InstanceLink, InstanceMetadata, JavaVersion,
+    LinkedModpackInfo, ModLoader, ProcessMetadata, ProjectType, Settings,
+    SideType, State,
+};
+use crate::util::fetch;
+use crate::util::io::{self, IOError};
+use async_zip::tokio::write::ZipFileWriter;
+use async_zip::{Compression, ZipEntryBuilder};
+use dashmap::DashMap;
+use path_util::SafeRelativeUtf8UnixPathBuf;
+use serde_json::json;
+use std::collections::{HashMap, HashSet};
+use std::iter::FromIterator;
+use std::path::{Path, PathBuf};
+use std::time::Duration;
+use tokio::fs::File;
+use tokio::io::AsyncReadExt;
+use tokio::process::Command;
+use tracing::{info, warn};
+
+#[derive(Debug, Clone)]
+pub enum QuickPlayType {
+    None,
+    Singleplayer(String),
+    Server(ServerAddress),
+}
+
+#[tracing::instrument]
+pub async fn remove(instance_id: &str) -> crate::Result<()> {
+    let state = State::get().await?;
+    let metadata = get(instance_id).await?;
+    crate::state::remove_instance(instance_id, &state).await?;
+
+    if let Some(metadata) = metadata {
+        emit_instance(&metadata.instance.id, InstancePayloadType::Removed)
+            .await?;
+    }
+
+    Ok(())
+}
+
+#[tracing::instrument]
+pub async fn get(instance_id: &str) -> crate::Result<Option<InstanceMetadata>> {
+    let state = State::get().await?;
+    crate::state::get_instance(instance_id, &state.pool).await
+}
+
+#[tracing::instrument]
+pub async fn get_many(
+    instance_ids: &[&str],
+) -> crate::Result<Vec<InstanceMetadata>> {
+    let state = State::get().await?;
+    let mut instances = Vec::with_capacity(instance_ids.len());
+
+    for instance_id in instance_ids {
+        if let Some(instance) =
+            crate::state::get_instance(instance_id, &state.pool).await?
+        {
+            instances.push(instance);
+        }
+    }
+
+    Ok(instances)
+}
+
+#[tracing::instrument]
+pub async fn list() -> crate::Result<Vec<InstanceMetadata>> {
+    let state = State::get().await?;
+    crate::state::list_instances(&state.pool).await
+}
+
+#[tracing::instrument]
+#[allow(clippy::too_many_arguments)]
+pub async fn create(
+    name: String,
+    game_version: String,
+    modloader: ModLoader,
+    loader_version: Option<String>,
+    icon_path: Option<String>,
+    link: InstanceLink,
+    skip_install: Option<bool>,
+) -> crate::Result<InstanceMetadata> {
+    let state = State::get().await?;
+    let instance = crate::state::create_instance(
+        CreateInstance {
+            name,
+            path: None,
+            game_version,
+            loader: modloader,
+            loader_version,
+            icon_path,
+            link,
+        },
+        &state,
+    )
+    .await?;
+
+    let result = async {
+        emit_instance(&instance.id, InstancePayloadType::Created).await?;
+
+        if !skip_install.unwrap_or(false) {
+            let context =
+                crate::state::instances::commands::get_instance_launch_context(
+                    &instance.id,
+                    &state.pool,
+                )
+                .await?
+                .ok_or_else(|| {
+                    crate::ErrorKind::OtherError(format!(
+                        "Missing launch context for instance {}",
+                        instance.id
+                    ))
+                })?;
+            crate::launcher::install_minecraft(&context, None, false).await?;
+        }
+
+        crate::state::get_instance(&instance.id, &state.pool)
+            .await?
+            .ok_or_else(|| {
+                crate::ErrorKind::InputError(
+                    "Created instance could not be loaded".to_string(),
+                )
+                .into()
+            })
+    }
+    .await;
+
+    if result.is_err() {
+        let _ = crate::state::remove_instance(&instance.id, &state).await;
+    }
+
+    result
+}
+
+pub async fn duplicate(copy_from: &str) -> crate::Result<String> {
+    let metadata = get(copy_from).await?.ok_or_else(|| {
+        crate::ErrorKind::InputError("Unknown instance".to_string())
+    })?;
+    let created = create(
+        metadata.instance.name.clone(),
+        metadata.applied_content_set.game_version.clone(),
+        metadata.applied_content_set.loader,
+        metadata.applied_content_set.loader_version.clone(),
+        metadata.instance.icon_path.clone(),
+        metadata.link.clone(),
+        Some(true),
+    )
+    .await?;
+
+    let state = State::get().await?;
+    let bar = crate::pack::import::copy_dotminecraft(
+        &created.instance.id,
+        get_full_path(copy_from).await?,
+        &state.io_semaphore,
+        None,
+    )
+    .await?;
+
+    let context =
+        crate::state::instances::commands::get_instance_launch_context(
+            &created.instance.id,
+            &state.pool,
+        )
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError("Unknown instance".to_string())
+        })?;
+    crate::launcher::install_minecraft(&context, Some(bar), false).await?;
+    emit_instance(&created.instance.id, InstancePayloadType::Edited).await?;
+
+    Ok(created.instance.id)
+}
+
+#[tracing::instrument]
+pub async fn sync_content_files(
+    instance_id: &str,
+) -> crate::Result<Vec<crate::state::instances::InstanceFile>> {
+    let state = State::get().await?;
+    crate::state::sync_content_files(instance_id, &state).await
+}
+
+#[tracing::instrument]
+pub async fn list_content_sets(
+    instance_id: &str,
+) -> crate::Result<Vec<ContentSet>> {
+    let state = State::get().await?;
+    crate::state::list_content_sets(instance_id, &state.pool).await
+}
+
+#[tracing::instrument]
+pub async fn get_projects(
+    instance_id: &str,
+    cache_behaviour: Option<CacheBehaviour>,
+) -> crate::Result<DashMap<String, ContentFile>> {
+    let state = State::get().await?;
+    crate::state::get_content_projects(
+        instance_id,
+        None,
+        cache_behaviour,
+        &state,
+    )
+    .await
+}
+
+#[tracing::instrument]
+pub async fn get_installed_project_ids(
+    instance_id: &str,
+) -> crate::Result<Vec<String>> {
+    let state = State::get().await?;
+    crate::state::get_installed_project_ids_for_instance(
+        instance_id,
+        None,
+        &state,
+    )
+    .await
+}
+
+#[tracing::instrument]
+pub async fn get_content_items(
+    instance_id: &str,
+    cache_behaviour: Option<CacheBehaviour>,
+) -> crate::Result<Vec<ContentItem>> {
+    let state = State::get().await?;
+    crate::state::list_content(instance_id, None, cache_behaviour, &state).await
+}
+
+#[tracing::instrument]
+pub async fn get_linked_modpack_content(
+    instance_id: &str,
+    cache_behaviour: Option<CacheBehaviour>,
+) -> crate::Result<Vec<ContentItem>> {
+    let state = State::get().await?;
+    crate::state::list_linked_modpack_content(
+        instance_id,
+        None,
+        cache_behaviour,
+        &state,
+    )
+    .await
+}
+
+#[tracing::instrument]
+pub async fn get_dependencies_as_content_items(
+    dependencies: Vec<Dependency>,
+    cache_behaviour: Option<CacheBehaviour>,
+) -> crate::Result<Vec<ContentItem>> {
+    let state = State::get().await?;
+    crate::state::dependencies_to_content_items(
+        &dependencies,
+        cache_behaviour,
+        &state.pool,
+        &state.api_semaphore,
+    )
+    .await
+}
+
+#[tracing::instrument]
+pub async fn get_linked_modpack_info(
+    instance_id: &str,
+    cache_behaviour: Option<CacheBehaviour>,
+) -> crate::Result<Option<LinkedModpackInfo>> {
+    let state = State::get().await?;
+    crate::state::get_linked_modpack_info(
+        instance_id,
+        None,
+        cache_behaviour,
+        &state,
+    )
+    .await
+}
+
+#[tracing::instrument]
+pub async fn get_full_path(instance_id: &str) -> crate::Result<PathBuf> {
+    let state = State::get().await?;
+    let metadata = crate::state::get_instance(instance_id, &state.pool)
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError("Unknown instance".to_string())
+        })?;
+
+    Ok(io::canonicalize(
+        state
+            .directories
+            .instances_dir()
+            .join(metadata.instance.path),
+    )?)
+}
+
+#[tracing::instrument]
+pub async fn get_mod_full_path(
+    instance_id: &str,
+    project_path: &str,
+) -> crate::Result<PathBuf> {
+    Ok(get_full_path(instance_id).await?.join(project_path))
+}
+
+pub async fn edit(
+    instance_id: &str,
+    patch: EditInstance,
+) -> crate::Result<InstanceMetadata> {
+    let state = State::get().await?;
+    crate::state::edit_instance(instance_id, patch, &state.pool).await?;
+
+    crate::state::get_instance(instance_id, &state.pool)
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError("Unknown instance".to_string()).into()
+        })
+}
+
+pub async fn edit_icon(
+    instance_id: &str,
+    icon_path: Option<&Path>,
+) -> crate::Result<()> {
+    let state = State::get().await?;
+    let metadata = crate::state::get_instance(instance_id, &state.pool)
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError("Unknown instance".to_string())
+        })?;
+    let icon_path = if let Some(icon) = icon_path {
+        let bytes = io::read(icon).await?;
+        let file = crate::util::fetch::write_cached_icon(
+            &icon.to_string_lossy(),
+            &state.directories.caches_dir(),
+            bytes::Bytes::from(bytes),
+            &state.io_semaphore,
+        )
+        .await?;
+        Some(file.to_string_lossy().to_string())
+    } else {
+        None
+    };
+
+    crate::state::edit_instance(
+        instance_id,
+        EditInstance {
+            icon_path: Some(icon_path),
+            ..EditInstance::default()
+        },
+        &state.pool,
+    )
+    .await?;
+    emit_instance(&metadata.instance.id, InstancePayloadType::Edited).await?;
+
+    Ok(())
+}
+
+pub async fn get_optimal_jre_key(
+    instance_id: &str,
+) -> crate::Result<Option<JavaVersion>> {
+    let state = State::get().await?;
+    let context =
+        crate::state::instances::commands::get_instance_launch_context(
+            instance_id,
+            &state.pool,
+        )
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::OtherError(format!(
+                "Tried to resolve a nonexistent instance {instance_id}!"
+            ))
+        })?;
+    let (minecraft, version_index) =
+        crate::launcher::resolve_minecraft_manifest(
+            &context.applied_content_set.game_version,
+            &state,
+        )
+        .await?;
+    let version = &minecraft.versions[version_index];
+    let loader_version = crate::launcher::get_loader_version_from_profile(
+        &context.applied_content_set.game_version,
+        context.applied_content_set.loader,
+        context.applied_content_set.loader_version.as_deref(),
+    )
+    .await?;
+    let version_info = crate::launcher::download::download_version_info(
+        &state,
+        version,
+        loader_version.as_ref(),
+        None,
+        None,
+    )
+    .await?;
+
+    crate::launcher::get_java_version_from_launch_context(
+        &context,
+        &version_info,
+    )
+    .await
+}
+
+#[tracing::instrument]
+pub async fn install(instance_id: &str, force: bool) -> crate::Result<()> {
+    let state = State::get().await?;
+    let context =
+        crate::state::instances::commands::get_instance_launch_context(
+            instance_id,
+            &state.pool,
+        )
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::OtherError(format!(
+                "Tried to install a nonexistent instance {instance_id}!"
+            ))
+        })?;
+    let result =
+        crate::launcher::install_minecraft(&context, None, force).await;
+    if result.is_err() {
+        let current_stage =
+            crate::state::instances::commands::get_instance_launch_context(
+                instance_id,
+                &state.pool,
+            )
+            .await
+            .ok()
+            .flatten()
+            .map(|context| context.instance.install_stage)
+            .unwrap_or(InstanceInstallStage::NotInstalled);
+        if current_stage != InstanceInstallStage::Installed {
+            crate::state::instances::commands::set_instance_install_stage(
+                &context.instance.id,
+                InstanceInstallStage::NotInstalled,
+                &state.pool,
+            )
+            .await?;
+        }
+    }
+
+    result
+}
+
+#[tracing::instrument]
+pub async fn update_all_projects(
+    instance_id: &str,
+) -> crate::Result<HashMap<String, String>> {
+    let state = State::get().await?;
+    let metadata = get(instance_id).await?.ok_or_else(|| {
+        crate::ErrorKind::InputError("Unknown instance".to_string())
+    })?;
+    let loading_bar = init_loading(
+        LoadingBarType::InstanceUpdate {
+            instance_id: metadata.instance.id.clone(),
+            instance_name: metadata.instance.name.clone(),
+        },
+        100.0,
+        "Updating instance",
+    )
+    .await?;
+    let map = crate::state::instances::commands::update_all_projects(
+        instance_id,
+        &state,
+    )
+    .await?;
+    emit_loading(&loading_bar, 100.0, Some("Updated instance"))?;
+    emit_instance(&metadata.instance.id, InstancePayloadType::Edited).await?;
+
+    Ok(map)
+}
+
+#[tracing::instrument]
+pub async fn update_project(
+    instance_id: &str,
+    project_path: &str,
+    skip_send_event: Option<bool>,
+) -> crate::Result<String> {
+    let state = State::get().await?;
+    let metadata = get(instance_id).await?.ok_or_else(|| {
+        crate::ErrorKind::InputError("Unknown instance".to_string())
+    })?;
+    let path = crate::state::instances::commands::update_project(
+        instance_id,
+        project_path,
+        &state,
+    )
+    .await?;
+
+    if !skip_send_event.unwrap_or(false) {
+        emit_instance(&metadata.instance.id, InstancePayloadType::Edited)
+            .await?;
+    }
+
+    Ok(path)
+}
+
+#[tracing::instrument]
+pub async fn add_project_from_version(
+    instance_id: &str,
+    version_id: &str,
+    reason: fetch::DownloadReason,
+    dependent_on_version_id: Option<String>,
+) -> crate::Result<String> {
+    let state = State::get().await?;
+    let metadata = get(instance_id).await?.ok_or_else(|| {
+        crate::ErrorKind::InputError("Unknown instance".to_string())
+    })?;
+    let project_path =
+        crate::state::instances::commands::add_project_from_version(
+            instance_id,
+            version_id,
+            reason,
+            dependent_on_version_id,
+            crate::state::ContentSourceKind::Local,
+            &state,
+        )
+        .await?;
+    emit_instance(&metadata.instance.id, InstancePayloadType::Edited).await?;
+
+    Ok(project_path)
+}
+
+#[tracing::instrument]
+pub async fn add_project_from_path(
+    instance_id: &str,
+    path: &Path,
+    project_type: Option<ProjectType>,
+) -> crate::Result<String> {
+    let state = State::get().await?;
+    crate::state::instances::commands::add_project_from_path(
+        instance_id,
+        path,
+        project_type,
+        &state,
+    )
+    .await
+}
+
+#[tracing::instrument]
+pub async fn toggle_disable_project(
+    instance_id: &str,
+    project: &str,
+) -> crate::Result<String> {
+    let state = State::get().await?;
+    let metadata = get(instance_id).await?.ok_or_else(|| {
+        crate::ErrorKind::InputError("Unknown instance".to_string())
+    })?;
+    let res = crate::state::instances::commands::toggle_disable_project(
+        instance_id,
+        project,
+        &state,
+    )
+    .await?;
+    emit_instance(&metadata.instance.id, InstancePayloadType::Edited).await?;
+
+    Ok(res)
+}
+
+#[tracing::instrument]
+pub async fn remove_project(
+    instance_id: &str,
+    project: &str,
+) -> crate::Result<()> {
+    let state = State::get().await?;
+    let metadata = get(instance_id).await?.ok_or_else(|| {
+        crate::ErrorKind::InputError("Unknown instance".to_string())
+    })?;
+    crate::state::instances::commands::remove_project(
+        instance_id,
+        project,
+        &state,
+    )
+    .await?;
+    emit_instance(&metadata.instance.id, InstancePayloadType::Edited).await?;
+
+    Ok(())
+}
+
+#[tracing::instrument]
+pub async fn update_managed_modrinth_version(
+    instance_id: &str,
+    version_id: &str,
+) -> crate::Result<()> {
+    let state = State::get().await?;
+    crate::state::instances::commands::update_managed_modrinth_version(
+        instance_id,
+        version_id,
+        &state,
+    )
+    .await
+}
+
+#[tracing::instrument]
+pub async fn repair_managed_modrinth(instance_id: &str) -> crate::Result<()> {
+    let state = State::get().await?;
+    crate::state::instances::commands::repair_managed_modrinth(
+        instance_id,
+        &state,
+    )
+    .await
+}
+
+#[tracing::instrument(skip_all)]
+pub async fn export_mrpack(
+    instance_id: &str,
+    export_path: PathBuf,
+    included_export_candidates: Vec<String>,
+    version_id: Option<String>,
+    description: Option<String>,
+    _name: Option<String>,
+) -> crate::Result<()> {
+    let state = State::get().await?;
+    let _permit: tokio::sync::SemaphorePermit =
+        state.io_semaphore.0.acquire().await?;
+    let metadata = get(instance_id).await?.ok_or_else(|| {
+        crate::ErrorKind::OtherError(format!(
+            "Tried to export a nonexistent instance {instance_id}!"
+        ))
+    })?;
+    let included_export_candidates = included_export_candidates
+        .into_iter()
+        .filter(|x| {
+            if let Some(f) = PathBuf::from(x).file_name()
+                && f.to_string_lossy().starts_with(".DS_Store")
+            {
+                return false;
+            }
+            true
+        })
+        .collect::<Vec<_>>();
+
+    let instance_base_path = get_full_path(instance_id).await?;
+    let mut file = File::create(&export_path)
+        .await
+        .map_err(|e| IOError::with_path(e, &export_path))?;
+    let mut writer = ZipFileWriter::with_tokio(&mut file);
+    let version_id = version_id.unwrap_or("1.0.0".to_string());
+    let mut packfile =
+        create_mrpack_json(&metadata, version_id, description).await?;
+    let included_candidates_set = HashSet::<_>::from_iter(
+        included_export_candidates.iter().map(|x| x.as_str()),
+    );
+    packfile
+        .files
+        .retain(|f| included_candidates_set.contains(f.path.as_str()));
+
+    let mut path_list = Vec::new();
+    add_all_recursive_folder_paths(&instance_base_path, &mut path_list).await?;
+    let loading_bar = init_loading(
+        LoadingBarType::ZipExtract {
+            instance_id: metadata.instance.id.clone(),
+            instance_name: metadata.instance.name.clone(),
+        },
+        path_list.len() as f64,
+        "Exporting instance to .mrpack",
+    )
+    .await?;
+
+    for path in path_list {
+        emit_loading(&loading_bar, 1.0, None)?;
+        let relative_path = pack_get_relative_path(&instance_base_path, &path)?;
+
+        if packfile.files.iter().any(|f| f.path == relative_path)
+            || !included_candidates_set
+                .iter()
+                .any(|x| relative_path.starts_with(&**x))
+        {
+            continue;
+        }
+
+        if path.is_file() {
+            let mut file = File::open(&path)
+                .await
+                .map_err(|e| IOError::with_path(e, &path))?;
+            let mut data = Vec::new();
+            file.read_to_end(&mut data).await.map_err(IOError::from)?;
+            let builder = ZipEntryBuilder::new(
+                format!("overrides/{relative_path}").into(),
+                Compression::Deflate,
+            );
+            writer.write_entry_whole(builder, &data).await?;
+        }
+    }
+
+    let data = serde_json::to_vec_pretty(&packfile)?;
+    let builder = ZipEntryBuilder::new(
+        "modrinth.index.json".to_string().into(),
+        Compression::Deflate,
+    );
+    writer.write_entry_whole(builder, &data).await?;
+    writer.close().await?;
+
+    Ok(())
+}
+
+#[tracing::instrument]
+pub async fn get_pack_export_candidates(
+    instance_id: &str,
+) -> crate::Result<Vec<SafeRelativeUtf8UnixPathBuf>> {
+    let mut path_list = Vec::new();
+    let instance_base_dir = get_full_path(instance_id).await?;
+    let mut read_dir = io::read_dir(&instance_base_dir).await?;
+    while let Some(entry) = read_dir
+        .next_entry()
+        .await
+        .map_err(|e| IOError::with_path(e, &instance_base_dir))?
+    {
+        let path = entry.path();
+        if path.is_dir() {
+            let mut read_dir = io::read_dir(&path).await?;
+            while let Some(entry) = read_dir
+                .next_entry()
+                .await
+                .map_err(|e| IOError::with_path(e, &instance_base_dir))?
+            {
+                path_list.push(pack_get_relative_path(
+                    &instance_base_dir,
+                    &entry.path(),
+                )?);
+            }
+        } else {
+            path_list.push(pack_get_relative_path(&instance_base_dir, &path)?);
+        }
+    }
+    Ok(path_list)
+}
+
+fn pack_get_relative_path(
+    instance_path: &PathBuf,
+    path: &PathBuf,
+) -> crate::Result<SafeRelativeUtf8UnixPathBuf> {
+    Ok(SafeRelativeUtf8UnixPathBuf::try_from(
+        path.strip_prefix(instance_path)
+            .map_err(|_| {
+                crate::ErrorKind::FSError(format!(
+                    "Path {path:?} does not correspond to an instance"
+                ))
+            })?
+            .components()
+            .map(|c| c.as_os_str().to_string_lossy())
+            .collect::<Vec<_>>()
+            .join("/"),
+    )?)
+}
+
+#[tracing::instrument]
+pub async fn run(
+    instance_id: &str,
+    quick_play_type: QuickPlayType,
+) -> crate::Result<ProcessMetadata> {
+    let state = State::get().await?;
+    let default_account = Credentials::get_default_credential(&state.pool)
+        .await?
+        .ok_or_else(|| crate::ErrorKind::NoCredentialsError.as_error())?;
+
+    run_credentials(instance_id, &default_account, quick_play_type).await
+}
+
+#[tracing::instrument(skip(credentials))]
+async fn run_credentials(
+    instance_id: &str,
+    credentials: &Credentials,
+    quick_play_type: QuickPlayType,
+) -> crate::Result<ProcessMetadata> {
+    let state = State::get().await?;
+    let settings = Settings::get(&state.pool).await?;
+    let context =
+        crate::state::instances::commands::get_instance_launch_context(
+            instance_id,
+            &state.pool,
+        )
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::OtherError(format!(
+                "Tried to run a nonexistent instance {instance_id}!"
+            ))
+        })?;
+
+    let pre_launch_hooks = context
+        .launch_overrides
+        .hooks
+        .pre_launch
+        .as_ref()
+        .or(settings.hooks.pre_launch.as_ref())
+        .filter(|hook_command| !hook_command.is_empty());
+    if let Some(hook) = pre_launch_hooks {
+        let mut cmd = shlex::split(hook)
+            .ok_or_else(|| {
+                crate::ErrorKind::LauncherError(format!(
+                    "Invalid pre-launch command: {hook}",
+                ))
+            })?
+            .into_iter();
+
+        if let Some(command) = cmd.next() {
+            let full_path = get_full_path(&context.instance.id).await?;
+            let result = Command::new(command)
+                .args(cmd)
+                .current_dir(&full_path)
+                .spawn()
+                .map_err(|e| IOError::with_path(e, &full_path))?
+                .wait()
+                .await
+                .map_err(IOError::from)?;
+
+            if !result.success() {
+                return Err(crate::ErrorKind::LauncherError(format!(
+                    "Non-zero exit code for pre-launch hook: {}",
+                    result.code().unwrap_or(-1)
+                ))
+                .as_error());
+            }
+        }
+    }
+
+    let java_args = context
+        .launch_overrides
+        .extra_launch_args
+        .clone()
+        .unwrap_or(settings.extra_launch_args);
+    let wrapper = context
+        .launch_overrides
+        .hooks
+        .wrapper
+        .clone()
+        .or(settings.hooks.wrapper)
+        .filter(|hook_command| !hook_command.is_empty());
+    let memory = context.launch_overrides.memory.unwrap_or(settings.memory);
+    let resolution = context
+        .launch_overrides
+        .game_resolution
+        .unwrap_or(settings.game_resolution);
+    let env_args = context
+        .launch_overrides
+        .custom_env_vars
+        .clone()
+        .unwrap_or(settings.custom_env_vars);
+    let post_exit_hook = context
+        .launch_overrides
+        .hooks
+        .post_exit
+        .clone()
+        .or(settings.hooks.post_exit)
+        .filter(|hook_command| !hook_command.is_empty());
+
+    let mut mc_set_options: Vec<(String, String)> = vec![];
+    if let Some(fullscreen) = context.launch_overrides.force_fullscreen {
+        mc_set_options.push(("fullscreen".to_string(), fullscreen.to_string()));
+    } else if settings.force_fullscreen {
+        mc_set_options.push(("fullscreen".to_string(), "true".to_string()));
+    }
+
+    if let Some(project_id) = server_play_project_id(&context.link)
+        && !project_id.trim().is_empty()
+    {
+        let server_id = uuid::Uuid::new_v4().to_string();
+        let join_result = fetch::INSECURE_REQWEST_CLIENT
+			.post("https://sessionserver.mojang.com/session/minecraft/join")
+			.json(&json!({
+				"accessToken": &credentials.access_token,
+				"selectedProfile": credentials.offline_profile.id.simple().to_string(),
+				"serverId": &server_id,
+			}))
+			.timeout(Duration::from_secs(5))
+			.send()
+			.await;
+
+        match join_result {
+            Ok(resp) if resp.status().is_success() => {
+                let result = fetch::post_json(
+                    concat!(
+                        env!("MODRINTH_API_BASE_URL"),
+                        "analytics/minecraft-server-play"
+                    ),
+                    json!({
+                        "project_id": project_id,
+                        "username": &credentials.offline_profile.name,
+                        "server_id": &server_id,
+                    }),
+                    &state.api_semaphore,
+                    &state.pool,
+                )
+                .await;
+
+                match result {
+                    Ok(()) => {
+                        info!(
+                            "Tracked server play for '{project_id}' in analytics"
+                        )
+                    }
+                    Err(err) => warn!("Failed to report server play: {err:?}"),
+                }
+            }
+            Ok(resp) => warn!(
+                "Failed to join Mojang session server: HTTP {}",
+                resp.status()
+            ),
+            Err(err) => warn!("Failed to join Mojang session server: {err:?}"),
+        }
+    }
+
+    crate::minecraft_skins::flush_pending_skin_change().await?;
+    crate::launcher::launch_minecraft(
+        &java_args,
+        &env_args,
+        &mc_set_options,
+        &wrapper,
+        &memory,
+        &resolution,
+        credentials,
+        post_exit_hook,
+        &context,
+        quick_play_type,
+    )
+    .await
+}
+
+fn server_play_project_id(link: &InstanceLink) -> Option<&String> {
+    match link {
+        InstanceLink::ServerProject { project_id }
+        | InstanceLink::ServerProjectModpack {
+            server_project_id: project_id,
+            ..
+        } => Some(project_id),
+        InstanceLink::Unmanaged
+        | InstanceLink::ModrinthModpack { .. }
+        | InstanceLink::ModrinthHosting { .. }
+        | InstanceLink::ImportedModpack { .. }
+        | InstanceLink::SharedInstance { .. } => None,
+    }
+}
+
+pub async fn kill(instance_id: &str) -> crate::Result<()> {
+    let state = State::get().await?;
+    let processes =
+        crate::api::process::get_by_instance_id(instance_id).await?;
+
+    for process in processes {
+        state.process_manager.kill(process.uuid).await?;
+    }
+
+    Ok(())
+}
+
+#[tracing::instrument]
+pub async fn try_update_playtime_by_instance_id(
+    instance_id: &str,
+) -> crate::Result<()> {
+    let state = State::get().await?;
+    let context =
+		crate::state::instances::commands::get_instance_launch_context(
+			instance_id,
+			&state.pool,
+		)
+		.await?
+		.ok_or_else(|| {
+			crate::ErrorKind::OtherError(format!(
+				"Tried to update playtime for nonexistent instance {instance_id}!"
+			))
+		})?;
+    let updated_recent_playtime = context.instance.recent_time_played;
+    let res = if updated_recent_playtime > 0 {
+        let modrinth_pack_version_id = match &context.link {
+            InstanceLink::ModrinthModpack { version_id, .. }
+            | InstanceLink::ServerProjectModpack {
+                content_version_id: version_id,
+                ..
+            }
+            | InstanceLink::ImportedModpack {
+                version_id: Some(version_id),
+                ..
+            } => Some(version_id.clone()),
+            InstanceLink::Unmanaged
+            | InstanceLink::ServerProject { .. }
+            | InstanceLink::ModrinthHosting { .. }
+            | InstanceLink::ImportedModpack { .. }
+            | InstanceLink::SharedInstance { .. } => None,
+        };
+        let playtime_update_json = json!({
+            "seconds": updated_recent_playtime,
+            "loader": context.applied_content_set.loader.as_str(),
+            "game_version": &context.applied_content_set.game_version,
+            "parent": modrinth_pack_version_id,
+        });
+        let mut hashmap: HashMap<String, serde_json::Value> = HashMap::new();
+
+        for (_, project) in get_projects(instance_id, None).await? {
+            if let Some(metadata) = project.metadata {
+                hashmap
+                    .insert(metadata.version_id, playtime_update_json.clone());
+            }
+        }
+
+        fetch::post_json(
+            concat!(env!("MODRINTH_API_BASE_URL"), "analytics/playtime"),
+            serde_json::to_value(hashmap)?,
+            &state.api_semaphore,
+            &state.pool,
+        )
+        .await
+    } else {
+        Ok(())
+    };
+
+    if res.is_ok() {
+        crate::state::instances::commands::mark_instance_playtime_submitted(
+            &context.instance.id,
+            updated_recent_playtime,
+            &state.pool,
+        )
+        .await?;
+    }
+
+    res
+}
+
+#[tracing::instrument(skip_all)]
+pub async fn create_mrpack_json(
+    metadata: &InstanceMetadata,
+    version_id: String,
+    description: Option<String>,
+) -> crate::Result<PackFormat> {
+    let mut dependencies = HashMap::new();
+    match (
+        metadata.applied_content_set.loader,
+        metadata.applied_content_set.loader_version.clone(),
+    ) {
+        (ModLoader::Forge, Some(v)) => {
+            dependencies.insert(PackDependency::Forge, v)
+        }
+        (ModLoader::NeoForge, Some(v)) => {
+            dependencies.insert(PackDependency::NeoForge, v)
+        }
+        (ModLoader::Fabric, Some(v)) => {
+            dependencies.insert(PackDependency::FabricLoader, v)
+        }
+        (ModLoader::Quilt, Some(v)) => {
+            dependencies.insert(PackDependency::QuiltLoader, v)
+        }
+        (ModLoader::Vanilla, _) => None,
+        _ => {
+            return Err(crate::ErrorKind::OtherError(
+                "Loader version mismatch".to_string(),
+            )
+            .into());
+        }
+    };
+    dependencies.insert(
+        PackDependency::Minecraft,
+        metadata.applied_content_set.game_version.clone(),
+    );
+
+    let state = State::get().await?;
+    let projects = get_projects(
+        &metadata.instance.id,
+        Some(CacheBehaviour::MustRevalidate),
+    )
+    .await?
+    .into_iter()
+    .filter_map(|(path, file)| match file.metadata {
+        Some(metadata) => Some((path, metadata.version_id)),
+        _ => None,
+    })
+    .collect::<Vec<_>>();
+    let versions = CachedEntry::get_version_many(
+        &projects.iter().map(|x| &*x.1).collect::<Vec<_>>(),
+        None,
+        &state.pool,
+        &state.api_semaphore,
+    )
+    .await?;
+    let files = projects
+        .into_iter()
+        .filter_map(|(path, version_id)| {
+            if let Some(version) = versions.iter().find(|x| x.id == version_id)
+            {
+                let mut env = HashMap::new();
+                env.insert(EnvType::Client, SideType::Required);
+                env.insert(EnvType::Server, SideType::Required);
+                let Some(primary_file) = version.files.first() else {
+                    return Some(Err(crate::ErrorKind::OtherError(format!(
+                        "No primary file found for mod at: {path}"
+                    ))
+                    .as_error()));
+                };
+                let file_size = primary_file.size;
+                let downloads = vec![primary_file.url.clone()];
+                let hashes = primary_file
+                    .hashes
+                    .clone()
+                    .into_iter()
+                    .map(|(h1, h2)| (PackFileHash::from(h1), h2))
+                    .collect();
+
+                Some(Ok(PackFile {
+                    path: match path.try_into() {
+                        Ok(path) => path,
+                        Err(_) => {
+                            return Some(Err(crate::ErrorKind::OtherError(
+                                "Invalid file path in project".into(),
+                            )
+                            .as_error()));
+                        }
+                    },
+                    hashes,
+                    env: Some(env),
+                    downloads,
+                    file_size,
+                }))
+            } else {
+                None
+            }
+        })
+        .collect::<crate::Result<Vec<PackFile>>>()?;
+
+    Ok(PackFormat {
+        game: "minecraft".to_string(),
+        format_version: 1,
+        version_id,
+        name: metadata.instance.name.clone(),
+        summary: description,
+        files,
+        dependencies,
+    })
+}
+
+#[async_recursion::async_recursion]
+async fn add_all_recursive_folder_paths(
+    folder: &PathBuf,
+    output: &mut Vec<PathBuf>,
+) -> crate::Result<()> {
+    let mut read_dir = io::read_dir(folder).await?;
+    while let Some(entry) = read_dir
+        .next_entry()
+        .await
+        .map_err(|e| IOError::with_path(e, folder))?
+    {
+        let path = entry.path();
+        if path.is_dir() {
+            add_all_recursive_folder_paths(&path, output).await?;
+        } else {
+            output.push(path);
+        }
+    }
+
+    Ok(())
+}
diff --git a/packages/app-lib/src/api/logs.rs b/packages/app-lib/src/api/logs.rs
index 4859079071..188993eebd 100644
--- a/packages/app-lib/src/api/logs.rs
+++ b/packages/app-lib/src/api/logs.rs
@@ -82,6 +82,32 @@ struct CompactedLog {
     stats: LogCompactionStats,
 }
 
+async fn resolve_instance_path(
+    instance: &str,
+    state: &State,
+) -> crate::Result<String> {
+    sqlx::query_scalar::<_, String>(
+        "
+        SELECT path
+        FROM instances
+        WHERE id = ? OR path = ?
+        ORDER BY CASE WHEN id = ? THEN 0 ELSE 1 END
+        LIMIT 1
+        ",
+    )
+    .bind(instance)
+    .bind(instance)
+    .bind(instance)
+    .fetch_optional(&state.pool)
+    .await?
+    .ok_or_else(|| {
+        crate::ErrorKind::InputError(format!(
+            "Unknown instance id or path: {instance}"
+        ))
+        .as_error()
+    })
+}
+
 fn split_line_ending(line: &str) -> (&str, &str) {
     if let Some(line) = line.strip_suffix("\r\n") {
         (line, "\r\n")
@@ -211,7 +237,7 @@ impl Logs {
     async fn build(
         log_type: LogType,
         age: SystemTime,
-        profile_subpath: &str,
+        instance_path: &str,
         filename: String,
         clear_contents: Option<bool>,
     ) -> crate::Result<Self> {
@@ -225,12 +251,8 @@ impl Logs {
                 None
             } else {
                 Some(
-                    get_output_by_filename(
-                        profile_subpath,
-                        log_type,
-                        &filename,
-                    )
-                    .await?,
+                    get_output_by_filename(instance_path, log_type, &filename)
+                        .await?,
                 )
             },
             filename,
@@ -240,17 +262,18 @@ impl Logs {
 
 #[tracing::instrument]
 pub async fn get_logs_from_type(
-    profile_path: &str,
+    instance_id: &str,
     log_type: LogType,
     clear_contents: Option<bool>,
     logs: &mut Vec<crate::Result<Logs>>,
 ) -> crate::Result<()> {
     let state = State::get().await?;
+    let instance_path = resolve_instance_path(instance_id, &state).await?;
 
     let logs_folder = match log_type {
-        LogType::InfoLog => state.directories.profile_logs_dir(profile_path),
+        LogType::InfoLog => state.directories.instance_logs_dir(&instance_path),
         LogType::CrashReport => {
-            state.directories.crash_reports_dir(profile_path)
+            state.directories.crash_reports_dir(&instance_path)
         }
     };
 
@@ -274,7 +297,7 @@ pub async fn get_logs_from_type(
                     Logs::build(
                         log_type,
                         age,
-                        profile_path,
+                        &instance_path,
                         file_name,
                         clear_contents,
                     )
@@ -288,19 +311,19 @@ pub async fn get_logs_from_type(
 
 #[tracing::instrument]
 pub async fn get_logs(
-    profile_path_id: &str,
+    instance_id: &str,
     clear_contents: Option<bool>,
 ) -> crate::Result<Vec<Logs>> {
     let mut logs = Vec::new();
     get_logs_from_type(
-        profile_path_id,
+        instance_id,
         LogType::InfoLog,
         clear_contents,
         &mut logs,
     )
     .await?;
     get_logs_from_type(
-        profile_path_id,
+        instance_id,
         LogType::CrashReport,
         clear_contents,
         &mut logs,
@@ -314,16 +337,17 @@ pub async fn get_logs(
 
 #[tracing::instrument]
 pub async fn get_logs_by_filename(
-    profile_path: &str,
+    instance_id: &str,
     log_type: LogType,
     filename: String,
 ) -> crate::Result<Logs> {
     let state = State::get().await?;
+    let instance_path = resolve_instance_path(instance_id, &state).await?;
 
     let path = match log_type {
-        LogType::InfoLog => state.directories.profile_logs_dir(profile_path),
+        LogType::InfoLog => state.directories.instance_logs_dir(&instance_path),
         LogType::CrashReport => {
-            state.directories.crash_reports_dir(profile_path)
+            state.directories.crash_reports_dir(&instance_path)
         }
     }
     .join(&filename);
@@ -331,21 +355,21 @@ pub async fn get_logs_by_filename(
     let metadata = std::fs::metadata(&path)?;
     let age = metadata.created().unwrap_or(SystemTime::UNIX_EPOCH);
 
-    Logs::build(log_type, age, profile_path, filename, Some(true)).await
+    Logs::build(log_type, age, &instance_path, filename, Some(true)).await
 }
 
 #[tracing::instrument]
 pub async fn get_output_by_filename(
-    profile_subpath: &str,
+    instance_path: &str,
     log_type: LogType,
     file_name: &str,
 ) -> crate::Result<CensoredString> {
     let state = State::get().await?;
 
     let logs_folder = match log_type {
-        LogType::InfoLog => state.directories.profile_logs_dir(profile_subpath),
+        LogType::InfoLog => state.directories.instance_logs_dir(instance_path),
         LogType::CrashReport => {
-            state.directories.crash_reports_dir(profile_subpath)
+            state.directories.crash_reports_dir(instance_path)
         }
     };
 
@@ -386,10 +410,11 @@ pub async fn get_output_by_filename(
 }
 
 #[tracing::instrument]
-pub async fn delete_logs(profile_path_id: &str) -> crate::Result<()> {
+pub async fn delete_logs(instance_id: &str) -> crate::Result<()> {
     let state = State::get().await?;
+    let instance_path = resolve_instance_path(instance_id, &state).await?;
 
-    let logs_folder = state.directories.profile_logs_dir(profile_path_id);
+    let logs_folder = state.directories.instance_logs_dir(&instance_path);
     for entry in std::fs::read_dir(&logs_folder)
         .map_err(|e| IOError::with_path(e, &logs_folder))?
     {
@@ -404,16 +429,17 @@ pub async fn delete_logs(profile_path_id: &str) -> crate::Result<()> {
 
 #[tracing::instrument]
 pub async fn delete_logs_by_filename(
-    profile_path_id: &str,
+    instance_id: &str,
     log_type: LogType,
     filename: &str,
 ) -> crate::Result<()> {
     let state = State::get().await?;
+    let instance_path = resolve_instance_path(instance_id, &state).await?;
 
     let logs_folder = match log_type {
-        LogType::InfoLog => state.directories.profile_logs_dir(profile_path_id),
+        LogType::InfoLog => state.directories.instance_logs_dir(&instance_path),
         LogType::CrashReport => {
-            state.directories.crash_reports_dir(profile_path_id)
+            state.directories.crash_reports_dir(&instance_path)
         }
     };
 
@@ -424,10 +450,10 @@ pub async fn delete_logs_by_filename(
 
 #[tracing::instrument]
 pub async fn get_live_log_buffer(
-    profile_path: &str,
+    instance_id: &str,
 ) -> crate::Result<CensoredString> {
     let state = State::get().await?;
-    let lines = crate::state::get_log_buffer(profile_path);
+    let lines = crate::state::get_log_buffer(instance_id);
     let joined = lines.join("\n");
     let compacted = compact_duplicate_lines(&joined);
 
@@ -440,26 +466,27 @@ pub async fn get_live_log_buffer(
     Ok(CensoredString::censor(compacted.output, &credentials))
 }
 
-pub fn clear_live_log_buffer(profile_path: &str) {
-    crate::state::remove_log_buffer(profile_path);
+pub fn clear_live_log_buffer(instance_id: &str) {
+    crate::state::remove_log_buffer(instance_id);
 }
 
 #[tracing::instrument]
 pub async fn get_latest_log_cursor(
-    profile_path: &str,
+    instance_id: &str,
     cursor: u64, // 0 to start at beginning of file
 ) -> crate::Result<LatestLogCursor> {
-    get_generic_live_log_cursor(profile_path, "launcher_log.txt", cursor).await
+    get_generic_live_log_cursor(instance_id, "launcher_log.txt", cursor).await
 }
 
 #[tracing::instrument]
 pub async fn get_generic_live_log_cursor(
-    profile_path_id: &str,
+    instance_id: &str,
     log_file_name: &str,
     mut cursor: u64, // 0 to start at beginning of file
 ) -> crate::Result<LatestLogCursor> {
     let state = State::get().await?;
-    let logs_folder = state.directories.profile_logs_dir(profile_path_id);
+    let instance_path = resolve_instance_path(instance_id, &state).await?;
+    let logs_folder = state.directories.instance_logs_dir(&instance_path);
     let path = logs_folder.join(log_file_name);
     if !path.exists() {
         // Allow silent failure if latest.log doesn't exist (as the instance may have been launched, but not yet created the file)
diff --git a/packages/app-lib/src/api/mod.rs b/packages/app-lib/src/api/mod.rs
index be5964bb05..4b74a40cd9 100644
--- a/packages/app-lib/src/api/mod.rs
+++ b/packages/app-lib/src/api/mod.rs
@@ -2,6 +2,7 @@
 pub mod cache;
 pub mod friends;
 pub mod handler;
+pub mod instance;
 pub mod jre;
 pub mod logs;
 pub mod metadata;
@@ -10,7 +11,6 @@ pub mod minecraft_skins;
 pub mod mr_auth;
 pub mod pack;
 pub mod process;
-pub mod profile;
 pub mod server_address;
 pub mod settings;
 pub mod tags;
@@ -18,13 +18,14 @@ pub mod worlds;
 
 pub mod data {
     pub use crate::state::{
-        CacheBehaviour, CacheValueType, ContentItem, ContentItemOwner,
-        ContentItemProject, ContentItemVersion, Credentials, Dependency,
-        DirectoryInfo, Hooks, JavaVersion, LinkedData, LinkedModpackInfo,
-        MemorySettings, ModLoader, ModrinthCredentials, Organization,
-        OwnerType, ProcessMetadata, ProfileFile, Project, ProjectType,
-        ProjectV3, SearchResult, SearchResults, SearchResultsV3, Settings,
-        TeamMember, Theme, User, UserFriend, Version, WindowSize,
+        AppliedContentSetPatch, CacheBehaviour, CacheValueType, ContentFile,
+        ContentItem, ContentItemOwner, ContentItemProject, ContentItemVersion,
+        CreateInstance, Credentials, Dependency, DirectoryInfo, EditInstance,
+        Hooks, InstanceLaunchOverridesPatch, InstanceLink, InstanceMetadata,
+        JavaVersion, LinkedModpackInfo, MemorySettings, ModLoader,
+        ModrinthCredentials, Organization, OwnerType, ProcessMetadata, Project,
+        ProjectType, ProjectV3, SearchResult, SearchResults, SearchResultsV3,
+        Settings, TeamMember, Theme, User, UserFriend, Version, WindowSize,
     };
     pub use ariadne::users::UserStatus;
 }
@@ -34,8 +35,7 @@ pub mod prelude {
         State,
         data::*,
         event::CommandPayload,
-        jre, metadata, minecraft_auth, mr_auth, pack, process,
-        profile::{self, Profile, create},
+        instance, jre, metadata, minecraft_auth, mr_auth, pack, process,
         settings,
         state::ReleaseChannel,
         util::{
diff --git a/packages/app-lib/src/api/pack/import/atlauncher.rs b/packages/app-lib/src/api/pack/import/atlauncher.rs
index f5e052c649..3bf09e6d50 100644
--- a/packages/app-lib/src/api/pack/import/atlauncher.rs
+++ b/packages/app-lib/src/api/pack/import/atlauncher.rs
@@ -10,7 +10,10 @@ use crate::{
         install_from::CreatePackDescription,
     },
     prelude::ModLoader,
-    state::{LinkedData, ProfileInstallStage},
+    state::{
+        AppliedContentSetPatch, EditInstance, InstanceInstallStage,
+        InstanceLink,
+    },
     util::io,
 };
 
@@ -123,7 +126,7 @@ pub async fn is_valid_atlauncher(instance_folder: PathBuf) -> bool {
 pub async fn import_atlauncher(
     atlauncher_base_path: PathBuf, // path to base atlauncher folder
     instance_folder: String,       // instance folder in atlauncher_base_path
-    profile_path: &str,            // path to profile
+    instance_id: &str,
 ) -> crate::Result<()> {
     let atlauncher_instance_path = atlauncher_base_path
         .join("instances")
@@ -165,14 +168,14 @@ pub async fn import_atlauncher(
         project_id: None,
         version_id: None,
         existing_loading_bar: None,
-        profile_path: profile_path.to_string(),
+        instance_id: instance_id.to_string(),
     };
 
     let backup_name = format!("ATLauncher-{instance_folder}");
     let minecraft_folder = atlauncher_instance_path;
 
     import_atlauncher_unmanaged(
-        profile_path,
+        instance_id,
         minecraft_folder,
         backup_name,
         description,
@@ -183,7 +186,7 @@ pub async fn import_atlauncher(
 }
 
 async fn import_atlauncher_unmanaged(
-    profile_path: &str,
+    instance_id: &str,
     minecraft_folder: PathBuf,
     backup_name: String,
     description: CreatePackDescription,
@@ -213,53 +216,58 @@ async fn import_atlauncher_unmanaged(
         None
     };
 
-    // Set profile data to created default profile
-    crate::api::profile::edit(profile_path, |prof| {
-        prof.name = description
-            .override_title
-            .clone()
-            .unwrap_or_else(|| backup_name.to_string());
-        prof.install_stage = ProfileInstallStage::PackInstalling;
-
-        if let Some(ref project_id) = description.project_id
-            && let Some(ref version_id) = description.version_id
-        {
-            prof.linked_data = Some(LinkedData {
+    let link = match (&description.project_id, &description.version_id) {
+        (Some(project_id), Some(version_id)) => {
+            Some(InstanceLink::ModrinthModpack {
                 project_id: project_id.clone(),
                 version_id: version_id.clone(),
-                locked: true,
             })
         }
-
-        prof.icon_path = description
-            .icon
-            .clone()
-            .map(|x| x.to_string_lossy().to_string());
-        prof.game_version.clone_from(&game_version);
-        prof.loader_version = loader_version.clone().map(|x| x.id);
-        prof.loader = mod_loader;
-
-        async { Ok(()) }
-    })
+        _ => None,
+    };
+    crate::api::instance::edit(
+        instance_id,
+        EditInstance {
+            install_stage: Some(InstanceInstallStage::PackInstalling),
+            name: Some(
+                description
+                    .override_title
+                    .clone()
+                    .unwrap_or_else(|| backup_name.to_string()),
+            ),
+            icon_path: Some(
+                description
+                    .icon
+                    .clone()
+                    .map(|x| x.to_string_lossy().to_string()),
+            ),
+            link,
+            content_set_patch: Some(AppliedContentSetPatch {
+                game_version: Some(game_version.clone()),
+                protocol_version: Some(None),
+                loader: Some(mod_loader),
+                loader_version: Some(loader_version.clone().map(|x| x.id)),
+            }),
+            ..EditInstance::default()
+        },
+    )
     .await?;
 
     // Moves .minecraft folder over (ie: overrides such as resourcepacks, mods, etc)
     let state = State::get().await?;
     let loading_bar = copy_dotminecraft(
-        profile_path,
+        instance_id,
         minecraft_folder,
         &state.io_semaphore,
         None,
     )
     .await?;
 
-    if let Some(profile_val) = crate::api::profile::get(profile_path).await? {
-        crate::launcher::install_minecraft(
-            &profile_val,
-            Some(loading_bar),
-            false,
-        )
-        .await?;
-    }
+    crate::launcher::install_minecraft_for_instance_id(
+        instance_id,
+        Some(loading_bar),
+        false,
+    )
+    .await?;
     Ok(())
 }
diff --git a/packages/app-lib/src/api/pack/import/curseforge.rs b/packages/app-lib/src/api/pack/import/curseforge.rs
index 02921794cb..cd475be70e 100644
--- a/packages/app-lib/src/api/pack/import/curseforge.rs
+++ b/packages/app-lib/src/api/pack/import/curseforge.rs
@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     State,
     prelude::ModLoader,
-    state::ProfileInstallStage,
+    state::{AppliedContentSetPatch, EditInstance, InstanceInstallStage},
     util::{
         fetch::{fetch, write_cached_icon},
         io,
@@ -49,7 +49,7 @@ pub async fn is_valid_curseforge(instance_folder: PathBuf) -> bool {
 
 pub async fn import_curseforge(
     curseforge_instance_folder: PathBuf, // instance's folder
-    profile_path: &str,                  // path to profile
+    instance_id: &str,
 ) -> crate::Result<()> {
     // Load minecraftinstance.json
     let minecraft_instance = serde_json::from_str::<MinecraftInstance>(
@@ -134,57 +134,68 @@ pub async fn import_curseforge(
             None
         };
 
-        // Set profile data to created default profile
-        crate::api::profile::edit(profile_path, |prof| {
-            prof.name = override_title
-                .clone()
-                .unwrap_or_else(|| backup_name.to_string());
-            prof.install_stage = ProfileInstallStage::PackInstalling;
-            prof.icon_path =
-                icon.clone().map(|x| x.to_string_lossy().to_string());
-            prof.game_version.clone_from(&game_version);
-            prof.loader_version = loader_version.clone().map(|x| x.id);
-            prof.loader = mod_loader;
-
-            async { Ok(()) }
-        })
+        crate::api::instance::edit(
+            instance_id,
+            EditInstance {
+                install_stage: Some(InstanceInstallStage::PackInstalling),
+                name: Some(
+                    override_title
+                        .clone()
+                        .unwrap_or_else(|| backup_name.to_string()),
+                ),
+                icon_path: Some(
+                    icon.clone().map(|x| x.to_string_lossy().to_string()),
+                ),
+                content_set_patch: Some(AppliedContentSetPatch {
+                    game_version: Some(game_version.clone()),
+                    protocol_version: Some(None),
+                    loader: Some(mod_loader),
+                    loader_version: Some(loader_version.clone().map(|x| x.id)),
+                }),
+                ..EditInstance::default()
+            },
+        )
         .await?;
     } else {
-        // create a vanilla profile
-        crate::api::profile::edit(profile_path, |prof| {
-            prof.name = override_title
-                .clone()
-                .unwrap_or_else(|| backup_name.to_string());
-            prof.icon_path =
-                icon.clone().map(|x| x.to_string_lossy().to_string());
-            prof.game_version
-                .clone_from(&minecraft_instance.game_version);
-            prof.loader_version = None;
-            prof.loader = ModLoader::Vanilla;
-
-            async { Ok(()) }
-        })
+        crate::api::instance::edit(
+            instance_id,
+            EditInstance {
+                name: Some(
+                    override_title
+                        .clone()
+                        .unwrap_or_else(|| backup_name.to_string()),
+                ),
+                icon_path: Some(
+                    icon.clone().map(|x| x.to_string_lossy().to_string()),
+                ),
+                content_set_patch: Some(AppliedContentSetPatch {
+                    game_version: Some(minecraft_instance.game_version.clone()),
+                    protocol_version: Some(None),
+                    loader: Some(ModLoader::Vanilla),
+                    loader_version: Some(None),
+                }),
+                ..EditInstance::default()
+            },
+        )
         .await?;
     }
 
     // Copy in contained folders as overrides
     let state = State::get().await?;
     let loading_bar = copy_dotminecraft(
-        profile_path,
+        instance_id,
         curseforge_instance_folder,
         &state.io_semaphore,
         None,
     )
     .await?;
 
-    if let Some(profile_val) = crate::api::profile::get(profile_path).await? {
-        crate::launcher::install_minecraft(
-            &profile_val,
-            Some(loading_bar),
-            false,
-        )
-        .await?;
-    }
+    crate::launcher::install_minecraft_for_instance_id(
+        instance_id,
+        Some(loading_bar),
+        false,
+    )
+    .await?;
 
     Ok(())
 }
diff --git a/packages/app-lib/src/api/pack/import/gdlauncher.rs b/packages/app-lib/src/api/pack/import/gdlauncher.rs
index bb84f574c4..24b1639453 100644
--- a/packages/app-lib/src/api/pack/import/gdlauncher.rs
+++ b/packages/app-lib/src/api/pack/import/gdlauncher.rs
@@ -2,7 +2,12 @@ use std::path::PathBuf;
 
 use serde::{Deserialize, Serialize};
 
-use crate::{State, prelude::ModLoader, state::ProfileInstallStage, util::io};
+use crate::{
+    State,
+    prelude::ModLoader,
+    state::{AppliedContentSetPatch, EditInstance, InstanceInstallStage},
+    util::io,
+};
 
 use super::{copy_dotminecraft, recache_icon};
 
@@ -36,7 +41,7 @@ pub async fn is_valid_gdlauncher(instance_folder: PathBuf) -> bool {
 
 pub async fn import_gdlauncher(
     gdlauncher_instance_folder: PathBuf, // instance's folder
-    profile_path: &str,                  // path to profile
+    instance_id: &str,
 ) -> crate::Result<()> {
     // Load config.json
     let config = serde_json::from_str::<GDLauncherConfig>(
@@ -81,39 +86,45 @@ pub async fn import_gdlauncher(
         None
     };
 
-    // Set profile data to created default profile
-    crate::api::profile::edit(profile_path, |prof| {
-        prof.name = override_title
-            .clone()
-            .unwrap_or_else(|| backup_name.to_string());
-        prof.install_stage = ProfileInstallStage::PackInstalling;
-        prof.icon_path = icon.clone().map(|x| x.to_string_lossy().to_string());
-        prof.game_version.clone_from(&game_version);
-        prof.loader_version = loader_version.clone().map(|x| x.id);
-        prof.loader = mod_loader;
-
-        async { Ok(()) }
-    })
+    crate::api::instance::edit(
+        instance_id,
+        EditInstance {
+            install_stage: Some(InstanceInstallStage::PackInstalling),
+            name: Some(
+                override_title
+                    .clone()
+                    .unwrap_or_else(|| backup_name.to_string()),
+            ),
+            icon_path: Some(
+                icon.clone().map(|x| x.to_string_lossy().to_string()),
+            ),
+            content_set_patch: Some(AppliedContentSetPatch {
+                game_version: Some(game_version.clone()),
+                protocol_version: Some(None),
+                loader: Some(mod_loader),
+                loader_version: Some(loader_version.clone().map(|x| x.id)),
+            }),
+            ..EditInstance::default()
+        },
+    )
     .await?;
 
     // Copy in contained folders as overrides
     let state = State::get().await?;
     let loading_bar = copy_dotminecraft(
-        profile_path,
+        instance_id,
         gdlauncher_instance_folder,
         &state.io_semaphore,
         None,
     )
     .await?;
 
-    if let Some(profile_val) = crate::api::profile::get(profile_path).await? {
-        crate::launcher::install_minecraft(
-            &profile_val,
-            Some(loading_bar),
-            false,
-        )
-        .await?;
-    }
+    crate::launcher::install_minecraft_for_instance_id(
+        instance_id,
+        Some(loading_bar),
+        false,
+    )
+    .await?;
 
     Ok(())
 }
diff --git a/packages/app-lib/src/api/pack/import/mmc.rs b/packages/app-lib/src/api/pack/import/mmc.rs
index 2abbf16b13..36600b8747 100644
--- a/packages/app-lib/src/api/pack/import/mmc.rs
+++ b/packages/app-lib/src/api/pack/import/mmc.rs
@@ -178,7 +178,7 @@ async fn load_instance_cfg(file_path: &Path) -> crate::Result<MMCInstance> {
 pub async fn import_mmc(
     mmc_base_path: PathBuf,  // path to base mmc folder
     instance_folder: String, // instance folder in mmc_base_path
-    profile_path: &str,      // path to profile
+    instance_id: &str,
 ) -> crate::Result<()> {
     let mmc_instance_path =
         mmc_base_path.join("instances").join(instance_folder);
@@ -209,7 +209,7 @@ pub async fn import_mmc(
         project_id: None,
         version_id: None,
         existing_loading_bar: None,
-        profile_path: profile_path.to_string(),
+        instance_id: instance_id.to_string(),
     };
 
     let mut minecraft_folder = mmc_instance_path.join("minecraft");
@@ -232,24 +232,24 @@ pub async fn import_mmc(
 
                 // Modrinth Managed Pack
                 // Kept separate as we may in the future want to add special handling for modrinth managed packs
-                import_mmc_unmanaged(profile_path, minecraft_folder, "Imported Modrinth Modpack".to_string(), description, mmc_pack).await?;
+                import_mmc_unmanaged(instance_id, minecraft_folder, "Imported Modrinth Modpack".to_string(), description, mmc_pack).await?;
             }
             Some(MMCManagedPackType::Flame | MMCManagedPackType::ATLauncher) => {
                 // For flame/atlauncher managed packs
                 // Treat as unmanaged, but with 'minecraft' folder instead of '.minecraft'
-                import_mmc_unmanaged(profile_path, minecraft_folder, "Imported Modpack".to_string(), description, mmc_pack).await?;
+                import_mmc_unmanaged(instance_id, minecraft_folder, "Imported Modpack".to_string(), description, mmc_pack).await?;
             },
             Some(_) => {
                 // For managed packs that aren't modrinth, flame, atlauncher
                 // Treat as unmanaged
-                import_mmc_unmanaged(profile_path, minecraft_folder, "ImportedModpack".to_string(), description, mmc_pack).await?;
+                import_mmc_unmanaged(instance_id, minecraft_folder, "ImportedModpack".to_string(), description, mmc_pack).await?;
             },
             _ => return Err(crate::ErrorKind::InputError("Instance is managed, but managed pack type not specified in instance.cfg".to_string()).into())
         }
     } else {
         // Directly import unmanaged pack
         import_mmc_unmanaged(
-            profile_path,
+            instance_id,
             minecraft_folder,
             "Imported Modpack".to_string(),
             description,
@@ -261,7 +261,7 @@ pub async fn import_mmc(
 }
 
 async fn import_mmc_unmanaged(
-    profile_path: &str,
+    instance_id: &str,
     minecraft_folder: PathBuf,
     backup_name: String,
     description: CreatePackDescription,
@@ -307,9 +307,8 @@ async fn import_mmc_unmanaged(
         })
         .collect();
 
-    // Sets profile information to be that loaded from mmc-pack.json and instance.cfg
-    install_from::set_profile_information(
-        profile_path.to_string(),
+    install_from::set_instance_information(
+        instance_id.to_string(),
         &description,
         &backup_name,
         &dependencies,
@@ -320,20 +319,18 @@ async fn import_mmc_unmanaged(
     // Moves .minecraft folder over (ie: overrides such as resourcepacks, mods, etc)
     let state = State::get().await?;
     let loading_bar = copy_dotminecraft(
-        profile_path,
+        instance_id,
         minecraft_folder,
         &state.io_semaphore,
         None,
     )
     .await?;
 
-    if let Some(profile_val) = crate::api::profile::get(profile_path).await? {
-        crate::launcher::install_minecraft(
-            &profile_val,
-            Some(loading_bar),
-            false,
-        )
-        .await?;
-    }
+    crate::launcher::install_minecraft_for_instance_id(
+        instance_id,
+        Some(loading_bar),
+        false,
+    )
+    .await?;
     Ok(())
 }
diff --git a/packages/app-lib/src/api/pack/import/mod.rs b/packages/app-lib/src/api/pack/import/mod.rs
index cdc25b31c9..becb59ac1b 100644
--- a/packages/app-lib/src/api/pack/import/mod.rs
+++ b/packages/app-lib/src/api/pack/import/mod.rs
@@ -119,7 +119,7 @@ pub async fn get_importable_instances(
 
 // #[tracing::instrument]
 pub async fn import_instance(
-    profile_path: &str, // This should be a blank profile
+    instance_id: &str,
     launcher_type: ImportLauncherType,
     base_path: PathBuf,
     instance_folder: String,
@@ -130,7 +130,7 @@ pub async fn import_instance(
             mmc::import_mmc(
                 base_path,       // path to base mmc folder
                 instance_folder, // instance folder in mmc_base_path
-                profile_path,    // path to profile
+                instance_id,
             )
             .await
         }
@@ -138,21 +138,21 @@ pub async fn import_instance(
             atlauncher::import_atlauncher(
                 base_path,       // path to atlauncher folder
                 instance_folder, // instance folder in atlauncher
-                profile_path,    // path to profile
+                instance_id,
             )
             .await
         }
         ImportLauncherType::GDLauncher => {
             gdlauncher::import_gdlauncher(
                 base_path.join("instances").join(instance_folder), // path to gdlauncher folder
-                profile_path, // path to profile
+                instance_id,
             )
             .await
         }
         ImportLauncherType::Curseforge => {
             curseforge::import_curseforge(
                 base_path.join("Instances").join(instance_folder), // path to curseforge folder
-                profile_path, // path to profile
+                instance_id,
             )
             .await
         }
@@ -173,7 +173,7 @@ pub async fn import_instance(
                 {
                     matched = true;
                     Box::pin(import_instance(
-                        profile_path,
+                        instance_id,
                         lt,
                         base_path,
                         instance_folder,
@@ -198,7 +198,7 @@ pub async fn import_instance(
         Ok(_) => {}
         Err(e) => {
             tracing::warn!("Import failed: {:?}", e);
-            let _ = crate::api::profile::remove(profile_path).await;
+            let _ = crate::api::instance::remove(instance_id).await;
             return Err(e);
         }
     }
@@ -340,14 +340,13 @@ pub async fn recache_icon(
 }
 
 pub async fn copy_dotminecraft(
-    profile_path_id: &str,
+    instance_id: &str,
     dotminecraft: PathBuf,
     io_semaphore: &IoSemaphore,
     existing_loading_bar: Option<LoadingBarId>,
 ) -> crate::Result<LoadingBarId> {
-    // Get full path to profile
-    let profile_path =
-        crate::api::profile::get_full_path(profile_path_id).await?;
+    let instance_path =
+        crate::api::instance::get_full_path(instance_id).await?;
 
     // Gets all subfiles recursively in src
     let subfiles = get_all_subfiles(&dotminecraft, false).await?;
@@ -355,12 +354,12 @@ pub async fn copy_dotminecraft(
 
     let loading_bar = init_or_edit_loading(
         existing_loading_bar,
-        crate::LoadingBarType::CopyProfile {
+        crate::LoadingBarType::CopyInstance {
             import_location: dotminecraft.clone(),
-            profile_name: profile_path_id.to_string(),
+            instance_name: instance_id.to_string(),
         },
         total_subfiles as f64,
-        "Copying files in profile",
+        "Copying files in instance",
     )
     .await?;
 
@@ -373,7 +372,7 @@ pub async fn copy_dotminecraft(
                     &src_child.display()
                 ))
             })?;
-        let dst_child = profile_path.join(dst_child);
+        let dst_child = instance_path.join(dst_child);
 
         // sleep for cpu for 1 millisecond
         tokio::time::sleep(std::time::Duration::from_millis(1)).await;
diff --git a/packages/app-lib/src/api/pack/install_from.rs b/packages/app-lib/src/api/pack/install_from.rs
index 9811c4922e..1334072fdb 100644
--- a/packages/app-lib/src/api/pack/install_from.rs
+++ b/packages/app-lib/src/api/pack/install_from.rs
@@ -1,11 +1,10 @@
 use crate::State;
-use crate::api::profile;
 use crate::data::ModLoader;
 use crate::event::emit::{emit_loading, init_loading};
 use crate::event::{LoadingBarId, LoadingBarType};
 use crate::state::{
-    CacheBehaviour, CachedEntry, LinkedData, Profile, ProfileInstallStage,
-    SideType,
+    AppliedContentSetPatch, CacheBehaviour, CachedEntry, EditInstance,
+    InstanceInstallStage, InstanceLink, SideType,
 };
 use crate::util::fetch::{
     DownloadMeta, DownloadReason, fetch, fetch_advanced, sha1_file_async,
@@ -102,30 +101,30 @@ pub enum CreatePackLocation {
 
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct CreatePackProfile {
-    pub name: String, // the name of the profile, and relative path
-    pub game_version: String, // the game version of the profile
+pub struct CreatePackInstance {
+    pub name: String, // the name of the instance and relative path
+    pub game_version: String, // the game version of the instance
     pub modloader: ModLoader, // the modloader to use
     pub loader_version: Option<String>, // the modloader version to use, set to "latest", "stable", or the ID of your chosen loader. defaults to latest
-    pub icon: Option<PathBuf>,          // the icon for the profile
-    pub icon_url: Option<String>, // the URL icon for a profile (ONLY USED FOR TEMPORARY PROFILES)
-    pub linked_data: Option<LinkedData>, // the linked project ID (mainly for modpacks)- used for updating
+    pub icon: Option<PathBuf>,          // the icon for the instance
+    pub icon_url: Option<String>, // the URL icon for an instance during import
+    pub link: Option<InstanceLink>,
     pub unknown_file: bool, // true when pack file isn't found on Modrinth via hash lookup
     pub skip_install_profile: Option<bool>,
     pub no_watch: Option<bool>,
 }
 
 // default
-impl Default for CreatePackProfile {
+impl Default for CreatePackInstance {
     fn default() -> Self {
-        CreatePackProfile {
+        CreatePackInstance {
             name: "Untitled".to_string(),
             game_version: "1.19.4".to_string(),
             modloader: ModLoader::Vanilla,
             loader_version: None,
             icon: None,
             icon_url: None,
-            linked_data: None,
+            link: None,
             unknown_file: false,
             skip_install_profile: Some(true),
             no_watch: Some(false),
@@ -156,25 +155,24 @@ pub struct CreatePackDescription {
     pub project_id: Option<String>,
     pub version_id: Option<String>,
     pub existing_loading_bar: Option<LoadingBarId>,
-    pub profile_path: String,
+    pub instance_id: String,
 }
 
-pub async fn get_profile_from_pack(
+pub async fn get_instance_from_pack(
     location: CreatePackLocation,
-) -> crate::Result<CreatePackProfile> {
+) -> crate::Result<CreatePackInstance> {
     match location {
         CreatePackLocation::FromVersionId {
             project_id,
             version_id,
             title,
             icon_url,
-        } => Ok(CreatePackProfile {
+        } => Ok(CreatePackInstance {
             name: title,
             icon_url,
-            linked_data: Some(LinkedData {
+            link: Some(InstanceLink::ModrinthModpack {
                 project_id,
                 version_id,
-                locked: true,
             }),
             ..Default::default()
         }),
@@ -212,7 +210,7 @@ pub async fn get_profile_from_pack(
                 false
             };
 
-            Ok(CreatePackProfile {
+            Ok(CreatePackInstance {
                 name: file_name,
                 unknown_file: !is_known_file,
                 ..Default::default()
@@ -228,7 +226,7 @@ pub async fn generate_pack_from_version_id(
     version_id: String,
     title: String,
     icon_url: Option<String>,
-    profile_path: String,
+    instance_id: String,
 
     initialized_loading_bar: Option<LoadingBarId>,
     reason: DownloadReason,
@@ -242,7 +240,7 @@ pub async fn generate_pack_from_version_id(
     } else {
         init_loading(
             LoadingBarType::PackFileDownload {
-                profile_path: profile_path.clone(),
+                instance_id: instance_id.clone(),
                 pack_name: title.clone(),
                 icon: icon_url,
                 pack_version: version_id.clone(),
@@ -268,7 +266,7 @@ pub async fn generate_pack_from_version_id(
     })?;
     emit_loading(&loading_bar, 10.0, None)?;
 
-    // Update profile with correct loader and game version from the API version metadata,
+    // Update instance with correct loader and game version from the API version metadata,
     // so the UI shows accurate info while the pack file is still downloading.
     if let Some(game_version) = version.game_versions.first() {
         let loader = version
@@ -277,12 +275,18 @@ pub async fn generate_pack_from_version_id(
             .map(|l| ModLoader::from_string(l))
             .unwrap_or(ModLoader::Vanilla);
         let game_version = game_version.clone();
-        let profile_path_clone = profile_path.clone();
-        profile::edit(&profile_path_clone, |prof| {
-            prof.game_version.clone_from(&game_version);
-            prof.loader = loader;
-            async { Ok(()) }
-        })
+        crate::api::instance::edit(
+            &instance_id,
+            EditInstance {
+                content_set_patch: Some(AppliedContentSetPatch {
+                    game_version: Some(game_version),
+                    protocol_version: Some(None),
+                    loader: Some(loader),
+                    loader_version: None,
+                }),
+                ..EditInstance::default()
+            },
+        )
         .await?;
     }
 
@@ -301,20 +305,19 @@ pub async fn generate_pack_from_version_id(
             )
         })?;
 
-    let profile =
-        Profile::get(&profile_path, &state.pool)
+    let metadata =
+        crate::api::instance::get(&instance_id)
             .await?
             .ok_or_else(|| {
-                crate::ErrorKind::UnmanagedProfileError(
-                    profile_path.to_string(),
-                )
-                .as_error()
+                crate::ErrorKind::InputError(format!(
+                    "Unknown instance {instance_id}"
+                ))
             })?;
 
     let download_meta = DownloadMeta {
         reason,
-        game_version: profile.game_version.clone(),
-        loader: profile.loader.as_str().to_string(),
+        game_version: metadata.applied_content_set.game_version.clone(),
+        loader: metadata.applied_content_set.loader.as_str().to_string(),
         dependent_on: Some(version_id.clone()),
     };
 
@@ -390,8 +393,11 @@ pub async fn generate_pack_from_version_id(
 
     // Set the icon immediately so the UI shows it during download.
     if let Some(ref icon_path) = icon {
-        let _ =
-            profile::edit_icon(&profile_path, Some(icon_path.as_path())).await;
+        let _ = crate::api::instance::edit_icon(
+            &instance_id,
+            Some(icon_path.as_path()),
+        )
+        .await;
     }
 
     Ok(CreatePack {
@@ -402,7 +408,7 @@ pub async fn generate_pack_from_version_id(
             project_id: Some(project_id),
             version_id: Some(version_id),
             existing_loading_bar: Some(loading_bar),
-            profile_path,
+            instance_id,
         },
     })
 }
@@ -411,7 +417,7 @@ pub async fn generate_pack_from_version_id(
 
 pub async fn generate_pack_from_file(
     path: PathBuf,
-    profile_path: String,
+    instance_id: String,
 ) -> crate::Result<CreatePack> {
     Ok(CreatePack {
         file: CreatePackFile::Path(path),
@@ -421,19 +427,19 @@ pub async fn generate_pack_from_file(
             project_id: None,
             version_id: None,
             existing_loading_bar: None,
-            profile_path,
+            instance_id,
         },
     })
 }
 
-/// Sets generated profile attributes to the pack ones (using profile::edit)
+/// Sets generated instance attributes to the pack ones.
 /// This includes the pack name, icon, game version, loader version, and loader
-pub async fn set_profile_information(
-    profile_path: String,
+pub async fn set_instance_information(
+    instance_id: String,
     description: &CreatePackDescription,
     backup_name: &str,
     dependencies: &HashMap<PackDependency, String>,
-    ignore_lock: bool, // do not change locked status
+    _ignore_lock: bool,
 ) -> crate::Result<()> {
     let mut game_version: Option<&String> = None;
     let mut mod_loader = None;
@@ -479,40 +485,39 @@ pub async fn set_profile_information(
     } else {
         None
     };
-    // Sets values in profile
-    crate::api::profile::edit(&profile_path, |prof| {
-        prof.name = description
-            .override_title
-            .clone()
-            .unwrap_or_else(|| backup_name.to_string());
-        prof.install_stage = ProfileInstallStage::PackInstalling;
-
-        if let Some(ref project_id) = description.project_id
-            && let Some(ref version_id) = description.version_id
-        {
-            prof.linked_data = Some(LinkedData {
+    let link = match (&description.project_id, &description.version_id) {
+        (Some(project_id), Some(version_id)) => {
+            Some(InstanceLink::ModrinthModpack {
                 project_id: project_id.clone(),
                 version_id: version_id.clone(),
-                locked: if !ignore_lock {
-                    true
-                } else {
-                    prof.linked_data.as_ref().is_none_or(|x| x.locked)
-                },
             })
         }
-
-        // Only update the icon if the pack provides one.
-        // When installing to an existing profile, icon is None
-        // and we preserve the profile's existing icon.
-        if let Some(ref icon) = description.icon {
-            prof.icon_path = Some(icon.to_string_lossy().to_string());
-        }
-        prof.game_version.clone_from(game_version);
-        prof.loader_version = loader_version.clone().map(|x| x.id);
-        prof.loader = mod_loader;
-
-        async { Ok(()) }
-    })
+        _ => None,
+    };
+    crate::api::instance::edit(
+        &instance_id,
+        EditInstance {
+            install_stage: Some(InstanceInstallStage::PackInstalling),
+            name: Some(
+                description
+                    .override_title
+                    .clone()
+                    .unwrap_or_else(|| backup_name.to_string()),
+            ),
+            icon_path: description
+                .icon
+                .as_ref()
+                .map(|icon| Some(icon.to_string_lossy().to_string())),
+            link,
+            content_set_patch: Some(AppliedContentSetPatch {
+                game_version: Some(game_version.clone()),
+                protocol_version: Some(None),
+                loader: Some(mod_loader),
+                loader_version: Some(loader_version.clone().map(|x| x.id)),
+            }),
+            ..EditInstance::default()
+        },
+    )
     .await?;
     Ok(())
 }
diff --git a/packages/app-lib/src/api/pack/install_mrpack.rs b/packages/app-lib/src/api/pack/install_mrpack.rs
index 9376dc2fd6..427c1d2745 100644
--- a/packages/app-lib/src/api/pack/install_mrpack.rs
+++ b/packages/app-lib/src/api/pack/install_mrpack.rs
@@ -1,17 +1,17 @@
+use crate::State;
 use crate::event::LoadingBarType;
 use crate::event::emit::{
     emit_loading, init_or_edit_loading, loading_try_for_each_concurrent,
 };
 use crate::pack::install_from::{
-    EnvType, PackFile, PackFileHash, set_profile_information,
+    EnvType, PackFile, PackFileHash, set_instance_information,
 };
+use crate::state::instances::ContentSourceKind;
 use crate::state::{
-    CacheBehaviour, CachedEntry, Profile, ProfileInstallStage, SideType,
-    cache_file_hash,
+    CachedEntry, EditInstance, InstanceInstallStage, SideType, cache_file_hash,
 };
 use crate::util::fetch::{DownloadMeta, DownloadReason, fetch_mirrors, write};
 use crate::util::io;
-use crate::{State, profile};
 use async_zip::base::read::seek::ZipFileReader as SeekZipFileReader;
 use async_zip::base::read::{WithEntry, ZipEntryReader};
 use async_zip::tokio::read::fs::ZipFileReader as FsZipFileReader;
@@ -222,7 +222,7 @@ where
 /// Install a modpack from a mrpack file (a modrinth .zip format)
 pub async fn install_zipped_mrpack(
     location: CreatePackLocation,
-    profile_path: String,
+    instance_id: String,
 ) -> crate::Result<String> {
     // Get file from description
     let create_pack: CreatePack = match location {
@@ -237,18 +237,18 @@ pub async fn install_zipped_mrpack(
                 version_id,
                 title,
                 icon_url,
-                profile_path.clone(),
+                instance_id.clone(),
                 None,
                 DownloadReason::Modpack,
             )
             .await?
         }
         CreatePackLocation::FromFile { path } => {
-            generate_pack_from_file(path, profile_path.clone()).await?
+            generate_pack_from_file(path, instance_id.clone()).await?
         }
     };
 
-    // Install pack files, and if it fails, fail safely by removing the profile
+    // Install pack files, and if it fails, fail safely by removing the instance.
     let result = install_zipped_mrpack_files(
         create_pack,
         false,
@@ -257,9 +257,9 @@ pub async fn install_zipped_mrpack(
     .await;
 
     match result {
-        Ok(profile) => Ok(profile),
+        Ok(instance_id) => Ok(instance_id),
         Err(err) => {
-            let _ = crate::api::profile::remove(&profile_path).await;
+            let _ = crate::api::instance::remove(&instance_id).await;
 
             Err(err)
         }
@@ -276,12 +276,12 @@ pub async fn install_zipped_mrpack_files(
     let state = &State::get().await?;
 
     let file = create_pack.file;
-    let description = create_pack.description.clone(); // make a copy for profile edit function
+    let description = create_pack.description.clone();
     let icon = create_pack.description.icon;
     let project_id = create_pack.description.project_id;
     let version_id = create_pack.description.version_id;
     let existing_loading_bar = create_pack.description.existing_loading_bar;
-    let profile_path = create_pack.description.profile_path;
+    let instance_id = create_pack.description.instance_id;
     let icon_exists = icon.is_some();
 
     let mut zip_reader = MrpackZipReader::new(&file).await?;
@@ -370,9 +370,8 @@ pub async fn install_zipped_mrpack_files(
         );
     }
 
-    // Sets generated profile attributes to the pack ones (using profile::edit)
-    set_profile_information(
-        profile_path.clone(),
+    set_instance_information(
+        instance_id.clone(),
         &description,
         &pack.name,
         &pack.dependencies,
@@ -380,11 +379,21 @@ pub async fn install_zipped_mrpack_files(
     )
     .await?;
 
-    let profile_path = profile_path.clone();
+    let metadata =
+        crate::api::instance::get(&instance_id)
+            .await?
+            .ok_or_else(|| {
+                crate::ErrorKind::InputError(format!(
+                    "Unknown instance {instance_id}"
+                ))
+            })?;
+    let instance_path = metadata.instance.path.clone();
+    let instance_full_path =
+        crate::api::instance::get_full_path(&instance_id).await?;
     let loading_bar = init_or_edit_loading(
         existing_loading_bar,
         LoadingBarType::PackDownload {
-            profile_path: profile_path.clone(),
+            instance_id: instance_id.clone(),
             pack_name: pack.name.clone(),
             icon,
             pack_id: project_id.clone(),
@@ -395,20 +404,10 @@ pub async fn install_zipped_mrpack_files(
     )
     .await?;
 
-    let profile =
-        Profile::get(&profile_path, &state.pool)
-            .await?
-            .ok_or_else(|| {
-                crate::ErrorKind::UnmanagedProfileError(
-                    profile_path.to_string(),
-                )
-                .as_error()
-            })?;
-
     let download_meta = DownloadMeta {
         reason,
-        game_version: profile.game_version.clone(),
-        loader: profile.loader.as_str().to_string(),
+        game_version: metadata.applied_content_set.game_version.clone(),
+        loader: metadata.applied_content_set.loader.as_str().to_string(),
         dependent_on: version_id.clone(),
     };
 
@@ -421,8 +420,11 @@ pub async fn install_zipped_mrpack_files(
         num_files,
         None,
         |project| {
-            let profile_path = profile_path.clone();
+            let instance_id = instance_id.clone();
+            let instance_path = instance_path.clone();
+            let instance_full_path = instance_full_path.clone();
             let download_meta = download_meta.clone();
+            let pack_version_id = version_id.clone();
             async move {
                 //TODO: Future update: prompt user for optional files in a modpack
                 if let Some(env) = project.env
@@ -447,13 +449,11 @@ pub async fn install_zipped_mrpack_files(
                 )
                 .await?;
 
-                let path = profile::get_full_path(&profile_path)
-                    .await?
-                    .join(project.path.as_str());
+                let path = instance_full_path.join(project.path.as_str());
 
                 cache_file_hash(
                     file.clone(),
-                    &profile_path,
+                    &instance_path,
                     project.path.as_str(),
                     project.hashes.get(&PackFileHash::Sha1).map(|x| &**x),
                     ProjectType::get_from_parent_folder(&path),
@@ -464,6 +464,44 @@ pub async fn install_zipped_mrpack_files(
 
                 write(&path, &file, &state.io_semaphore).await?;
 
+                if let Some(project_type) =
+                    ProjectType::get_from_parent_folder(project.path.as_str())
+                {
+                    let hash =
+                        project.hashes.get(&PackFileHash::Sha1).map(|x| &**x);
+                    let file_info = if let Some(hash) = hash {
+                        CachedEntry::get_file_many(
+                            &[hash],
+                            None,
+                            &state.pool,
+                            &state.api_semaphore,
+                        )
+                        .await?
+                        .into_iter()
+                        .next()
+                    } else {
+                        None
+                    };
+                    if let Some(hash) = hash {
+                        crate::state::instances::commands::record_project_file(
+                            &instance_id,
+                            project.path.as_str(),
+                            hash,
+                            project.file_size as u64,
+                            project_type,
+                            modpack_source_kind(pack_version_id.as_deref()),
+                            file_info
+                                .as_ref()
+                                .map(|file| file.project_id.as_str()),
+                            file_info
+                                .as_ref()
+                                .map(|file| file.version_id.as_str()),
+                            state,
+                        )
+                        .await?;
+                    }
+                }
+
                 Ok(())
             }
         },
@@ -501,18 +539,17 @@ pub async fn install_zipped_mrpack_files(
                 ))
             })?;
 
-        let path = profile::get_full_path(&profile_path)
-            .await?
-            .join(relative_override_file_path.as_str());
+        let path =
+            instance_full_path.join(relative_override_file_path.as_str());
         let (size, hash) = zip_reader
             .extract_entry(index, &path, &state.io_semaphore)
             .await?;
 
         crate::state::cache_file_hash_metadata(
-            &profile_path,
+            &instance_path,
             relative_override_file_path.as_str(),
             size,
-            hash,
+            hash.clone(),
             ProjectType::get_from_parent_folder(
                 relative_override_file_path.as_str(),
             ),
@@ -521,6 +558,23 @@ pub async fn install_zipped_mrpack_files(
         )
         .await?;
 
+        if let Some(project_type) = ProjectType::get_from_parent_folder(
+            relative_override_file_path.as_str(),
+        ) {
+            crate::state::instances::commands::record_project_file(
+                &instance_id,
+                relative_override_file_path.as_str(),
+                &hash,
+                size,
+                project_type,
+                modpack_source_kind(version_id.as_deref()),
+                None,
+                None,
+                state,
+            )
+            .await?;
+        }
+
         emit_loading(
             &loading_bar,
             30.0 / override_file_entries_count as f64,
@@ -533,29 +587,34 @@ pub async fn install_zipped_mrpack_files(
 
     // If the icon doesn't exist, we expect icon.png to be a potential icon.
     // If it doesn't exist, and an override to icon.png exists, cache and use that
-    let potential_icon = profile::get_full_path(&profile_path)
-        .await?
-        .join("icon.png");
+    let potential_icon = instance_full_path.join("icon.png");
     if !icon_exists && potential_icon.exists() {
-        profile::edit_icon(&profile_path, Some(&potential_icon)).await?;
+        crate::api::instance::edit_icon(&instance_id, Some(&potential_icon))
+            .await?;
     }
 
-    if let Some(profile_val) = profile::get(&profile_path).await? {
-        crate::launcher::install_minecraft(
-            &profile_val,
-            Some(loading_bar),
-            false,
-        )
-        .await?;
-    }
+    crate::launcher::install_minecraft_for_instance_id(
+        &instance_id,
+        Some(loading_bar),
+        false,
+    )
+    .await?;
+
+    Ok::<String, crate::Error>(instance_id.clone())
+}
 
-    Ok::<String, crate::Error>(profile_path.clone())
+fn modpack_source_kind(version_id: Option<&str>) -> ContentSourceKind {
+    if version_id.is_some() {
+        ContentSourceKind::ModrinthModpack
+    } else {
+        ContentSourceKind::ImportedModpack
+    }
 }
 
 #[tracing::instrument(skip(mrpack_file))]
 
 pub async fn remove_all_related_files(
-    profile_path: String,
+    instance_id: String,
     mrpack_file: CreatePackFile,
 ) -> crate::Result<()> {
     // Updates can remove files from a locally imported or downloaded pack, so share the same reader path.
@@ -581,17 +640,29 @@ pub async fn remove_all_related_files(
         .into());
     }
 
-    // Set install stage to installing, and do not change it back (as files are being removed and are not being reinstalled here)
-    crate::api::profile::edit(&profile_path, |prof| {
-        prof.install_stage = ProfileInstallStage::PackInstalling;
-        async { Ok(()) }
-    })
+    crate::api::instance::edit(
+        &instance_id,
+        EditInstance {
+            install_stage: Some(InstanceInstallStage::PackInstalling),
+            ..EditInstance::default()
+        },
+    )
     .await?;
 
     // First, remove all modrinth projects by their version hashes
     // Remove all modrinth projects by their version hashes
     // We need to do a fetch to get the project ids from Modrinth
     let state = State::get().await?;
+    let metadata =
+        crate::api::instance::get(&instance_id)
+            .await?
+            .ok_or_else(|| {
+                crate::ErrorKind::InputError(format!(
+                    "Unknown instance {instance_id}"
+                ))
+            })?;
+    let instance_full_path =
+        crate::api::instance::get_full_path(&instance_id).await?;
     let all_hashes = pack
         .files
         .iter()
@@ -612,34 +683,28 @@ pub async fn remove_all_related_files(
         .map(|p| p.project_id)
         .collect::<Vec<_>>();
 
-    let profile = profile::get(&profile_path).await?.ok_or_else(|| {
-        crate::ErrorKind::UnmanagedProfileError(profile_path.to_string())
-    })?;
-    let profile_full_path = profile::get_full_path(&profile_path).await?;
-
-    for (file_path, project) in profile
-        .get_projects(
-            Some(CacheBehaviour::MustRevalidate),
-            &state.pool,
-            &state.api_semaphore,
-        )
-        .await?
+    for file in crate::state::instances::commands::list_project_files(
+        &metadata.instance.id,
+        &state,
+    )
+    .await?
     {
-        if let Some(metadata) = &project.metadata
-            && to_remove.contains(&metadata.project_id)
+        if let Some(project_id) = &file.project_id
+            && to_remove.contains(project_id)
         {
-            match io::remove_file(profile_full_path.join(file_path)).await {
-                Ok(_) => (),
-                Err(err) if err.kind() == ErrorKind::NotFound => (),
-                Err(err) => return Err(err.into()),
-            }
+            crate::state::instances::commands::remove_project(
+                &metadata.instance.id,
+                &file.relative_path,
+                &state,
+            )
+            .await?;
         }
     }
 
     // Iterate over all Modrinth project file paths in the json, and remove them
     // (There should be few, but this removes any files the .mrpack intended as Modrinth projects but were unrecognized)
     for file in pack.files {
-        match io::remove_file(profile_full_path.join(file.path.as_str())).await
+        match io::remove_file(instance_full_path.join(file.path.as_str())).await
         {
             Ok(_) => (),
             Err(err) if err.kind() == ErrorKind::NotFound => (),
@@ -672,9 +737,7 @@ pub async fn remove_all_related_files(
 
         // Remove this file if a corresponding one exists in the filesystem
         match io::remove_file(
-            profile::get_full_path(&profile_path)
-                .await?
-                .join(relative_override_file_path.as_str()),
+            instance_full_path.join(relative_override_file_path.as_str()),
         )
         .await
         {
diff --git a/packages/app-lib/src/api/process.rs b/packages/app-lib/src/api/process.rs
index 2871c0709b..fdb827d3be 100644
--- a/packages/app-lib/src/api/process.rs
+++ b/packages/app-lib/src/api/process.rs
@@ -3,11 +3,11 @@
 use crate::state::ProcessMetadata;
 pub use crate::{
     State,
-    state::{Hooks, MemorySettings, Profile, Settings, WindowSize},
+    state::{Hooks, MemorySettings, Settings, WindowSize},
 };
 use uuid::Uuid;
 
-// Gets the Profile paths of each *running* stored process in the state
+// Gets each running stored process in the state
 #[tracing::instrument]
 pub async fn get_all() -> crate::Result<Vec<ProcessMetadata>> {
     let state = State::get().await?;
@@ -15,17 +15,50 @@ pub async fn get_all() -> crate::Result<Vec<ProcessMetadata>> {
     Ok(processes)
 }
 
-// Gets the UUID of each stored process in the state by profile path
+pub async fn resolve_instance_id(instance: &str) -> crate::Result<String> {
+    let state = State::get().await?;
+    resolve_instance_id_with_state(instance, &state)
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError(format!(
+                "Unknown instance id or path: {instance}"
+            ))
+            .as_error()
+        })
+}
+
+async fn resolve_instance_id_with_state(
+    instance: &str,
+    state: &State,
+) -> crate::Result<Option<String>> {
+    sqlx::query_scalar::<_, String>(
+        "
+		SELECT id
+		FROM instances
+		WHERE id = ? OR path = ?
+		ORDER BY CASE WHEN id = ? THEN 0 ELSE 1 END
+		LIMIT 1
+		",
+    )
+    .bind(instance)
+    .bind(instance)
+    .bind(instance)
+    .fetch_optional(&state.pool)
+    .await
+    .map_err(Into::into)
+}
+
+// Gets the UUID of each stored process in the state by instance id
 #[tracing::instrument]
-pub async fn get_by_profile_path(
-    profile_path: &str,
+pub async fn get_by_instance_id(
+    instance_id: &str,
 ) -> crate::Result<Vec<ProcessMetadata>> {
     let state = State::get().await?;
     let processes = state
         .process_manager
         .get_all()
         .into_iter()
-        .filter(|x| x.profile_path == profile_path)
+        .filter(|x| x.instance_id == instance_id)
         .collect();
     Ok(processes)
 }
diff --git a/packages/app-lib/src/api/profile/create.rs b/packages/app-lib/src/api/profile/create.rs
deleted file mode 100644
index c1a1491c1b..0000000000
--- a/packages/app-lib/src/api/profile/create.rs
+++ /dev/null
@@ -1,230 +0,0 @@
-//! Theseus profile management interface
-use crate::launcher::get_loader_version_from_profile;
-use crate::settings::Hooks;
-use crate::state::{
-    LauncherFeatureVersion, LinkedData, ProfileInstallStage, ReleaseChannel,
-};
-use crate::util::io::{self, canonicalize};
-use crate::{ErrorKind, pack, profile};
-pub use crate::{State, state::Profile};
-use crate::{
-    event::{ProfilePayloadType, emit::emit_profile},
-    prelude::ModLoader,
-};
-use chrono::Utc;
-use std::path::PathBuf;
-use tracing::{info, trace};
-
-// Creates a profile of a given name and adds it to the in-memory state
-// Returns relative filepath as ProfilePathId which can be used to access it in the State
-#[tracing::instrument]
-#[allow(clippy::too_many_arguments)]
-pub async fn profile_create(
-    name: String,         // the name of the profile, and relative path
-    game_version: String, // the game version of the profile
-    modloader: ModLoader, // the modloader to use
-    loader_version: Option<String>, // the modloader version to use, set to "latest", "stable", or the ID of your chosen loader. defaults to latest
-    icon_path: Option<String>,      // the icon for the profile
-    linked_data: Option<LinkedData>, // the linked project ID (mainly for modpacks)- used for updating
-    skip_install_profile: Option<bool>,
-) -> crate::Result<String> {
-    trace!("Creating new profile. {}", name);
-    let state = State::get().await?;
-
-    let mut path = profile::sanitize_profile_name(&name);
-    let mut full_path = state.directories.profiles_dir().join(&path);
-    if full_path.exists() {
-        let mut new_path;
-        let mut new_full_path;
-        let mut which = 1;
-
-        loop {
-            new_path = format!("{path} ({which})");
-            new_full_path = state.directories.profiles_dir().join(&new_path);
-            if !new_full_path.exists() {
-                break;
-            }
-            which += 1;
-        }
-
-        tracing::debug!(
-            "Folder collision: {}, renaming to: {}",
-            full_path.display(),
-            new_full_path.display()
-        );
-
-        path = new_path;
-        full_path = new_full_path;
-    }
-    io::create_dir_all(&full_path).await?;
-
-    info!(
-        "Creating profile at path {}",
-        &canonicalize(&full_path)?.display()
-    );
-    let loader = if modloader != ModLoader::Vanilla {
-        get_loader_version_from_profile(
-            &game_version,
-            modloader,
-            loader_version.as_deref(),
-        )
-        .await?
-    } else {
-        None
-    };
-
-    let mut profile = Profile {
-        path: path.clone(),
-        install_stage: ProfileInstallStage::NotInstalled,
-        launcher_feature_version: LauncherFeatureVersion::MOST_RECENT,
-        name,
-        icon_path: None,
-        game_version,
-        protocol_version: None,
-        loader: modloader,
-        loader_version: loader.map(|x| x.id),
-        groups: Vec::new(),
-        linked_data,
-        preferred_update_channel: ReleaseChannel::Release,
-        created: Utc::now(),
-        modified: Utc::now(),
-        last_played: None,
-        submitted_time_played: 0,
-        recent_time_played: 0,
-        java_path: None,
-        extra_launch_args: None,
-        custom_env_vars: None,
-        memory: None,
-        force_fullscreen: None,
-        game_resolution: None,
-        hooks: Hooks {
-            pre_launch: None,
-            wrapper: None,
-            post_exit: None,
-        },
-    };
-
-    let result = async {
-        if let Some(ref icon) = icon_path {
-            let (bytes, file_name) = if icon.starts_with("https://")
-                || icon.starts_with("http://")
-            {
-                let fetched = crate::util::fetch::fetch(
-                    icon,
-                    None,
-                    None,
-                    None,
-                    &state.fetch_semaphore,
-                    &state.pool,
-                )
-                .await?;
-                let name =
-                    icon.rsplit('/').next().unwrap_or("icon").to_string();
-                (fetched, name)
-            } else {
-                let data =
-                    io::read(state.directories.caches_dir().join(icon)).await?;
-                (bytes::Bytes::from(data), icon.clone())
-            };
-            profile
-                .set_icon(
-                    &state.directories.caches_dir(),
-                    &state.io_semaphore,
-                    bytes,
-                    &file_name,
-                )
-                .await?;
-        }
-
-        crate::state::fs_watcher::watch_profile(
-            &profile.path,
-            &state.file_watcher,
-            &state.directories,
-        )
-        .await;
-
-        profile.upsert(&state.pool).await?;
-
-        emit_profile(&profile.path, ProfilePayloadType::Created).await?;
-
-        if !skip_install_profile.unwrap_or(false) {
-            crate::launcher::install_minecraft(&profile, None, false).await?;
-        }
-
-        Ok(profile.path)
-    }
-    .await;
-
-    match result {
-        Ok(profile) => Ok(profile),
-        Err(err) => {
-            let _ = profile::remove(&path).await;
-
-            Err(err)
-        }
-    }
-}
-
-pub async fn profile_create_from_duplicate(
-    copy_from: &str,
-) -> crate::Result<String> {
-    // Original profile
-    let profile = profile::get(copy_from).await?.ok_or_else(|| {
-        ErrorKind::UnmanagedProfileError(copy_from.to_string())
-    })?;
-
-    let profile_path_id = profile_create(
-        profile.name.clone(),
-        profile.game_version.clone(),
-        profile.loader,
-        profile.loader_version.clone(),
-        profile.icon_path.clone(),
-        profile.linked_data.clone(),
-        Some(true),
-    )
-    .await?;
-
-    // Copy it over using the import system (essentially importing from the same profile)
-    let state = State::get().await?;
-    let bar = pack::import::copy_dotminecraft(
-        &profile_path_id,
-        profile::get_full_path(copy_from).await?,
-        &state.io_semaphore,
-        None,
-    )
-    .await?;
-
-    let duplicated_profile =
-        profile::get(&profile_path_id).await?.ok_or_else(|| {
-            ErrorKind::UnmanagedProfileError(profile_path_id.to_string())
-        })?;
-
-    crate::launcher::install_minecraft(&duplicated_profile, Some(bar), false)
-        .await?;
-
-    // emit profile edited
-    emit_profile(&profile.path, ProfilePayloadType::Edited).await?;
-    Ok(profile_path_id)
-}
-
-#[derive(thiserror::Error, Debug)]
-pub enum ProfileCreationError {
-    #[error("Profile .json exists: {0}")]
-    ProfileExistsError(PathBuf),
-    #[error("Modloader {0} unsupported for Minecraft version {1}")]
-    ModloaderUnsupported(String, String),
-    #[error("Invalid version {0} for modloader {1}")]
-    InvalidVersionModloader(String, String),
-    #[error("Could not get manifest for loader {0}. This is a bug in the GUI")]
-    NoManifest(String),
-    #[error("Could not get State.")]
-    NoState,
-
-    #[error("Attempted to create project in something other than a folder.")]
-    NotFolder,
-    #[error("You are trying to create a profile in a non-empty directory")]
-    NotEmptyFolder,
-
-    #[error("IO error: {0}")]
-    IOError(#[from] std::io::Error),
-}
diff --git a/packages/app-lib/src/api/profile/mod.rs b/packages/app-lib/src/api/profile/mod.rs
deleted file mode 100644
index a7f2f113ac..0000000000
--- a/packages/app-lib/src/api/profile/mod.rs
+++ /dev/null
@@ -1,1186 +0,0 @@
-//! Theseus profile management interface
-
-use crate::event::LoadingBarType;
-use crate::event::emit::{
-    emit_loading, init_loading, loading_try_for_each_concurrent,
-};
-use crate::pack::install_from::{
-    EnvType, PackDependency, PackFile, PackFileHash, PackFormat,
-};
-use crate::state::{
-    CacheBehaviour, CachedEntry, ContentItem, Credentials, Dependency,
-    JavaVersion, LinkedModpackInfo, ProcessMetadata, ProfileFile,
-    ProfileInstallStage, ProjectType, SideType,
-};
-
-use crate::event::{ProfilePayloadType, emit::emit_profile};
-use crate::util::fetch;
-use crate::util::io::{self, IOError};
-pub use crate::{State, state::Profile};
-use async_zip::tokio::write::ZipFileWriter;
-use async_zip::{Compression, ZipEntryBuilder};
-use path_util::SafeRelativeUtf8UnixPathBuf;
-use serde_json::json;
-use tracing::{info, warn};
-
-use std::collections::{HashMap, HashSet};
-use std::time::Duration;
-
-use crate::data::Settings;
-use crate::server_address::ServerAddress;
-use dashmap::DashMap;
-use std::iter::FromIterator;
-use std::{
-    future::Future,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use tokio::io::AsyncReadExt;
-use tokio::{fs::File, process::Command, sync::RwLock};
-
-pub mod create;
-pub mod update;
-
-#[derive(Debug, Clone)]
-pub enum QuickPlayType {
-    None,
-    Singleplayer(String),
-    Server(ServerAddress),
-}
-
-/// Remove a profile
-#[tracing::instrument]
-pub async fn remove(path: &str) -> crate::Result<()> {
-    let state = State::get().await?;
-    Profile::remove(path, &state.pool).await?;
-
-    emit_profile(path, ProfilePayloadType::Removed).await?;
-
-    Ok(())
-}
-
-/// Get a profile by relative path (or, name)
-#[tracing::instrument]
-pub async fn get(path: &str) -> crate::Result<Option<Profile>> {
-    let state = State::get().await?;
-    let profile = Profile::get(path, &state.pool).await?;
-
-    Ok(profile)
-}
-
-#[tracing::instrument]
-pub async fn get_many(paths: &[&str]) -> crate::Result<Vec<Profile>> {
-    let state = State::get().await?;
-    let profiles = Profile::get_many(paths, &state.pool).await?;
-    Ok(profiles)
-}
-
-#[tracing::instrument]
-pub async fn get_projects(
-    path: &str,
-    cache_behaviour: Option<CacheBehaviour>,
-) -> crate::Result<DashMap<String, ProfileFile>> {
-    let state = State::get().await?;
-
-    if let Some(profile) = get(path).await? {
-        let files = profile
-            .get_projects(cache_behaviour, &state.pool, &state.api_semaphore)
-            .await?;
-
-        Ok(files)
-    } else {
-        Err(crate::ErrorKind::UnmanagedProfileError(path.to_string())
-            .as_error())
-    }
-}
-
-#[tracing::instrument]
-pub async fn get_installed_project_ids(
-    path: &str,
-) -> crate::Result<Vec<String>> {
-    let state = State::get().await?;
-
-    if let Some(profile) = get(path).await? {
-        let ids = profile
-            .get_installed_project_ids(&state.pool, &state.api_semaphore)
-            .await?;
-        Ok(ids)
-    } else {
-        Err(crate::ErrorKind::UnmanagedProfileError(path.to_string())
-            .as_error())
-    }
-}
-
-/// Get content items with rich metadata for a profile
-///
-/// Returns content items filtered to exclude modpack files (if linked),
-/// sorted alphabetically by project name.
-#[tracing::instrument]
-pub async fn get_content_items(
-    path: &str,
-    cache_behaviour: Option<CacheBehaviour>,
-) -> crate::Result<Vec<ContentItem>> {
-    let state = State::get().await?;
-
-    if let Some(profile) = get(path).await? {
-        let items = crate::state::get_content_items(
-            &profile,
-            cache_behaviour,
-            &state.pool,
-            &state.api_semaphore,
-        )
-        .await?;
-        Ok(items)
-    } else {
-        Err(crate::ErrorKind::UnmanagedProfileError(path.to_string())
-            .as_error())
-    }
-}
-
-/// Get content items that are part of the linked modpack
-///
-/// Returns the modpack's dependencies as ContentItem list.
-/// Returns empty vec if the profile is not linked to a modpack.
-#[tracing::instrument]
-pub async fn get_linked_modpack_content(
-    path: &str,
-    cache_behaviour: Option<CacheBehaviour>,
-) -> crate::Result<Vec<ContentItem>> {
-    let state = State::get().await?;
-
-    if let Some(profile) = get(path).await? {
-        let items = crate::state::get_linked_modpack_content(
-            &profile,
-            cache_behaviour,
-            &state.pool,
-            &state.api_semaphore,
-        )
-        .await?;
-        Ok(items)
-    } else {
-        Err(crate::ErrorKind::UnmanagedProfileError(path.to_string())
-            .as_error())
-    }
-}
-
-/// Convert a list of dependencies into ContentItems with rich metadata
-#[tracing::instrument]
-pub async fn get_dependencies_as_content_items(
-    dependencies: Vec<Dependency>,
-    cache_behaviour: Option<CacheBehaviour>,
-) -> crate::Result<Vec<ContentItem>> {
-    let state = State::get().await?;
-
-    let items = crate::state::dependencies_to_content_items(
-        &dependencies,
-        cache_behaviour,
-        &state.pool,
-        &state.api_semaphore,
-    )
-    .await?;
-    Ok(items)
-}
-
-/// Get linked modpack info for a profile
-///
-/// Returns project, version, and owner information for the linked modpack,
-/// or None if the profile is not linked to a modpack.
-#[tracing::instrument]
-pub async fn get_linked_modpack_info(
-    path: &str,
-    cache_behaviour: Option<CacheBehaviour>,
-) -> crate::Result<Option<LinkedModpackInfo>> {
-    let state = State::get().await?;
-
-    if let Some(profile) = get(path).await? {
-        let info = crate::state::get_linked_modpack_info(
-            &profile,
-            cache_behaviour,
-            &state.pool,
-            &state.api_semaphore,
-        )
-        .await?;
-        Ok(info)
-    } else {
-        Err(crate::ErrorKind::UnmanagedProfileError(path.to_string())
-            .as_error())
-    }
-}
-
-/// Get profile's full path in the filesystem
-#[tracing::instrument]
-pub async fn get_full_path(path: &str) -> crate::Result<PathBuf> {
-    let state = State::get().await?;
-    let profiles_dir = state.directories.profiles_dir();
-
-    let full_path = io::canonicalize(profiles_dir.join(path))?;
-    Ok(full_path)
-}
-
-/// Get mod's full path in the filesystem
-#[tracing::instrument]
-pub async fn get_mod_full_path(
-    profile_path: &str,
-    project_path: &str,
-) -> crate::Result<PathBuf> {
-    let path = get_full_path(profile_path).await?;
-
-    Ok(path.join(project_path))
-}
-
-/// Edit a profile using a given asynchronous closure
-pub async fn edit<Fut>(
-    path: &str,
-    action: impl Fn(&mut Profile) -> Fut,
-) -> crate::Result<()>
-where
-    Fut: Future<Output = crate::Result<()>>,
-{
-    let state = State::get().await?;
-
-    if let Some(mut profile) = get(path).await? {
-        action(&mut profile).await?;
-        profile.upsert(&state.pool).await?;
-
-        emit_profile(path, ProfilePayloadType::Edited).await?;
-
-        Ok(())
-    } else {
-        Err(crate::ErrorKind::UnmanagedProfileError(path.to_string())
-            .as_error())
-    }
-}
-
-/// Edits a profile's icon
-pub async fn edit_icon(
-    path: &str,
-    icon_path: Option<&Path>,
-) -> crate::Result<()> {
-    let state = State::get().await?;
-
-    if let Some(mut profile) = get(path).await? {
-        if let Some(icon) = icon_path {
-            let bytes = io::read(icon).await?;
-
-            profile
-                .set_icon(
-                    &state.directories.caches_dir(),
-                    &state.io_semaphore,
-                    bytes::Bytes::from(bytes),
-                    &icon.to_string_lossy(),
-                )
-                .await?;
-        } else {
-            profile.icon_path = None;
-        }
-
-        profile.upsert(&state.pool).await?;
-
-        emit_profile(path, ProfilePayloadType::Edited).await?;
-
-        Ok(())
-    } else {
-        Err(crate::ErrorKind::UnmanagedProfileError(path.to_string())
-            .as_error())
-    }
-}
-
-// Gets the optimal JRE key for the given profile, using Daedalus
-// Generally this would be used for profile_create, to get the optimal JRE key
-// this can be overwritten by the user a profile-by-profile basis
-pub async fn get_optimal_jre_key(
-    path: &str,
-) -> crate::Result<Option<JavaVersion>> {
-    let state = State::get().await?;
-
-    if let Some(profile) = get(path).await? {
-        let (minecraft, version_index) =
-            crate::launcher::resolve_minecraft_manifest(
-                &profile.game_version,
-                &state,
-            )
-            .await?;
-        let version = &minecraft.versions[version_index];
-
-        let loader_version = crate::launcher::get_loader_version_from_profile(
-            &profile.game_version,
-            profile.loader,
-            profile.loader_version.as_deref(),
-        )
-        .await?;
-
-        // Get detailed manifest info from Daedalus
-        let version_info = crate::launcher::download::download_version_info(
-            &state,
-            version,
-            loader_version.as_ref(),
-            None,
-            None,
-        )
-        .await?;
-
-        let version = crate::launcher::get_java_version_from_profile(
-            &profile,
-            &version_info,
-        )
-        .await?;
-
-        Ok(version)
-    } else {
-        Err(crate::ErrorKind::UnmanagedProfileError(path.to_string())
-            .as_error())
-    }
-}
-
-/// Get a copy of the profile set
-#[tracing::instrument]
-pub async fn list() -> crate::Result<Vec<Profile>> {
-    let state = State::get().await?;
-    let profiles = Profile::get_all(&state.pool).await?;
-    Ok(profiles)
-}
-
-/// Installs/Repairs a profile
-#[tracing::instrument]
-pub async fn install(path: &str, force: bool) -> crate::Result<()> {
-    if let Some(profile) = get(path).await? {
-        let result =
-            crate::launcher::install_minecraft(&profile, None, force).await;
-        if result.is_err() {
-            // Re-read the profile to get the current install_stage, as
-            // install_minecraft may have changed it (e.g. to MinecraftInstalling)
-            let current_stage = get(path)
-                .await
-                .ok()
-                .flatten()
-                .map(|p| p.install_stage)
-                .unwrap_or(ProfileInstallStage::NotInstalled);
-            if current_stage != ProfileInstallStage::Installed {
-                edit(path, |prof| {
-                    prof.install_stage = ProfileInstallStage::NotInstalled;
-                    async { Ok(()) }
-                })
-                .await?;
-            }
-        }
-        result?;
-    } else {
-        return Err(crate::ErrorKind::UnmanagedProfileError(path.to_string())
-            .as_error());
-    }
-    Ok(())
-}
-
-#[tracing::instrument]
-pub async fn update_all_projects(
-    profile_path: &str,
-) -> crate::Result<HashMap<String, String>> {
-    if let Some(profile) = get(profile_path).await? {
-        let loading_bar = init_loading(
-            LoadingBarType::ProfileUpdate {
-                profile_path: profile.path.clone(),
-                profile_name: profile.name.clone(),
-            },
-            100.0,
-            "Updating profile",
-        )
-        .await?;
-
-        let state = State::get().await?;
-        let keys = profile
-            .get_projects(
-                Some(CacheBehaviour::MustRevalidate),
-                &state.pool,
-                &state.api_semaphore,
-            )
-            .await?
-            .into_iter()
-            .filter(|(_, project)| project.update_version_id.is_some())
-            .map(|x| x.0)
-            .collect::<Vec<_>>();
-        let len = keys.len();
-
-        let map = Arc::new(RwLock::new(HashMap::new()));
-
-        use futures::StreamExt;
-        loading_try_for_each_concurrent(
-            futures::stream::iter(keys).map(Ok::<String, crate::Error>),
-            None,
-            Some(&loading_bar),
-            100.0,
-            len,
-            None,
-            |project| async {
-                let map = map.clone();
-
-                async move {
-                    let new_path =
-                        update_project(profile_path, &project, Some(true))
-                            .await?;
-
-                    map.write().await.insert(project, new_path);
-
-                    Ok(())
-                }
-                .await
-            },
-        )
-        .await?;
-
-        emit_profile(profile_path, ProfilePayloadType::Edited).await?;
-
-        Ok(Arc::try_unwrap(map).unwrap().into_inner())
-    } else {
-        Err(
-            crate::ErrorKind::UnmanagedProfileError(profile_path.to_string())
-                .as_error(),
-        )
-    }
-}
-
-/// Updates a project to the latest version
-/// Uses and returns the relative path to the project
-#[tracing::instrument]
-pub async fn update_project(
-    profile_path: &str,
-    project_path: &str,
-    skip_send_event: Option<bool>,
-) -> crate::Result<String> {
-    if let Some(profile) = get(profile_path).await? {
-        let state = State::get().await?;
-        if let Some((_, file)) = profile
-            .get_projects(
-                Some(CacheBehaviour::MustRevalidate),
-                &state.pool,
-                &state.api_semaphore,
-            )
-            .await?
-            .remove(project_path)
-            && let Some(update_version) = &file.update_version_id
-        {
-            let mut path = Profile::add_project_version(
-                profile_path,
-                update_version,
-                fetch::DownloadReason::Update,
-                None,
-                &state.pool,
-                &state.fetch_semaphore,
-                &state.io_semaphore,
-            )
-            .await?;
-
-            if project_path.ends_with(".disabled") {
-                path = Profile::toggle_disable_project(profile_path, &path)
-                    .await?;
-            }
-
-            if path != project_path {
-                Profile::remove_project(profile_path, project_path).await?;
-            }
-
-            if !skip_send_event.unwrap_or(false) {
-                emit_profile(profile_path, ProfilePayloadType::Edited).await?;
-            }
-
-            return Ok(path);
-        }
-
-        Err(crate::ErrorKind::InputError(
-            "This project cannot be updated!".to_string(),
-        )
-        .as_error())
-    } else {
-        Err(
-            crate::ErrorKind::UnmanagedProfileError(profile_path.to_string())
-                .as_error(),
-        )
-    }
-}
-
-/// Add a project from a version
-/// Returns the relative path to the project as a ProjectPathId
-#[tracing::instrument]
-pub async fn add_project_from_version(
-    profile_path: &str,
-    version_id: &str,
-    reason: fetch::DownloadReason,
-    dependent_on_version_id: Option<String>,
-) -> crate::Result<String> {
-    let state = State::get().await?;
-
-    let project_path = Profile::add_project_version(
-        profile_path,
-        version_id,
-        reason,
-        dependent_on_version_id,
-        &state.pool,
-        &state.fetch_semaphore,
-        &state.io_semaphore,
-    )
-    .await?;
-
-    emit_profile(profile_path, ProfilePayloadType::Edited).await?;
-
-    Ok(project_path)
-}
-
-/// Add a project from an FS path
-/// Uses and returns the relative path to the project as a ProjectPathId
-#[tracing::instrument]
-pub async fn add_project_from_path(
-    profile_path: &str,
-    path: &Path,
-    project_type: Option<ProjectType>,
-) -> crate::Result<String> {
-    let state = State::get().await?;
-
-    let file = io::read(path).await?;
-    let file_name = path
-        .file_name()
-        .unwrap_or_default()
-        .to_string_lossy()
-        .to_string();
-
-    let path = Profile::add_project_bytes(
-        profile_path,
-        &file_name,
-        bytes::Bytes::from(file),
-        None,
-        project_type,
-        None,
-        &state.io_semaphore,
-        &state.pool,
-    )
-    .await?;
-
-    Ok(path)
-}
-
-/// Toggle whether a project is disabled or not
-/// Project path should be relative to the profile
-/// returns the new state, relative to the profile
-#[tracing::instrument]
-pub async fn toggle_disable_project(
-    profile_path: &str,
-    project: &str,
-) -> crate::Result<String> {
-    let res = Profile::toggle_disable_project(profile_path, project).await?;
-
-    emit_profile(profile_path, ProfilePayloadType::Edited).await?;
-
-    Ok(res)
-}
-
-/// Remove a project from a profile
-/// Uses and returns the relative path to the project
-#[tracing::instrument]
-pub async fn remove_project(
-    profile_path: &str,
-    project: &str,
-) -> crate::Result<()> {
-    Profile::remove_project(profile_path, project).await?;
-
-    emit_profile(profile_path, ProfilePayloadType::Edited).await?;
-
-    Ok(())
-}
-
-/// Exports the profile to a Modrinth-formatted .mrpack file
-// Version ID of uploaded version (ie 1.1.5), not the unique identifying ID of the version (nvrqJg44)
-#[tracing::instrument(skip_all)]
-pub async fn export_mrpack(
-    profile_path: &str,
-    export_path: PathBuf,
-    included_export_candidates: Vec<String>, // which folders/files to include in the export
-    version_id: Option<String>,
-    description: Option<String>,
-    _name: Option<String>,
-) -> crate::Result<()> {
-    let state = State::get().await?;
-    let _permit: tokio::sync::SemaphorePermit =
-        state.io_semaphore.0.acquire().await?;
-    let profile = get(profile_path).await?.ok_or_else(|| {
-        crate::ErrorKind::OtherError(format!(
-            "Tried to export a nonexistent or unloaded profile at path {profile_path}!"
-        ))
-    })?;
-
-    // remove .DS_Store files from included_export_candidates
-    let included_export_candidates = included_export_candidates
-        .into_iter()
-        .filter(|x| {
-            if let Some(f) = PathBuf::from(x).file_name()
-                && f.to_string_lossy().starts_with(".DS_Store")
-            {
-                return false;
-            }
-            true
-        })
-        .collect::<Vec<_>>();
-
-    let profile_base_path = get_full_path(profile_path).await?;
-
-    let mut file = File::create(&export_path)
-        .await
-        .map_err(|e| IOError::with_path(e, &export_path))?;
-    let mut writer = ZipFileWriter::with_tokio(&mut file);
-
-    // Create mrpack json configuration file
-    let version_id = version_id.unwrap_or("1.0.0".to_string());
-    let mut packfile =
-        create_mrpack_json(&profile, version_id, description).await?;
-    let included_candidates_set = HashSet::<_>::from_iter(
-        included_export_candidates.iter().map(|x| x.as_str()),
-    );
-    packfile
-        .files
-        .retain(|f| included_candidates_set.contains(f.path.as_str()));
-
-    // Build vec of all files in the folder
-    let mut path_list = Vec::new();
-    add_all_recursive_folder_paths(&profile_base_path, &mut path_list).await?;
-
-    // Initialize loading bar
-    let loading_bar = init_loading(
-        LoadingBarType::ZipExtract {
-            profile_path: profile.path.clone(),
-            profile_name: profile.name.clone(),
-        },
-        path_list.len() as f64,
-        "Exporting profile to .mrpack",
-    )
-    .await?;
-
-    // Iterate over every file in the folder
-    // Every file that is NOT in the config file is added to the zip, in overrides
-    for path in path_list {
-        emit_loading(&loading_bar, 1.0, None)?;
-
-        let relative_path = pack_get_relative_path(&profile_base_path, &path)?;
-
-        if packfile.files.iter().any(|f| f.path == relative_path)
-            || !included_candidates_set
-                .iter()
-                .any(|x| relative_path.starts_with(&**x))
-        {
-            continue;
-        }
-
-        // File is not in the config file, add it to the .mrpack zip
-        if path.is_file() && is_path_exportable(&relative_path) {
-            let mut file = File::open(&path)
-                .await
-                .map_err(|e| IOError::with_path(e, &path))?;
-            let mut data = Vec::new();
-            file.read_to_end(&mut data)
-                .await
-                .map_err(|e| IOError::with_path(e, &path))?;
-            let builder = ZipEntryBuilder::new(
-                format!("overrides/{relative_path}").into(),
-                Compression::Deflate,
-            );
-            writer.write_entry_whole(builder, &data).await?;
-        }
-    }
-
-    // Add modrinth json to the zip
-    let data = serde_json::to_vec_pretty(&packfile)?;
-    let builder = ZipEntryBuilder::new(
-        "modrinth.index.json".to_string().into(),
-        Compression::Deflate,
-    );
-    writer.write_entry_whole(builder, &data).await?;
-
-    writer.close().await?;
-
-    Ok(())
-}
-
-fn is_path_exportable(relative_path: &SafeRelativeUtf8UnixPathBuf) -> bool {
-    if relative_path.ends_with(".DS_Store") {
-        return false;
-    }
-
-    if relative_path.starts_with("mods/.connector/")
-        || relative_path.starts_with(".sable/natives/")
-        || relative_path.starts_with("local/crash_assistant/")
-        || relative_path.starts_with("mods/mcef-libraries/")
-        || relative_path.starts_with("mods/mcef-cache/")
-        || relative_path.starts_with("config/super_resolution/libraries/")
-        || relative_path.starts_with("config/Veinminer/update/")
-        || relative_path.starts_with("config/epicfight/native/")
-        || relative_path.starts_with("essential/")
-        || relative_path.starts_with(".mixin.out/")
-        || relative_path.starts_with(".fabric/")
-        || relative_path.starts_with("__MACOSX/")
-    {
-        return false;
-    }
-
-    true
-}
-
-// Given a folder path, populate a Vec of all the subfolders and files, at most 2 layers deep
-// profile
-// -- folder1
-// -- folder2
-//    -- innerfolder
-//       -- innerfile
-//    -- folder2file
-// -- file1
-// => [folder1, folder2/innerfolder, folder2/folder2file, file1]
-#[tracing::instrument]
-pub async fn get_pack_export_candidates(
-    profile_path: &str,
-) -> crate::Result<Vec<SafeRelativeUtf8UnixPathBuf>> {
-    let mut path_list = Vec::new();
-
-    let profile_base_dir = get_full_path(profile_path).await?;
-    let mut read_dir = io::read_dir(&profile_base_dir).await?;
-    while let Some(entry) = read_dir
-        .next_entry()
-        .await
-        .map_err(|e| IOError::with_path(e, &profile_base_dir))?
-    {
-        let path = entry.path();
-        if path.is_dir() {
-            // Two layers of files/folders if its a folder
-            let mut read_dir = io::read_dir(&path).await?;
-            while let Some(entry) = read_dir
-                .next_entry()
-                .await
-                .map_err(|e| IOError::with_path(e, &profile_base_dir))?
-            {
-                let relative =
-                    pack_get_relative_path(&profile_base_dir, &entry.path())?;
-                if !is_path_exportable(&relative) {
-                    continue;
-                }
-                path_list.push(relative);
-            }
-        } else {
-            // One layer of files/folders if its a file
-            let relative = pack_get_relative_path(&profile_base_dir, &path)?;
-            if !is_path_exportable(&relative) {
-                continue;
-            }
-            path_list.push(relative);
-        }
-    }
-    Ok(path_list)
-}
-
-fn pack_get_relative_path(
-    profile_path: &PathBuf,
-    path: &PathBuf,
-) -> crate::Result<SafeRelativeUtf8UnixPathBuf> {
-    Ok(SafeRelativeUtf8UnixPathBuf::try_from(
-        path.strip_prefix(profile_path)
-            .map_err(|_| {
-                crate::ErrorKind::FSError(format!(
-                    "Path {path:?} does not correspond to a profile"
-                ))
-            })?
-            .components()
-            .map(|c| c.as_os_str().to_string_lossy())
-            .collect::<Vec<_>>()
-            .join("/"),
-    )?)
-}
-
-/// Run Minecraft using a profile and the default credentials, logged in credentials,
-/// failing with an error if no credentials are available
-#[tracing::instrument]
-pub async fn run(
-    path: &str,
-    quick_play_type: QuickPlayType,
-) -> crate::Result<ProcessMetadata> {
-    let state = State::get().await?;
-
-    let default_account = Credentials::get_default_credential(&state.pool)
-        .await?
-        .ok_or_else(|| crate::ErrorKind::NoCredentialsError.as_error())?;
-
-    run_credentials(path, &default_account, quick_play_type).await
-}
-
-/// Run Minecraft using a profile, and credentials for authentication
-#[tracing::instrument(skip(credentials))]
-async fn run_credentials(
-    path: &str,
-    credentials: &Credentials,
-    quick_play_type: QuickPlayType,
-) -> crate::Result<ProcessMetadata> {
-    let state = State::get().await?;
-    let settings = Settings::get(&state.pool).await?;
-    let profile = get(path).await?.ok_or_else(|| {
-        crate::ErrorKind::OtherError(format!(
-            "Tried to run a nonexistent or unloaded profile at path {path}!"
-        ))
-    })?;
-
-    let pre_launch_hooks = profile
-        .hooks
-        .pre_launch
-        .as_ref()
-        .or(settings.hooks.pre_launch.as_ref())
-        .filter(|hook_command| !hook_command.is_empty());
-    if let Some(hook) = pre_launch_hooks {
-        // TODO: hook parameters
-        let mut cmd = shlex::split(hook)
-            .ok_or_else(|| {
-                crate::ErrorKind::LauncherError(format!(
-                    "Invalid pre-launch command: {hook}",
-                ))
-            })?
-            .into_iter();
-
-        if let Some(command) = cmd.next() {
-            let full_path = get_full_path(&profile.path).await?;
-            let result = Command::new(command)
-                .args(cmd)
-                .current_dir(&full_path)
-                .spawn()
-                .map_err(|e| IOError::with_path(e, &full_path))?
-                .wait()
-                .await
-                .map_err(IOError::from)?;
-
-            if !result.success() {
-                return Err(crate::ErrorKind::LauncherError(format!(
-                    "Non-zero exit code for pre-launch hook: {}",
-                    result.code().unwrap_or(-1)
-                ))
-                .as_error());
-            }
-        }
-    }
-
-    let java_args = profile
-        .extra_launch_args
-        .clone()
-        .unwrap_or(settings.extra_launch_args);
-
-    let wrapper = profile
-        .hooks
-        .wrapper
-        .clone()
-        .or(settings.hooks.wrapper)
-        .filter(|hook_command| !hook_command.is_empty());
-
-    let memory = profile.memory.unwrap_or(settings.memory);
-    let resolution =
-        profile.game_resolution.unwrap_or(settings.game_resolution);
-
-    let env_args = profile
-        .custom_env_vars
-        .clone()
-        .unwrap_or(settings.custom_env_vars);
-
-    // Post post exit hooks
-    let post_exit_hook = profile
-        .hooks
-        .post_exit
-        .clone()
-        .or(settings.hooks.post_exit)
-        .filter(|hook_command| !hook_command.is_empty());
-
-    // Any options.txt settings that we want set, add here
-    let mut mc_set_options: Vec<(String, String)> = vec![];
-    if let Some(fullscreen) = profile.force_fullscreen {
-        // Profile fullscreen setting takes priority
-        mc_set_options.push(("fullscreen".to_string(), fullscreen.to_string()));
-    } else if settings.force_fullscreen {
-        // If global settings wants to force a fullscreen, do it
-        mc_set_options.push(("fullscreen".to_string(), "true".to_string()));
-    }
-
-    // For server projects: track this play in analytics
-    if let Some(linked_data) = &profile.linked_data {
-        let project_id = &linked_data.project_id;
-        if !project_id.trim().is_empty() {
-            let server_id = uuid::Uuid::new_v4().to_string();
-
-            let join_result = fetch::INSECURE_REQWEST_CLIENT
-                .post("https://sessionserver.mojang.com/session/minecraft/join")
-                .json(&json!({
-                    "accessToken": &credentials.access_token,
-                    "selectedProfile": credentials.offline_profile.id.simple().to_string(),
-                    "serverId": &server_id,
-                }))
-                .timeout(Duration::from_secs(5))
-                .send()
-                .await;
-
-            match join_result {
-                Ok(resp) if resp.status().is_success() => {
-                    let result = fetch::post_json(
-                        concat!(
-                            env!("MODRINTH_API_BASE_URL"),
-                            "analytics/minecraft-server-play"
-                        ),
-                        json!({
-                            "project_id": &linked_data.project_id,
-                            "username": &credentials.offline_profile.name,
-                            "server_id": &server_id,
-                        }),
-                        &state.api_semaphore,
-                        &state.pool,
-                    )
-                    .await;
-
-                    match result {
-                        Ok(()) => {
-                            info!(
-                                "Tracked server play for '{project_id}' in analytics"
-                            )
-                        }
-                        Err(err) => {
-                            warn!("Failed to report server play: {err:?}")
-                        }
-                    }
-                }
-                Ok(resp) => warn!(
-                    "Failed to join Mojang session server: HTTP {}",
-                    resp.status()
-                ),
-                Err(err) => {
-                    warn!("Failed to join Mojang session server: {err:?}")
-                }
-            }
-        }
-    }
-
-    crate::minecraft_skins::flush_pending_skin_change().await?;
-
-    crate::launcher::launch_minecraft(
-        &java_args,
-        &env_args,
-        &mc_set_options,
-        &wrapper,
-        &memory,
-        &resolution,
-        credentials,
-        post_exit_hook,
-        &profile,
-        quick_play_type,
-    )
-    .await
-}
-
-pub async fn kill(path: &str) -> crate::Result<()> {
-    let state = State::get().await?;
-    let processes = crate::api::process::get_by_profile_path(path).await?;
-
-    for process in processes {
-        state.process_manager.kill(process.uuid).await?;
-    }
-
-    Ok(())
-}
-
-/// Update playtime- sending a request to the server to update the playtime
-#[tracing::instrument]
-pub async fn try_update_playtime(path: &str) -> crate::Result<()> {
-    let state = State::get().await?;
-
-    let profile = get(path).await?.ok_or_else(|| {
-        crate::ErrorKind::OtherError(format!(
-            "Tried to update playtime for a nonexistent or unloaded profile at path {path}!"
-        ))
-    })?;
-    let updated_recent_playtime = profile.recent_time_played;
-
-    let res = if updated_recent_playtime > 0 {
-        // Create update struct to send to labrinth
-        let modrinth_pack_version_id =
-            profile.linked_data.as_ref().map(|l| l.version_id.clone());
-        let playtime_update_json = json!({
-            "seconds": updated_recent_playtime,
-            "loader": profile.loader.as_str(),
-            "game_version": profile.game_version,
-            "parent": modrinth_pack_version_id,
-        });
-        // Copy this struct for every Modrinth project in the profile
-        let mut hashmap: HashMap<String, serde_json::Value> = HashMap::new();
-
-        for (_, project) in profile
-            .get_projects(None, &state.pool, &state.api_semaphore)
-            .await?
-        {
-            if let Some(metadata) = project.metadata {
-                hashmap
-                    .insert(metadata.version_id, playtime_update_json.clone());
-            }
-        }
-
-        fetch::post_json(
-            concat!(env!("MODRINTH_API_BASE_URL"), "analytics/playtime"),
-            serde_json::to_value(hashmap)?,
-            &state.api_semaphore,
-            &state.pool,
-        )
-        .await
-    } else {
-        Ok(())
-    };
-
-    // If successful, update the profile metadata to match submitted
-    if res.is_ok() {
-        edit(&profile.path, |prof| {
-            prof.submitted_time_played += updated_recent_playtime;
-            prof.recent_time_played = 0;
-
-            async { Ok(()) }
-        })
-        .await?;
-    }
-
-    res
-}
-
-/// Creates a json configuration for a .mrpack zipped file
-// Version ID of uploaded version (ie 1.1.5), not the unique identifying ID of the version (nvrqJg44)
-#[tracing::instrument(skip_all)]
-pub async fn create_mrpack_json(
-    profile: &Profile,
-    version_id: String,
-    description: Option<String>,
-) -> crate::Result<PackFormat> {
-    // Add loader version to dependencies
-    let mut dependencies = HashMap::new();
-    match (profile.loader, profile.loader_version.clone()) {
-        (crate::prelude::ModLoader::Forge, Some(v)) => {
-            dependencies.insert(PackDependency::Forge, v)
-        }
-        (crate::prelude::ModLoader::NeoForge, Some(v)) => {
-            dependencies.insert(PackDependency::NeoForge, v)
-        }
-        (crate::prelude::ModLoader::Fabric, Some(v)) => {
-            dependencies.insert(PackDependency::FabricLoader, v)
-        }
-        (crate::prelude::ModLoader::Quilt, Some(v)) => {
-            dependencies.insert(PackDependency::QuiltLoader, v)
-        }
-        (crate::prelude::ModLoader::Vanilla, _) => None,
-        _ => {
-            return Err(crate::ErrorKind::OtherError(
-                "Loader version mismatch".to_string(),
-            )
-            .into());
-        }
-    };
-    dependencies
-        .insert(PackDependency::Minecraft, profile.game_version.clone());
-
-    let state = State::get().await?;
-    let projects = profile
-        .get_projects(
-            Some(CacheBehaviour::MustRevalidate),
-            &state.pool,
-            &state.api_semaphore,
-        )
-        .await?
-        .into_iter()
-        .filter_map(|(path, file)| match file.metadata {
-            Some(metadata) => Some((path, metadata.version_id)),
-            _ => None,
-        })
-        .collect::<Vec<_>>();
-    let versions = CachedEntry::get_version_many(
-        &projects.iter().map(|x| &*x.1).collect::<Vec<_>>(),
-        None,
-        &state.pool,
-        &state.api_semaphore,
-    )
-    .await?;
-
-    let files = projects
-        .into_iter()
-        .filter_map(|(path, version_id)| {
-            if let Some(version) = versions.iter().find(|x| x.id == version_id)
-            {
-                let mut env = HashMap::new();
-                // TODO: envtype should be a controllable option (in general or at least .mrpack exporting)
-                // For now, assume required.
-                // env.insert(EnvType::Client, project.client_side.clone());
-                // env.insert(EnvType::Server, project.server_side.clone());
-                env.insert(EnvType::Client, SideType::Required);
-                env.insert(EnvType::Server, SideType::Required);
-
-                let Some(primary_file) = version.files.first() else {
-                    return Some(Err(crate::ErrorKind::OtherError(format!(
-                        "No primary file found for mod at: {path}"
-                    ))
-                    .as_error()));
-                };
-
-                let file_size = primary_file.size;
-                let downloads = vec![primary_file.url.clone()];
-                let hashes = primary_file
-                    .hashes
-                    .clone()
-                    .into_iter()
-                    .map(|(h1, h2)| (PackFileHash::from(h1), h2))
-                    .collect();
-
-                Some(Ok(PackFile {
-                    path: match path.try_into() {
-                        Ok(path) => path,
-                        Err(_) => {
-                            return Some(Err(crate::ErrorKind::OtherError(
-                                "Invalid file path in project".into(),
-                            )
-                            .as_error()));
-                        }
-                    },
-                    hashes,
-                    env: Some(env),
-                    downloads,
-                    file_size,
-                }))
-            } else {
-                None
-            }
-        })
-        .collect::<crate::Result<Vec<PackFile>>>()?;
-
-    Ok(PackFormat {
-        game: "minecraft".to_string(),
-        format_version: 1,
-        version_id,
-        name: profile.name.clone(),
-        summary: description,
-        files,
-        dependencies,
-    })
-}
-
-// Given a folder path, populate a Vec of all the files in the folder, recursively
-#[async_recursion::async_recursion]
-pub async fn add_all_recursive_folder_paths(
-    path: &Path,
-    path_list: &mut Vec<PathBuf>,
-) -> crate::Result<()> {
-    let mut read_dir = io::read_dir(path).await?;
-    while let Some(entry) = read_dir
-        .next_entry()
-        .await
-        .map_err(|e| IOError::with_path(e, path))?
-    {
-        let path = entry.path();
-        if path.is_dir() {
-            add_all_recursive_folder_paths(&path, path_list).await?;
-        } else {
-            path_list.push(path);
-        }
-    }
-    Ok(())
-}
-
-pub fn sanitize_profile_name(input: &str) -> String {
-    input.replace(
-        ['/', '\\', '?', '*', ':', '\'', '\"', '|', '<', '>', '!'],
-        "_",
-    )
-}
diff --git a/packages/app-lib/src/api/profile/update.rs b/packages/app-lib/src/api/profile/update.rs
deleted file mode 100644
index fcf74e7c65..0000000000
--- a/packages/app-lib/src/api/profile/update.rs
+++ /dev/null
@@ -1,242 +0,0 @@
-use crate::state::CacheBehaviour;
-use crate::util::fetch::DownloadReason;
-use crate::{
-    LoadingBarType,
-    event::{
-        ProfilePayloadType,
-        emit::{emit_profile, init_loading},
-    },
-    pack::{self, install_from::generate_pack_from_version_id},
-    profile::get,
-    state::ProfileInstallStage,
-};
-use futures::try_join;
-use std::collections::HashSet;
-
-/// Updates a managed modrinth pack to the version specified by new_version_id
-#[tracing::instrument]
-
-pub async fn update_managed_modrinth_version(
-    profile_path: &String,
-    new_version_id: &String,
-) -> crate::Result<()> {
-    let profile = get(profile_path).await?.ok_or_else(|| {
-        crate::ErrorKind::UnmanagedProfileError(profile_path.to_string())
-            .as_error()
-    })?;
-
-    let unmanaged_err = || {
-        crate::ErrorKind::InputError(format!(
-            "Profile at {profile_path} is not a managed modrinth pack, or has been disconnected."
-        ))
-    };
-
-    // Extract modrinth pack information, if appropriate
-    let linked_data = profile.linked_data.as_ref().ok_or_else(unmanaged_err)?;
-
-    // Replace the pack with the new version
-    replace_managed_modrinth(
-        profile_path,
-        &profile,
-        &linked_data.project_id,
-        &linked_data.version_id,
-        Some(new_version_id),
-        true, // switching versions should ignore the lock
-    )
-    .await?;
-
-    emit_profile(profile_path, ProfilePayloadType::Edited).await?;
-
-    Ok(())
-}
-
-/// Repair a managed modrinth pack by 'updating' it to the current version
-#[tracing::instrument]
-
-pub async fn repair_managed_modrinth(profile_path: &str) -> crate::Result<()> {
-    let profile = get(profile_path).await?.ok_or_else(|| {
-        crate::ErrorKind::UnmanagedProfileError(profile_path.to_string())
-            .as_error()
-    })?;
-
-    let unmanaged_err = || {
-        crate::ErrorKind::InputError(format!(
-            "Profile at {profile_path} is not a managed modrinth pack, or has been disconnected."
-        ))
-    };
-
-    // For repairing specifically, first we remove all installed projects (to ensure we do remove ones that aren't in the pack)
-    // We do a project removal followed by removing everything in the .mrpack, to ensure we only
-    // remove relevant projects and not things like save files
-    let state = crate::State::get().await?;
-    let projects_map = profile
-        .get_projects(
-            Some(CacheBehaviour::MustRevalidate),
-            &state.pool,
-            &state.api_semaphore,
-        )
-        .await?;
-
-    for (file, _) in projects_map {
-        crate::state::Profile::remove_project(&profile.path, &file).await?;
-    }
-
-    // Extract modrinth pack information, if appropriate
-    let linked_data = profile.linked_data.as_ref().ok_or_else(unmanaged_err)?;
-
-    // Replace the pack with the same version
-    replace_managed_modrinth(
-        profile_path,
-        &profile,
-        &linked_data.project_id,
-        &linked_data.version_id,
-        None,
-        false, // do not ignore lock, as repairing can reset the lock
-    )
-    .await?;
-
-    emit_profile(profile_path, ProfilePayloadType::Edited).await?;
-
-    Ok(())
-}
-
-/// Replace a managed modrinth pack with a new version
-/// If new_version_id is None, the pack is 'reinstalled' in-place
-#[tracing::instrument(skip(profile))]
-
-async fn replace_managed_modrinth(
-    profile_path: &str,
-    profile: &crate::state::Profile,
-    project_id: &String,
-    version_id: &String,
-    new_version_id: Option<&String>,
-    ignore_lock: bool,
-) -> crate::Result<()> {
-    // get disabled project ids to re-disable after update
-    let state = crate::State::get().await?;
-    let disabled_project_ids = profile
-        .get_projects(
-            Some(CacheBehaviour::MustRevalidate),
-            &state.pool,
-            &state.api_semaphore,
-        )
-        .await?
-        .into_iter()
-        .filter_map(|(file_path, project)| {
-            (file_path.ends_with(".disabled"))
-                .then_some(project.metadata?.project_id)
-        })
-        .collect::<HashSet<_>>();
-
-    crate::profile::edit(profile_path, |profile| {
-        profile.install_stage = ProfileInstallStage::MinecraftInstalling;
-        async { Ok(()) }
-    })
-    .await?;
-
-    // Fetch .mrpacks for both old and new versions
-    // TODO: this will need to be updated if we revert the hacky pack method we needed for compiler speed
-
-    let (old_pack_creator, new_pack_creator) = if let Some(new_version_id) =
-        new_version_id
-    {
-        let shared_loading_bar = init_loading(
-            LoadingBarType::PackFileDownload {
-                profile_path: crate::api::profile::get_full_path(profile_path)
-                    .await?
-                    .to_string_lossy()
-                    .to_string(),
-                pack_name: profile.name.clone(),
-                icon: None,
-                pack_version: version_id.clone(),
-            },
-            200.0, // These two downloads will share the same loading bar
-            "Downloading pack file",
-        )
-        .await?;
-
-        // download in parallel, then join.
-        try_join!(
-            generate_pack_from_version_id(
-                project_id.clone(),
-                version_id.clone(),
-                profile.name.clone(),
-                None,
-                profile_path.to_string(),
-                Some(shared_loading_bar.clone()),
-                DownloadReason::Update,
-            ),
-            generate_pack_from_version_id(
-                project_id.clone(),
-                new_version_id.clone(),
-                profile.name.clone(),
-                None,
-                profile_path.to_string(),
-                Some(shared_loading_bar),
-                DownloadReason::Update,
-            )
-        )?
-    } else {
-        // If new_version_id is None, we don't need to download the new pack, so we clone the old one
-        let mut old_pack_creator = generate_pack_from_version_id(
-            project_id.clone(),
-            version_id.clone(),
-            profile.name.clone(),
-            None,
-            profile_path.to_string(),
-            None,
-            DownloadReason::Update,
-        )
-        .await?;
-        old_pack_creator.description.existing_loading_bar = None;
-        (old_pack_creator.clone(), old_pack_creator)
-    };
-
-    // Removal - remove all files that were added by the old pack
-    // - remove all installed projects
-    // - remove all overrides
-    pack::install_mrpack::remove_all_related_files(
-        profile_path.to_string(),
-        old_pack_creator.file,
-    )
-    .await?;
-
-    // Reinstallation - install all files that are added by the new pack
-    // - install all projects
-    // - install all overrides
-    // - edits the profile to update the new data
-    // - (functionals almost identically to rteinstalling the pack 'in-place')
-    pack::install_mrpack::install_zipped_mrpack_files(
-        new_pack_creator,
-        ignore_lock,
-        DownloadReason::Update,
-    )
-    .await?;
-
-    // re-enable previously disabled project
-    if !disabled_project_ids.is_empty()
-        && let Some(updated_profile) = get(profile_path).await?
-    {
-        for (file_path, project) in updated_profile
-            .get_projects(
-                Some(CacheBehaviour::MustRevalidate),
-                &state.pool,
-                &state.api_semaphore,
-            )
-            .await?
-        {
-            if !file_path.ends_with(".disabled")
-                && let Some(metadata) = &project.metadata
-                && disabled_project_ids.contains(&metadata.project_id)
-            {
-                crate::state::Profile::toggle_disable_project(
-                    profile_path,
-                    &file_path,
-                )
-                .await?;
-            }
-        }
-    }
-
-    Ok(())
-}
diff --git a/packages/app-lib/src/api/settings.rs b/packages/app-lib/src/api/settings.rs
index b79e2e524c..a0c1294e50 100644
--- a/packages/app-lib/src/api/settings.rs
+++ b/packages/app-lib/src/api/settings.rs
@@ -1,8 +1,8 @@
-//! Theseus profile management interface
+//! Theseus settings management interface
 
 pub use crate::{
     State,
-    state::{Hooks, MemorySettings, Profile, Settings, WindowSize},
+    state::{Hooks, MemorySettings, Settings, WindowSize},
 };
 
 /// Gets entire settings
diff --git a/packages/app-lib/src/api/worlds.rs b/packages/app-lib/src/api/worlds.rs
index 3801424646..c601cb3bc5 100644
--- a/packages/app-lib/src/api/worlds.rs
+++ b/packages/app-lib/src/api/worlds.rs
@@ -1,10 +1,10 @@
 use crate::data::ModLoader;
+use crate::instance::get_full_path;
 use crate::launcher::get_loader_version_from_profile;
-use crate::profile::get_full_path;
 use crate::server_address::{parse_server_address, resolve_server_address};
 use crate::state::attached_world_data::AttachedWorldData;
 use crate::state::{
-    Profile, ProfileInstallStage, attached_world_data, server_join_log,
+    InstanceInstallStage, attached_world_data, server_join_log,
 };
 use crate::util::protocol_version::OLD_PROTOCOL_VERSIONS;
 pub use crate::util::protocol_version::ProtocolVersion;
@@ -36,8 +36,8 @@ use tokio_util::compat::FuturesAsyncWriteCompatExt;
 use url::Url;
 
 #[derive(Deserialize, Serialize, Debug, Clone)]
-pub struct WorldWithProfile {
-    pub profile: String,
+pub struct WorldWithInstance {
+    pub instance_id: String,
     #[serde(flatten)]
     pub world: World,
 }
@@ -191,33 +191,36 @@ impl From<ServerPackStatus> for Option<bool> {
 pub async fn get_recent_worlds(
     limit: usize,
     display_statuses: EnumSet<DisplayStatus>,
-) -> Result<Vec<WorldWithProfile>> {
+) -> Result<Vec<WorldWithInstance>> {
     let state = State::get().await?;
-    let profiles_dir = state.directories.profiles_dir();
+    let instances_dir = state.directories.instances_dir();
 
-    let mut profiles = Profile::get_all(&state.pool).await?;
-    profiles.sort_by_key(|x| Reverse(x.last_played));
+    let mut instances = crate::state::list_instances(&state.pool).await?;
+    instances.sort_by_key(|x| Reverse(x.instance.last_played));
 
     let mut result = Vec::with_capacity(limit);
 
     let mut least_recent_time = None;
-    for profile in profiles {
-        if result.len() >= limit && profile.last_played < least_recent_time {
+    for instance in instances {
+        if result.len() >= limit
+            && instance.instance.last_played < least_recent_time
+        {
             break;
         }
-        let profile_path = &profile.path;
-        let profile_dir = profiles_dir.join(profile_path);
-        let profile_worlds =
-            get_all_worlds_in_profile(profile_path, &profile_dir).await;
-        if let Err(e) = profile_worlds {
+        let instance_id = &instance.instance.id;
+        let instance_path = &instance.instance.path;
+        let instance_dir = instances_dir.join(instance_path);
+        let instance_worlds =
+            get_all_worlds_in_instance(instance_id, &instance_dir).await;
+        if let Err(e) = instance_worlds {
             tracing::error!(
-                "Failed to get worlds for profile {}: {}",
-                profile_path,
+                "Failed to get worlds for instance {}: {}",
+                instance_id,
                 e
             );
             continue;
         }
-        for world in profile_worlds? {
+        for world in instance_worlds? {
             let is_older = least_recent_time.is_none()
                 || world.last_played < least_recent_time;
             if result.len() >= limit && is_older {
@@ -229,8 +232,8 @@ pub async fn get_recent_worlds(
             if is_older {
                 least_recent_time = world.last_played;
             }
-            result.push(WorldWithProfile {
-                profile: profile_path.clone(),
+            result.push(WorldWithInstance {
+                instance_id: instance_id.clone(),
                 world,
             });
         }
@@ -246,23 +249,56 @@ pub async fn get_recent_worlds(
     Ok(result)
 }
 
-pub async fn get_profile_worlds(profile_path: &str) -> Result<Vec<World>> {
-    get_all_worlds_in_profile(profile_path, &get_full_path(profile_path).await?)
+pub async fn get_instance_worlds(instance_id: &str) -> Result<Vec<World>> {
+    get_all_worlds_in_instance(instance_id, &get_full_path(instance_id).await?)
         .await
 }
 
-async fn get_all_worlds_in_profile(
-    profile_path: &str,
-    profile_dir: &Path,
+async fn resolve_instance_id(instance: &str, state: &State) -> Result<String> {
+    resolve_instance_identity(instance, state)
+        .await
+        .map(|(instance_id, _)| instance_id)
+}
+
+async fn resolve_instance_identity(
+    instance: &str,
+    state: &State,
+) -> Result<(String, String)> {
+    sqlx::query_as::<_, (String, String)>(
+        "
+		SELECT id, path
+		FROM instances
+		WHERE id = ? OR path = ?
+		ORDER BY CASE WHEN id = ? THEN 0 ELSE 1 END
+		LIMIT 1
+		",
+    )
+    .bind(instance)
+    .bind(instance)
+    .bind(instance)
+    .fetch_optional(&state.pool)
+    .await?
+    .ok_or_else(|| {
+        ErrorKind::InputError(format!(
+            "Unknown instance id or path: {instance}"
+        ))
+        .as_error()
+    })
+}
+
+async fn get_all_worlds_in_instance(
+    instance_id: &str,
+    instance_dir: &Path,
 ) -> Result<Vec<World>> {
     let mut worlds = vec![];
-    get_singleplayer_worlds_in_profile(profile_dir, &mut worlds).await?;
-    get_server_worlds_in_profile(profile_path, profile_dir, &mut worlds)
+    get_singleplayer_worlds_in_instance(instance_dir, &mut worlds).await?;
+    let state = State::get().await?;
+
+    get_server_worlds_in_instance(instance_id, instance_dir, &mut worlds)
         .await?;
 
-    let state = State::get().await?;
     let attached_data =
-        AttachedWorldData::get_all_for_instance(profile_path, &state.pool)
+        AttachedWorldData::get_all_for_instance(instance_id, &state.pool)
             .await?;
     if !attached_data.is_empty() {
         for world in &mut worlds {
@@ -277,7 +313,7 @@ async fn get_all_worlds_in_profile(
     Ok(worlds)
 }
 
-async fn get_singleplayer_worlds_in_profile(
+async fn get_singleplayer_worlds_in_instance(
     instance_dir: &Path,
     worlds: &mut Vec<World>,
 ) -> Result<()> {
@@ -314,12 +350,14 @@ pub async fn get_singleplayer_world(
     world: &str,
 ) -> Result<World> {
     let state = State::get().await?;
-    let profile_path = state.directories.profiles_dir().join(instance);
+    let (instance_id, instance_path) =
+        resolve_instance_identity(instance, &state).await?;
+    let instance_dir = state.directories.instances_dir().join(instance_path);
     let mut world =
-        read_singleplayer_world(get_world_dir(&profile_path, world)).await?;
+        read_singleplayer_world(get_world_dir(&instance_dir, world)).await?;
 
     if let Some(data) = AttachedWorldData::get_for_world(
-        instance,
+        &instance_id,
         world.world_type(),
         world.world_id(),
         &state.pool,
@@ -398,8 +436,8 @@ async fn read_singleplayer_world_maybe_locked(
     })
 }
 
-async fn get_server_worlds_in_profile(
-    profile_path: &str,
+async fn get_server_worlds_in_instance(
+    instance_id: &str,
     instance_dir: &Path,
     worlds: &mut Vec<World>,
 ) -> Result<()> {
@@ -409,7 +447,7 @@ async fn get_server_worlds_in_profile(
     }
 
     let state = State::get().await?;
-    let join_log = server_join_log::get_joins(profile_path, &state.pool)
+    let join_log = server_join_log::get_joins(instance_id, &state.pool)
         .await
         .ok();
 
@@ -467,8 +505,9 @@ pub async fn set_world_display_status(
     display_status: DisplayStatus,
 ) -> Result<()> {
     let state = State::get().await?;
+    let instance_id = resolve_instance_id(instance, &state).await?;
     attached_world_data::set_display_status(
-        instance,
+        &instance_id,
         world_type,
         world_id,
         display_status,
@@ -708,16 +747,19 @@ async fn try_get_world_session_lock(
     Ok(locked.then_some(file))
 }
 
-pub async fn add_server_to_profile(
-    profile_path: &Path,
-    profile_path_id: &str,
+pub async fn add_server_to_instance(
+    instance_id: &str,
     name: String,
     address: String,
     pack_status: ServerPackStatus,
     project_id: Option<String>,
     content_kind: Option<String>,
 ) -> Result<usize> {
-    let mut servers = servers_data::read(profile_path).await?;
+    let state = State::get().await?;
+    let (instance_id, instance_path) =
+        resolve_instance_identity(instance_id, &state).await?;
+    let instance_dir = state.directories.instances_dir().join(instance_path);
+    let mut servers = servers_data::read(&instance_dir).await?;
     let insert_index = servers
         .iter()
         .position(|x| x.hidden)
@@ -732,13 +774,12 @@ pub async fn add_server_to_profile(
             icon: None,
         },
     );
-    servers_data::write(profile_path, &servers).await?;
+    servers_data::write(&instance_dir, &servers).await?;
 
     if project_id.is_some() || content_kind.is_some() {
-        let state = State::get().await?;
         if let Some(project_id) = &project_id {
             attached_world_data::set_project_id(
-                profile_path_id,
+                &instance_id,
                 WorldType::Server,
                 &address,
                 project_id,
@@ -748,7 +789,7 @@ pub async fn add_server_to_profile(
         }
         if let Some(content_kind) = &content_kind {
             attached_world_data::set_content_kind(
-                profile_path_id,
+                &instance_id,
                 WorldType::Server,
                 &address,
                 content_kind,
@@ -761,14 +802,18 @@ pub async fn add_server_to_profile(
     Ok(insert_index)
 }
 
-pub async fn edit_server_in_profile(
-    profile_path: &Path,
+pub async fn edit_server_in_instance(
+    instance_id: &str,
     index: usize,
     name: String,
     address: String,
     pack_status: ServerPackStatus,
 ) -> Result<()> {
-    let mut servers = servers_data::read(profile_path).await?;
+    let state = State::get().await?;
+    let (_, instance_path) =
+        resolve_instance_identity(instance_id, &state).await?;
+    let instance_dir = state.directories.instances_dir().join(instance_path);
+    let mut servers = servers_data::read(&instance_dir).await?;
     let server =
         servers
             .get_mut(index)
@@ -782,15 +827,19 @@ pub async fn edit_server_in_profile(
     server.name = name;
     server.ip = address;
     server.accept_textures = pack_status.into();
-    servers_data::write(profile_path, &servers).await?;
+    servers_data::write(&instance_dir, &servers).await?;
     Ok(())
 }
 
-pub async fn remove_server_from_profile(
-    profile_path: &Path,
+pub async fn remove_server_from_instance(
+    instance_id: &str,
     index: usize,
 ) -> Result<()> {
-    let mut servers = servers_data::read(profile_path).await?;
+    let state = State::get().await?;
+    let (_, instance_path) =
+        resolve_instance_identity(instance_id, &state).await?;
+    let instance_dir = state.directories.instances_dir().join(instance_path);
+    let mut servers = servers_data::read(&instance_dir).await?;
     if servers.get(index).as_ref().is_none_or(|x| x.hidden) {
         return Err(ErrorKind::InputError(format!(
             "No removable server at index {index}"
@@ -798,7 +847,7 @@ pub async fn remove_server_from_profile(
         .into());
     }
     servers.remove(index);
-    servers_data::write(profile_path, &servers).await?;
+    servers_data::write(&instance_dir, &servers).await?;
     Ok(())
 }
 
@@ -863,23 +912,28 @@ mod servers_data {
     }
 }
 
-pub async fn get_profile_protocol_version(
-    profile: &str,
+pub async fn get_instance_protocol_version(
+    instance_id: &str,
 ) -> Result<Option<ProtocolVersion>> {
-    let mut profile = super::profile::get(profile).await?.ok_or_else(|| {
-        ErrorKind::UnmanagedProfileError(format!(
-            "Could not find profile {profile}"
-        ))
-    })?;
-    if profile.install_stage != ProfileInstallStage::Installed {
+    let metadata =
+        crate::api::instance::get(instance_id)
+            .await?
+            .ok_or_else(|| {
+                ErrorKind::InputError(format!(
+                    "Could not find instance {instance_id}"
+                ))
+            })?;
+    if metadata.instance.install_stage != InstanceInstallStage::Installed {
         return Ok(None);
     }
 
-    if let Some(protocol_version) = profile.protocol_version {
+    if let Some(protocol_version) =
+        metadata.applied_content_set.protocol_version
+    {
         return Ok(Some(ProtocolVersion::modern(protocol_version)));
     }
     if let Some(protocol_version) =
-        OLD_PROTOCOL_VERSIONS.get(&profile.game_version)
+        OLD_PROTOCOL_VERSIONS.get(&metadata.applied_content_set.game_version)
     {
         return Ok(Some(*protocol_version));
     }
@@ -887,19 +941,21 @@ pub async fn get_profile_protocol_version(
     let state = State::get().await?;
     let (minecraft, version_index) =
         crate::launcher::resolve_minecraft_manifest(
-            &profile.game_version,
+            &metadata.applied_content_set.game_version,
             &state,
         )
         .await?;
     let version = &minecraft.versions[version_index];
 
     let loader_version = get_loader_version_from_profile(
-        &profile.game_version,
-        profile.loader,
-        profile.loader_version.as_deref(),
+        &metadata.applied_content_set.game_version,
+        metadata.applied_content_set.loader,
+        metadata.applied_content_set.loader_version.as_deref(),
     )
     .await?;
-    if profile.loader != ModLoader::Vanilla && loader_version.is_none() {
+    if metadata.applied_content_set.loader != ModLoader::Vanilla
+        && loader_version.is_none()
+    {
         return Ok(None);
     }
 
@@ -920,8 +976,12 @@ pub async fn get_profile_protocol_version(
 
     let version = launcher::read_protocol_version_from_jar(client_path).await?;
     if version.is_some() {
-        profile.protocol_version = version;
-        profile.upsert(&state.pool).await?;
+        crate::state::instances::commands::set_applied_content_set_protocol_version(
+            &metadata.instance.id,
+            version,
+            &state.pool,
+        )
+        .await?;
     }
     Ok(version.map(ProtocolVersion::modern))
 }
diff --git a/packages/app-lib/src/error.rs b/packages/app-lib/src/error.rs
index 415a42952a..84071718e2 100644
--- a/packages/app-lib/src/error.rs
+++ b/packages/app-lib/src/error.rs
@@ -1,7 +1,7 @@
 //! Theseus error type
 use std::sync::Arc;
 
-use crate::{profile, util};
+use crate::util;
 use data_url::DataUrlError;
 use derive_more::Display;
 use serde::{Deserialize, Serialize};
@@ -101,11 +101,8 @@ pub enum ErrorKind {
     #[error("Error acquiring semaphore: {0}")]
     AcquireError(#[from] tokio::sync::AcquireError),
 
-    #[error("Profile {0} is not managed by the app!")]
-    UnmanagedProfileError(String),
-
-    #[error("Could not create profile: {0}")]
-    ProfileCreationError(#[from] profile::create::ProfileCreationError),
+    #[error("Instance {0} is not managed by the app!")]
+    UnmanagedInstanceError(String),
 
     #[error("User is not logged in, no credentials available!")]
     NoCredentialsError,
diff --git a/packages/app-lib/src/event/emit.rs b/packages/app-lib/src/event/emit.rs
index b98353b504..2a1c63e938 100644
--- a/packages/app-lib/src/event/emit.rs
+++ b/packages/app-lib/src/event/emit.rs
@@ -1,11 +1,11 @@
 use super::{FriendPayload, LoadingBarId};
 use crate::event::{
-    CommandPayload, EventError, LoadingBar, LoadingBarType, ProcessPayloadType,
-    ProfilePayloadType,
+    CommandPayload, EventError, InstancePayloadType, LoadingBar,
+    LoadingBarType, ProcessPayloadType,
 };
 #[cfg(feature = "tauri")]
 use crate::event::{
-    LoadingPayload, ProcessPayload, ProfilePayload, WarningPayload,
+    InstancePayload, LoadingPayload, ProcessPayload, WarningPayload,
 };
 use futures::prelude::*;
 use serde_json::Value;
@@ -243,7 +243,7 @@ pub async fn emit_command(command: CommandPayload) -> crate::Result<()> {
 // emit_process(uuid, pid, event, message)
 #[allow(unused_variables)]
 pub async fn emit_process(
-    profile_path: &str,
+    instance_id: &str,
     uuid: Uuid,
     event: ProcessPayloadType,
     message: &str,
@@ -256,7 +256,7 @@ pub async fn emit_process(
             .emit(
                 "process",
                 ProcessPayload {
-                    profile_path_id: profile_path.to_string(),
+                    instance_id: instance_id.to_string(),
                     uuid,
                     event,
                     message: message.to_string(),
@@ -267,11 +267,11 @@ pub async fn emit_process(
     Ok(())
 }
 
-// emit_profile(path, event)
+// emit_instance(path, event)
 #[allow(unused_variables)]
-pub async fn emit_profile(
-    profile_path_id: &str,
-    event: ProfilePayloadType,
+pub async fn emit_instance(
+    instance_id: &str,
+    event: InstancePayloadType,
 ) -> crate::Result<()> {
     #[cfg(feature = "tauri")]
     {
@@ -279,9 +279,9 @@ pub async fn emit_profile(
         event_state
             .app
             .emit(
-                "profile",
-                ProfilePayload {
-                    profile_path_id: profile_path_id.to_string(),
+                "instance",
+                InstancePayload {
+                    instance_id: instance_id.to_string(),
                     event,
                 },
             )
diff --git a/packages/app-lib/src/event/mod.rs b/packages/app-lib/src/event/mod.rs
index f570d78a9a..8665daafef 100644
--- a/packages/app-lib/src/event/mod.rs
+++ b/packages/app-lib/src/event/mod.rs
@@ -145,36 +145,36 @@ pub enum LoadingBarType {
         version: u32,
     },
     PackFileDownload {
-        profile_path: String,
+        instance_id: String,
         pack_name: String,
         icon: Option<String>,
         pack_version: String,
     },
     PackDownload {
-        profile_path: String,
+        instance_id: String,
         pack_name: String,
         icon: Option<PathBuf>,
         pack_id: Option<String>,
         pack_version: Option<String>,
     },
     MinecraftDownload {
-        profile_path: String,
-        profile_name: String,
+        instance_id: String,
+        instance_name: String,
     },
-    ProfileUpdate {
-        profile_path: String,
-        profile_name: String,
+    InstanceUpdate {
+        instance_id: String,
+        instance_name: String,
     },
     ZipExtract {
-        profile_path: String,
-        profile_name: String,
+        instance_id: String,
+        instance_name: String,
     },
     ConfigChange {
         new_path: PathBuf,
     },
-    CopyProfile {
+    CopyInstance {
         import_location: PathBuf,
-        profile_name: String,
+        instance_name: String,
     },
     LauncherUpdate {
         version: String,
@@ -221,7 +221,7 @@ pub enum CommandPayload {
 #[derive(Serialize, Clone)]
 #[cfg(feature = "tauri")]
 pub struct ProcessPayload {
-    pub profile_path_id: String,
+    pub instance_id: String,
     pub uuid: Uuid,
     pub event: ProcessPayloadType,
     pub message: String,
@@ -236,15 +236,15 @@ pub enum ProcessPayloadType {
 
 #[derive(Serialize, Clone)]
 #[cfg(feature = "tauri")]
-pub struct ProfilePayload {
-    pub profile_path_id: String,
+pub struct InstancePayload {
+    pub instance_id: String,
     #[serde(flatten)]
-    pub event: ProfilePayloadType,
+    pub event: InstancePayloadType,
 }
 
 #[derive(Serialize, Clone)]
 #[serde(tag = "event", rename_all = "snake_case")]
-pub enum ProfilePayloadType {
+pub enum InstancePayloadType {
     Created,
     Synced,
     ServersUpdated,
@@ -287,7 +287,7 @@ mod log_types {
 
     #[derive(Serialize, Clone)]
     pub struct LogPayload {
-        pub profile_path_id: String,
+        pub instance_id: String,
         #[serde(flatten)]
         pub event: LogEvent,
     }
diff --git a/packages/app-lib/src/launcher/args.rs b/packages/app-lib/src/launcher/args.rs
index 3af3d593ab..a482f66a8f 100644
--- a/packages/app-lib/src/launcher/args.rs
+++ b/packages/app-lib/src/launcher/args.rs
@@ -1,7 +1,7 @@
 //! Minecraft CLI argument logic
+use crate::instance::QuickPlayType;
 use crate::launcher::quick_play_version::QuickPlayServerVersion;
 use crate::launcher::{QuickPlayVersion, parse_rules};
-use crate::profile::QuickPlayType;
 use crate::state::Credentials;
 use crate::{
     state::{MemorySettings, WindowSize},
diff --git a/packages/app-lib/src/launcher/download.rs b/packages/app-lib/src/launcher/download.rs
index fe1fd92f15..f6f2ec97cf 100644
--- a/packages/app-lib/src/launcher/download.rs
+++ b/packages/app-lib/src/launcher/download.rs
@@ -1,7 +1,7 @@
 //! Downloader for Minecraft data
 
+use crate::instance::QuickPlayType;
 use crate::launcher::parse_rules;
-use crate::profile::QuickPlayType;
 use crate::{
     event::{
         LoadingBarId,
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
index 6dc472bcc7..fe46f4a7be 100644
--- a/packages/app-lib/src/launcher/mod.rs
+++ b/packages/app-lib/src/launcher/mod.rs
@@ -2,27 +2,27 @@
 use crate::data::ModLoader;
 use crate::event::emit::{emit_loading, init_or_edit_loading};
 use crate::event::{LoadingBarId, LoadingBarType};
+use crate::instance::QuickPlayType;
 use crate::launcher::download::download_log_config;
 use crate::launcher::io::IOError;
 use crate::launcher::quick_play_version::{
     QuickPlayServerVersion, QuickPlayVersion,
 };
-use crate::profile::QuickPlayType;
 use crate::server_address::{ServerAddress, parse_server_address};
 use crate::state::server_join_log::JoinLogEntry;
 use crate::state::{
-    Credentials, JavaVersion, ProcessMetadata, ProfileInstallStage,
+    Credentials, InstanceInstallStage, InstanceLaunchContext, InstanceLink,
+    JavaVersion, MemorySettings, ProcessMetadata, WindowSize,
 };
 use crate::util::io;
 use crate::util::rpc::RpcServerBuilder;
-use crate::{State, get_resource_file, process, state as st};
+use crate::{State, get_resource_file, process};
 use chrono::Utc;
 use daedalus as d;
 use daedalus::minecraft::{LoggingSide, RuleAction, VersionInfo};
 use daedalus::modded::LoaderVersion;
 use regex::Regex;
 use serde::Deserialize;
-use st::Profile;
 use std::fmt::Write;
 use std::path::PathBuf;
 use tokio::process::Command;
@@ -126,11 +126,11 @@ macro_rules! processor_rules {
     }
 }
 
-pub async fn get_java_version_from_profile(
-    profile: &Profile,
+pub async fn get_java_version_from_launch_context(
+    context: &InstanceLaunchContext,
     version_info: &VersionInfo,
 ) -> crate::Result<Option<JavaVersion>> {
-    if let Some(java) = profile.java_path.as_ref() {
+    if let Some(java) = context.launch_overrides.java_path.as_ref() {
         let java =
             crate::api::jre::check_jre(std::path::PathBuf::from(java)).await;
 
@@ -231,38 +231,44 @@ pub async fn resolve_minecraft_manifest(
     Ok((refreshed, idx))
 }
 
-#[tracing::instrument(skip(profile))]
+async fn get_instance_full_path(instance_path: &str) -> crate::Result<PathBuf> {
+    let state = State::get().await?;
+    let instances_dir = state.directories.instances_dir();
+    let full_path = io::canonicalize(instances_dir.join(instance_path))?;
+    Ok(full_path)
+}
 
 pub async fn install_minecraft(
-    profile: &Profile,
+    context: &InstanceLaunchContext,
     existing_loading_bar: Option<LoadingBarId>,
     repairing: bool,
 ) -> crate::Result<()> {
+    let instance = &context.instance;
+    let content_set = &context.applied_content_set;
     let loading_bar = init_or_edit_loading(
         existing_loading_bar,
         LoadingBarType::MinecraftDownload {
             // If we are downloading minecraft for a profile, provide its name and uuid
-            profile_name: profile.name.clone(),
-            profile_path: profile.path.clone(),
+            instance_name: instance.name.clone(),
+            instance_id: instance.id.clone(),
         },
         100.0,
         "Downloading Minecraft",
     )
     .await?;
 
-    crate::api::profile::edit(&profile.path, |prof| {
-        prof.install_stage = ProfileInstallStage::MinecraftInstalling;
+    let state = State::get().await?;
 
-        async { Ok(()) }
-    })
+    crate::state::instances::commands::set_instance_install_stage(
+        &instance.id,
+        InstanceInstallStage::MinecraftInstalling,
+        &state.pool,
+    )
     .await?;
 
-    let state = State::get().await?;
-
-    let instance_path =
-        crate::api::profile::get_full_path(&profile.path).await?;
+    let instance_path = get_instance_full_path(&instance.path).await?;
     let (minecraft, version_index) =
-        resolve_minecraft_manifest(&profile.game_version, &state).await?;
+        resolve_minecraft_manifest(&content_set.game_version, &state).await?;
     let version = &minecraft.versions[version_index];
     let minecraft_updated = version_index
         <= minecraft
@@ -272,27 +278,26 @@ pub async fn install_minecraft(
             .unwrap_or(0);
 
     let mut loader_version = get_loader_version_from_profile(
-        &profile.game_version,
-        profile.loader,
-        profile.loader_version.as_deref(),
+        &content_set.game_version,
+        content_set.loader,
+        content_set.loader_version.as_deref(),
     )
     .await?;
 
     // If no loader version is selected, try to select the stable version!
-    if profile.loader != ModLoader::Vanilla && loader_version.is_none() {
+    if content_set.loader != ModLoader::Vanilla && loader_version.is_none() {
         loader_version = get_loader_version_from_profile(
-            &profile.game_version,
-            profile.loader,
+            &content_set.game_version,
+            content_set.loader,
             Some("stable"),
         )
         .await?;
 
-        let loader_version_id = loader_version.clone();
-        crate::api::profile::edit(&profile.path, |prof| {
-            prof.loader_version = loader_version_id.clone().map(|x| x.id);
-
-            async { Ok(()) }
-        })
+        crate::state::instances::commands::set_applied_content_set_loader_version(
+            &instance.id,
+            loader_version.as_ref().map(|x| x.id.as_str()),
+            &state.pool,
+        )
         .await?;
     }
 
@@ -316,7 +321,7 @@ pub async fn install_minecraft(
         .as_ref()
         .map_or(8, |it| it.major_version);
     let (java_version, set_java) = if let Some(java_version) =
-        get_java_version_from_profile(profile, &version_info).await?
+        get_java_version_from_launch_context(context, &version_info).await?
     {
         (std::path::PathBuf::from(java_version.path), false)
     } else {
@@ -360,7 +365,7 @@ pub async fn install_minecraft(
                     client => client_path.to_string_lossy(),
                     server => "";
                 "MINECRAFT_VERSION":
-                    client => profile.game_version.clone(),
+                    client => content_set.game_version.clone(),
                     server => "";
                 "ROOT":
                     client => instance_path.to_string_lossy(),
@@ -443,18 +448,44 @@ pub async fn install_minecraft(
 
     let protocol_version = read_protocol_version_from_jar(client_path).await?;
 
-    crate::api::profile::edit(&profile.path, |prof| {
-        prof.install_stage = ProfileInstallStage::Installed;
-        prof.protocol_version = protocol_version;
-
-        async { Ok(()) }
-    })
+    crate::state::instances::commands::set_instance_install_stage(
+        &instance.id,
+        InstanceInstallStage::Installed,
+        &state.pool,
+    )
+    .await?;
+    crate::state::instances::commands::set_applied_content_set_protocol_version(
+        &instance.id,
+        protocol_version,
+        &state.pool,
+    )
     .await?;
     emit_loading(&loading_bar, 1.0, Some("Finished installing"))?;
 
     Ok(())
 }
 
+pub async fn install_minecraft_for_instance_id(
+    instance_id: &str,
+    existing_loading_bar: Option<LoadingBarId>,
+    repairing: bool,
+) -> crate::Result<()> {
+    let state = State::get().await?;
+    let context =
+        crate::state::instances::commands::get_instance_launch_context(
+            instance_id,
+            &state.pool,
+        )
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::OtherError(format!(
+                "Tried to install a nonexistent or unloaded instance {instance_id}!"
+            ))
+        })?;
+
+    install_minecraft(&context, existing_loading_bar, repairing).await
+}
+
 pub async fn read_protocol_version_from_jar(
     path: PathBuf,
 ) -> crate::Result<Option<u32>> {
@@ -483,6 +514,30 @@ pub async fn read_protocol_version_from_jar(
     Ok(data.protocol_version)
 }
 
+fn link_project_and_version(
+    link: &InstanceLink,
+) -> (Option<&String>, Option<&String>) {
+    match link {
+        InstanceLink::ModrinthModpack {
+            project_id,
+            version_id,
+        } => (Some(project_id), Some(version_id)),
+        InstanceLink::ServerProject { project_id } => (Some(project_id), None),
+        InstanceLink::ServerProjectModpack {
+            server_project_id,
+            content_version_id,
+            ..
+        } => (Some(server_project_id), Some(content_version_id)),
+        InstanceLink::ImportedModpack {
+            project_id,
+            version_id,
+        } => (project_id.as_ref(), version_id.as_ref()),
+        InstanceLink::Unmanaged
+        | InstanceLink::ModrinthHosting { .. }
+        | InstanceLink::SharedInstance { .. } => (None, None),
+    }
+}
+
 #[tracing::instrument(skip_all)]
 #[allow(clippy::too_many_arguments)]
 pub async fn launch_minecraft(
@@ -490,33 +545,35 @@ pub async fn launch_minecraft(
     env_args: &[(String, String)],
     mc_set_options: &[(String, String)],
     wrapper: &Option<String>,
-    memory: &st::MemorySettings,
-    resolution: &st::WindowSize,
+    memory: &MemorySettings,
+    resolution: &WindowSize,
     credentials: &Credentials,
     post_exit_hook: Option<String>,
-    profile: &Profile,
+    context: &InstanceLaunchContext,
     mut quick_play_type: QuickPlayType,
 ) -> crate::Result<ProcessMetadata> {
-    if profile.install_stage == ProfileInstallStage::PackInstalling
-        || profile.install_stage == ProfileInstallStage::MinecraftInstalling
+    let instance = &context.instance;
+    let content_set = &context.applied_content_set;
+
+    if instance.install_stage == InstanceInstallStage::PackInstalling
+        || instance.install_stage == InstanceInstallStage::MinecraftInstalling
     {
         return Err(crate::ErrorKind::LauncherError(
-            "Profile is still installing".to_string(),
+            "Instance is still installing".to_string(),
         )
         .into());
     }
 
-    if profile.install_stage != ProfileInstallStage::Installed {
-        install_minecraft(profile, None, false).await?;
+    if instance.install_stage != InstanceInstallStage::Installed {
+        install_minecraft(context, None, false).await?;
     }
 
     let state = State::get().await?;
 
-    let instance_path =
-        crate::api::profile::get_full_path(&profile.path).await?;
+    let instance_path = get_instance_full_path(&instance.path).await?;
 
     let (minecraft, version_index) =
-        resolve_minecraft_manifest(&profile.game_version, &state).await?;
+        resolve_minecraft_manifest(&content_set.game_version, &state).await?;
     let version = &minecraft.versions[version_index];
     let minecraft_updated = version_index
         <= minecraft
@@ -526,16 +583,16 @@ pub async fn launch_minecraft(
             .unwrap_or(0);
 
     let loader_version = get_loader_version_from_profile(
-        &profile.game_version,
-        profile.loader,
-        profile.loader_version.as_deref(),
+        &content_set.game_version,
+        content_set.loader,
+        content_set.loader_version.as_deref(),
     )
     .await?;
 
-    if profile.loader != ModLoader::Vanilla && loader_version.is_none() {
+    if content_set.loader != ModLoader::Vanilla && loader_version.is_none() {
         return Err(crate::ErrorKind::LauncherError(format!(
             "No loader version selected for {}",
-            profile.loader.as_str()
+            content_set.loader.as_str()
         ))
         .into());
     }
@@ -574,13 +631,14 @@ pub async fn launch_minecraft(
 
     download_log_config(&state, &version_info, None, false).await?;
 
-    let java_version = get_java_version_from_profile(profile, &version_info)
-        .await?
-        .ok_or_else(|| {
-            crate::ErrorKind::LauncherError(
-                "Missing correct java installation".to_string(),
-            )
-        })?;
+    let java_version =
+        get_java_version_from_launch_context(context, &version_info)
+            .await?
+            .ok_or_else(|| {
+                crate::ErrorKind::LauncherError(
+                    "Missing correct java installation".to_string(),
+                )
+            })?;
 
     // Test jre version
     let java_version =
@@ -615,14 +673,13 @@ pub async fn launch_minecraft(
 
     let env_args = Vec::from(env_args);
 
-    // Check if profile has a running profile, and reject running the command if it does
+    // Check if instance has a running process, and reject running the command if it does
     // Done late so a quick double call doesn't launch two instances
-    let existing_processes =
-        process::get_by_profile_path(&profile.path).await?;
+    let existing_processes = process::get_by_instance_id(&instance.id).await?;
     if let Some(process) = existing_processes.first() {
         return Err(crate::ErrorKind::LauncherError(format!(
-            "Profile {} is already running at path: {}",
-            profile.path, process.uuid
+            "Instance {} is already running as process {}",
+            instance.id, process.uuid
         ))
         .as_error());
     }
@@ -636,7 +693,7 @@ pub async fn launch_minecraft(
         QuickPlayVersion::find_version(version_index, &minecraft.versions);
     tracing::debug!(
         "Found QuickPlayVersion for {}: {quick_play_version:?}",
-        profile.game_version
+        content_set.game_version
     );
     if let QuickPlayType::Server(address) = &mut quick_play_type
         && quick_play_version.server >= QuickPlayServerVersion::BuiltinLegacy
@@ -655,7 +712,7 @@ pub async fn launch_minecraft(
         };
         if let Some((host, port)) = original
             && let Err(e) = (JoinLogEntry {
-                profile_path: profile.path.clone(),
+                instance_id: instance.id.clone(),
                 host,
                 port,
                 join_time: Utc::now(),
@@ -792,11 +849,11 @@ pub async fn launch_minecraft(
             .await?;
     }
 
-    crate::api::profile::edit(&profile.path, |prof| {
-        prof.last_played = Some(Utc::now());
-
-        async { Ok(()) }
-    })
+    crate::state::instances::commands::set_instance_last_played(
+        &instance.id,
+        Utc::now(),
+        &state.pool,
+    )
     .await?;
 
     // If in tauri, and the 'minimize on launch' setting is enabled, minimize the window
@@ -815,12 +872,12 @@ pub async fn launch_minecraft(
 
     let _ = state
         .discord_rpc
-        .set_activity(&format!("Playing {}", profile.name), true)
+        .set_activity(&format!("Playing {}", instance.name), true)
         .await;
 
     let _ = state
         .friends_socket
-        .update_status(Some(profile.name.clone()))
+        .update_status(Some(instance.name.clone()))
         .await;
 
     // Create Minecraft child by inserting it into the state
@@ -828,31 +885,32 @@ pub async fn launch_minecraft(
     state
         .process_manager
         .insert_new_process(
-            &profile.path,
+            &instance.id,
+            &instance.path,
+            &instance.name,
             command,
             post_exit_hook,
-            state.directories.profile_logs_dir(&profile.path),
+            state.directories.instance_logs_dir(&instance.path),
             version_info.logging.is_some(),
             main_class_keep_alive,
             rpc_server,
             async |process: &ProcessMetadata, rpc_server| {
                 let process_start_time = process.start_time.to_rfc3339();
-                let profile_created_time = profile.created.to_rfc3339();
-                let profile_modified_time = profile.modified.to_rfc3339();
+                let instance_created_time = instance.created.to_rfc3339();
+                let instance_modified_time = instance.modified.to_rfc3339();
+                let (link_project_id, link_version_id) =
+                    link_project_and_version(&context.link);
                 let system_properties = [
                     ("modrinth.process.startTime", Some(&process_start_time)),
-                    ("modrinth.profile.created", Some(&profile_created_time)),
-                    ("modrinth.profile.icon", profile.icon_path.as_ref()),
-                    (
-                        "modrinth.profile.link.project",
-                        profile.linked_data.as_ref().map(|x| &x.project_id),
-                    ),
+                    ("modrinth.profile.created", Some(&instance_created_time)),
+                    ("modrinth.profile.icon", instance.icon_path.as_ref()),
+                    ("modrinth.profile.link.project", link_project_id),
+                    ("modrinth.profile.link.version", link_version_id),
                     (
-                        "modrinth.profile.link.version",
-                        profile.linked_data.as_ref().map(|x| &x.version_id),
+                        "modrinth.profile.modified",
+                        Some(&instance_modified_time),
                     ),
-                    ("modrinth.profile.modified", Some(&profile_modified_time)),
-                    ("modrinth.profile.name", Some(&profile.name)),
+                    ("modrinth.profile.name", Some(&instance.name)),
                 ];
                 for (key, value) in system_properties {
                     let Some(value) = value else {
diff --git a/packages/app-lib/src/state/attached_world_data.rs b/packages/app-lib/src/state/attached_world_data.rs
index 8042dc5fbf..4eace1a977 100644
--- a/packages/app-lib/src/state/attached_world_data.rs
+++ b/packages/app-lib/src/state/attached_world_data.rs
@@ -11,83 +11,99 @@ pub struct AttachedWorldData {
 
 impl AttachedWorldData {
     pub async fn get_for_world(
-        instance: &str,
+        instance_id: &str,
         world_type: WorldType,
         world_id: &str,
         exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
     ) -> crate::Result<Option<Self>> {
         let world_type = world_type.as_str();
 
-        let attached_data = sqlx::query!(
-            "
-            SELECT display_status, project_id, content_kind
-            FROM attached_world_data
-            WHERE profile_path = $1 and world_type = $2 and world_id = $3
-            ",
-            instance,
-            world_type,
-            world_id
-        )
-        .fetch_optional(exec)
-        .await?;
+        let attached_data =
+            sqlx::query_as::<_, (String, Option<String>, Option<String>)>(
+                "
+			SELECT display_status, project_id, content_kind
+			FROM attached_world_data
+			WHERE instance_id = ? and world_type = ? and world_id = ?
+			",
+            )
+            .bind(instance_id)
+            .bind(world_type)
+            .bind(world_id)
+            .fetch_optional(exec)
+            .await?;
 
-        Ok(attached_data.map(|x| AttachedWorldData {
-            display_status: DisplayStatus::from_string(&x.display_status),
-            project_id: x.project_id,
-            content_kind: x.content_kind,
-        }))
+        Ok(
+            attached_data.map(|(display_status, project_id, content_kind)| {
+                AttachedWorldData {
+                    display_status: DisplayStatus::from_string(&display_status),
+                    project_id,
+                    content_kind,
+                }
+            }),
+        )
     }
 
     pub async fn get_all_for_instance(
-        instance: &str,
+        instance_id: &str,
         exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
     ) -> crate::Result<HashMap<(WorldType, String), Self>> {
-        let attached_data = sqlx::query!(
+        let attached_data = sqlx::query_as::<
+            _,
+            (String, String, String, Option<String>, Option<String>),
+        >(
             "
-            SELECT world_type, world_id, display_status, project_id, content_kind
-            FROM attached_world_data
-            WHERE profile_path = $1
-            ",
-            instance
+			SELECT world_type, world_id, display_status, project_id, content_kind
+			FROM attached_world_data
+			WHERE instance_id = ?
+			",
         )
+        .bind(instance_id)
         .fetch_all(exec)
         .await?;
 
         Ok(attached_data
             .into_iter()
-            .map(|x| {
-                let world_type = WorldType::from_string(&x.world_type);
-                let display_status =
-                    DisplayStatus::from_string(&x.display_status);
-                (
-                    (world_type, x.world_id),
-                    AttachedWorldData {
-                        display_status,
-                        project_id: x.project_id,
-                        content_kind: x.content_kind,
-                    },
-                )
-            })
+            .map(
+                |(
+                    world_type,
+                    world_id,
+                    display_status,
+                    project_id,
+                    content_kind,
+                )| {
+                    let world_type = WorldType::from_string(&world_type);
+                    let display_status =
+                        DisplayStatus::from_string(&display_status);
+                    (
+                        (world_type, world_id),
+                        AttachedWorldData {
+                            display_status,
+                            project_id,
+                            content_kind,
+                        },
+                    )
+                },
+            )
             .collect())
     }
 
     pub async fn remove_for_world(
-        instance: &str,
+        instance_id: &str,
         world_type: WorldType,
         world_id: &str,
         exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
     ) -> crate::Result<()> {
         let world_type = world_type.as_str();
 
-        sqlx::query!(
+        sqlx::query(
             "
-            DELETE FROM attached_world_data
-            WHERE profile_path = $1 and world_type = $2 and world_id = $3
-            ",
-            instance,
-            world_type,
-            world_id
+			DELETE FROM attached_world_data
+			WHERE instance_id = ? and world_type = ? and world_id = ?
+			",
         )
+        .bind(instance_id)
+        .bind(world_type)
+        .bind(world_id)
         .execute(exec)
         .await?;
 
@@ -99,27 +115,30 @@ macro_rules! attached_data_setter {
     ($parameter:ident: $parameter_type:ty, $column:expr $(=> $adapter:expr)?) => {
         paste! {
             pub async fn [<set_ $parameter>](
-                instance: &str,
-                world_type: WorldType,
-                world_id: &str,
+				instance_id: &str,
+				world_type: WorldType,
+				world_id: &str,
                 $parameter: $parameter_type,
                 exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
             ) -> crate::Result<()> {
                 let world_type = world_type.as_str();
                 $(let $parameter = $adapter;)?
 
-                sqlx::query!(
-                    "INSERT INTO attached_world_data (profile_path, world_type, world_id, " + $column + ")\n" +
-                    "VALUES ($1, $2, $3, $4)\n" +
-                    "ON CONFLICT (profile_path, world_type, world_id) DO UPDATE\n" +
-                    "    SET " + $column + " = $4",
-                    instance,
-                    world_type,
-                    world_id,
-                    $parameter
-                )
-                .execute(exec)
-                .await?;
+				let query = format!(
+					"INSERT INTO attached_world_data (instance_id, world_type, world_id, {0})\n\
+					VALUES (?, ?, ?, ?)\n\
+					ON CONFLICT (instance_id, world_type, world_id) DO UPDATE\n\
+						SET {0} = excluded.{0}",
+					$column,
+				);
+
+				sqlx::query(&query)
+				.bind(instance_id)
+				.bind(world_type)
+				.bind(world_id)
+				.bind($parameter)
+				.execute(exec)
+				.await?;
 
                 Ok(())
             }
diff --git a/packages/app-lib/src/state/cache.rs b/packages/app-lib/src/state/cache.rs
index ee180d32e4..e04104cbae 100644
--- a/packages/app-lib/src/state/cache.rs
+++ b/packages/app-lib/src/state/cache.rs
@@ -1495,16 +1495,16 @@ impl CachedEntry {
             CacheValueType::FileHash => {
                 // TODO: Replace state call here
                 let state = crate::State::get().await?;
-                let profiles_dir = state.directories.profiles_dir();
+                let instances_dir = state.directories.instances_dir();
 
                 async fn hash_file(
-                    profiles_dir: &Path,
+                    instances_dir: &Path,
                     key: String,
                 ) -> crate::Result<(CachedEntry, bool)> {
                     let path =
                         key.split_once('-').map(|x| x.1).unwrap_or_default();
 
-                    let full_path = profiles_dir.join(path);
+                    let full_path = instances_dir.join(path);
 
                     let mut file = tokio::fs::File::open(&full_path).await?;
                     let size = file.metadata().await?.len();
@@ -1541,7 +1541,7 @@ impl CachedEntry {
 
                 use futures::stream::StreamExt;
                 let results: Vec<_> = futures::stream::iter(keys)
-                    .map(|x| hash_file(&profiles_dir, x.to_string()))
+                    .map(|x| hash_file(&instances_dir, x.to_string()))
                     .buffer_unordered(64) // hash 64 files at once
                     .collect::<Vec<_>>()
                     .await
@@ -2120,7 +2120,7 @@ impl CachedEntry {
 
 pub async fn cache_file_hash(
     bytes: bytes::Bytes,
-    profile_path: &str,
+    instance_id: &str,
     path: &str,
     known_hash: Option<&str>,
     project_type: Option<ProjectType>,
@@ -2136,7 +2136,7 @@ pub async fn cache_file_hash(
     };
 
     cache_file_hash_metadata(
-        profile_path,
+        instance_id,
         path,
         size as u64,
         hash,
@@ -2148,7 +2148,7 @@ pub async fn cache_file_hash(
 }
 
 pub async fn cache_file_hash_metadata(
-    profile_path: &str,
+    instance_id: &str,
     path: &str,
     size: u64,
     hash: String,
@@ -2167,7 +2167,7 @@ pub async fn cache_file_hash_metadata(
     // Streamed extraction already computed these values, so avoid buffering the file just to cache them.
     CachedEntry::upsert_many(
         &[CacheValue::FileHash(CachedFileHash {
-            path: format!("{profile_path}/{path}"),
+            path: format!("{instance_id}/{path}"),
             size,
             hash,
             project_type,
diff --git a/packages/app-lib/src/state/dirs.rs b/packages/app-lib/src/state/dirs.rs
index 50f22c2dba..a5fdd19bc4 100644
--- a/packages/app-lib/src/state/dirs.rs
+++ b/packages/app-lib/src/state/dirs.rs
@@ -2,7 +2,7 @@
 use crate::LoadingBarType;
 use crate::event::emit::{emit_loading, init_loading};
 use crate::state::LAUNCHER_STATE;
-use crate::state::{JavaVersion, Profile, Settings};
+use crate::state::{JavaVersion, Settings};
 use crate::util::fetch::IoSemaphore;
 use dashmap::DashSet;
 use std::path::{Path, PathBuf};
@@ -11,7 +11,7 @@ use tokio::fs;
 
 pub const CACHES_FOLDER_NAME: &str = "caches";
 pub const LAUNCHER_LOGS_FOLDER_NAME: &str = "launcher_logs";
-pub const PROFILES_FOLDER_NAME: &str = "profiles";
+pub const INSTANCES_FOLDER_NAME: &str = "profiles";
 pub const METADATA_FOLDER_NAME: &str = "meta";
 
 #[derive(Debug)]
@@ -148,22 +148,24 @@ impl DirectoryInfo {
         self.config_dir.join("icons")
     }
 
-    /// Get the profiles directory for created profiles
+    /// Get the instances directory
     #[inline]
-    pub fn profiles_dir(&self) -> PathBuf {
-        self.config_dir.join(PROFILES_FOLDER_NAME)
+    pub fn instances_dir(&self) -> PathBuf {
+        self.config_dir.join(INSTANCES_FOLDER_NAME)
     }
 
-    /// Gets the logs dir for a given profile
+    /// Gets the logs dir for a given instance path
     #[inline]
-    pub fn profile_logs_dir(&self, profile_path: &str) -> PathBuf {
-        self.profiles_dir().join(profile_path).join("logs")
+    pub fn instance_logs_dir(&self, instance_path: &str) -> PathBuf {
+        self.instances_dir().join(instance_path).join("logs")
     }
 
-    /// Gets the crash reports dir for a given profile
+    /// Gets the crash reports dir for a given instance path
     #[inline]
-    pub fn crash_reports_dir(&self, profile_path: &str) -> PathBuf {
-        self.profiles_dir().join(profile_path).join("crash-reports")
+    pub fn crash_reports_dir(&self, instance_path: &str) -> PathBuf {
+        self.instances_dir()
+            .join(instance_path)
+            .join("crash-reports")
     }
 
     #[inline]
@@ -265,7 +267,7 @@ impl DirectoryInfo {
 
                 const MOVE_DIRS: &[&str] = &[
                     CACHES_FOLDER_NAME,
-                    PROFILES_FOLDER_NAME,
+                    INSTANCES_FOLDER_NAME,
                     METADATA_FOLDER_NAME,
                 ];
 
@@ -472,27 +474,32 @@ impl DirectoryInfo {
                     java_version.upsert(exec).await?
                 }
 
-                let profiles = Profile::get_all(exec).await?;
-
-                for mut profile in profiles {
-                    profile.icon_path = profile.icon_path.map(|x| {
-                        x.replace(
-                            prev_custom_dir,
-                            new_dir
-                                .trim_end_matches('/')
-                                .trim_end_matches('\\'),
-                        )
-                    });
-                    profile.java_path = profile.java_path.map(|x| {
-                        x.replace(
-                            prev_custom_dir,
-                            new_dir
-                                .trim_end_matches('/')
-                                .trim_end_matches('\\'),
-                        )
-                    });
-                    profile.upsert(exec).await?;
-                }
+                let new_dir = new_dir
+                    .trim_end_matches('/')
+                    .trim_end_matches('\\')
+                    .to_string();
+                sqlx::query(
+                    "
+                    UPDATE instances
+                    SET icon_path = replace(icon_path, ?, ?)
+                    WHERE icon_path IS NOT NULL
+                    ",
+                )
+                .bind(prev_custom_dir)
+                .bind(&new_dir)
+                .execute(exec)
+                .await?;
+                sqlx::query(
+                    "
+                    UPDATE instance_launch_overrides
+                    SET java_path = replace(java_path, ?, ?)
+                    WHERE java_path IS NOT NULL
+                    ",
+                )
+                .bind(prev_custom_dir)
+                .bind(&new_dir)
+                .execute(exec)
+                .await?;
             }
 
             settings.custom_dir = Some(new_dir);
diff --git a/packages/app-lib/src/state/discord.rs b/packages/app-lib/src/state/discord.rs
index 2704cc6def..6fcef793af 100644
--- a/packages/app-lib/src/state/discord.rs
+++ b/packages/app-lib/src/state/discord.rs
@@ -7,7 +7,6 @@ use discord_rich_presence::{
 use tokio::sync::RwLock;
 
 use crate::State;
-use crate::state::Profile;
 
 pub struct DiscordGuard {
     client: Arc<RwLock<DiscordIpcClient>>,
@@ -134,17 +133,13 @@ impl DiscordGuard {
             return self.clear_activity(true).await;
         }
 
-        let running_profiles = state.process_manager.get_all();
-        if let Some(existing_child) = running_profiles.first() {
-            let prof =
-                Profile::get(&existing_child.profile_path, &state.pool).await?;
-            if let Some(prof) = prof {
-                self.set_activity(
-                    &format!("Playing {}", prof.name),
-                    reconnect_if_fail,
-                )
-                .await?;
-            }
+        let running_instances = state.process_manager.get_all();
+        if let Some(existing_child) = running_instances.first() {
+            self.set_activity(
+                &format!("Playing {}", existing_child.instance_name),
+                reconnect_if_fail,
+            )
+            .await?;
         } else {
             self.set_activity("Idling...", reconnect_if_fail).await?;
         }
diff --git a/packages/app-lib/src/state/friends.rs b/packages/app-lib/src/state/friends.rs
index 3f857ff1d7..9e59febebd 100644
--- a/packages/app-lib/src/state/friends.rs
+++ b/packages/app-lib/src/state/friends.rs
@@ -3,7 +3,7 @@ use crate::data::ModrinthCredentials;
 use crate::event::FriendPayload;
 use crate::event::emit::{emit_friend, emit_notification};
 use crate::state::tunnel::InternalTunnelSocket;
-use crate::state::{ProcessManager, Profile, TunnelSocket};
+use crate::state::{ProcessManager, TunnelSocket};
 use crate::util::fetch::{FetchSemaphore, fetch_advanced, fetch_json};
 use ariadne::ids::UserId;
 use ariadne::networking::message::{
@@ -101,13 +101,9 @@ impl FriendsSocket {
                     }
 
                     if let Some(process) = process_manager.get_all().first() {
-                        let profile =
-                            Profile::get(&process.profile_path, exec).await?;
-
-                        if let Some(profile) = profile {
-                            let _ =
-                                self.update_status(Some(profile.name)).await;
-                        }
+                        let _ = self
+                            .update_status(Some(process.instance_name.clone()))
+                            .await;
                     }
 
                     let write_handle = self.write.clone();
@@ -312,11 +308,13 @@ impl FriendsSocket {
     #[tracing::instrument(skip(self))]
     pub async fn update_status(
         &self,
-        profile_name: Option<String>,
+        instance_name: Option<String>,
     ) -> crate::Result<()> {
         Self::send_message(
             &self.write,
-            ClientToServerMessage::StatusUpdate { profile_name },
+            ClientToServerMessage::StatusUpdate {
+                profile_name: instance_name,
+            },
         )
         .await
     }
diff --git a/packages/app-lib/src/state/fs_watcher.rs b/packages/app-lib/src/state/fs_watcher.rs
deleted file mode 100644
index c505d2d9dc..0000000000
--- a/packages/app-lib/src/state/fs_watcher.rs
+++ /dev/null
@@ -1,248 +0,0 @@
-use crate::State;
-use crate::event::ProfilePayloadType;
-use crate::event::emit::{emit_profile, emit_warning};
-use crate::state::{
-    DirectoryInfo, ProfileInstallStage, ProjectType, attached_world_data,
-};
-use crate::worlds::WorldType;
-use notify::{RecommendedWatcher, RecursiveMode};
-use notify_debouncer_mini::{DebounceEventResult, Debouncer, new_debouncer};
-use std::time::Duration;
-use tokio::sync::{RwLock, mpsc::channel};
-
-pub type FileWatcher = RwLock<Debouncer<RecommendedWatcher>>;
-
-pub async fn init_watcher() -> crate::Result<FileWatcher> {
-    let (tx, mut rx) = channel(1);
-
-    let file_watcher = new_debouncer(
-        Duration::from_secs_f32(1.0),
-        move |res: DebounceEventResult| {
-            tx.blocking_send(res).ok();
-        },
-    )?;
-
-    tokio::task::spawn(async move {
-        let span = tracing::span!(tracing::Level::INFO, "init_watcher");
-        tracing::info!(parent: &span, "Initing watcher");
-        while let Some(res) = rx.recv().await {
-            let _span = span.enter();
-
-            match res {
-                Ok(events) => {
-                    let mut visited_profiles = Vec::new();
-
-                    events.iter().for_each(|e| {
-                        let mut profile_path = None;
-
-                        let mut found = false;
-                        for component in e.path.components() {
-                            if found {
-                                profile_path = Some(component.as_os_str());
-                                break;
-                            }
-
-                            if component.as_os_str()
-                                == crate::state::dirs::PROFILES_FOLDER_NAME
-                            {
-                                found = true;
-                            }
-                        }
-
-                        if let Some(profile_path) = profile_path {
-                            let profile_path_str =
-                                profile_path.to_string_lossy().to_string();
-                            let first_file_name = e
-                                .path
-                                .components()
-                                .skip_while(|x| x.as_os_str() != profile_path)
-                                .nth(1)
-                                .map(|x| x.as_os_str());
-                            if first_file_name
-                                .as_ref()
-                                .is_some_and(|x| *x == "crash-reports")
-                                && e.path
-                                    .extension()
-                                    .as_ref()
-                                    .is_some_and(|x| *x == "txt")
-                            {
-                                crash_task(profile_path_str);
-                            } else if !visited_profiles.contains(&profile_path)
-                            {
-                                let event = if first_file_name
-                                    .as_ref()
-                                    .is_some_and(|x| *x == "servers.dat")
-                                {
-                                    Some(ProfilePayloadType::ServersUpdated)
-                                } else if first_file_name.as_ref().is_some_and(|x| {
-                                    *x == "saves"
-                                        && e.path
-                                            .file_name()
-                                            .as_ref()
-                                            .is_some_and(|x| *x == "level.dat")
-                                }) {
-                                    tracing::info!(
-                                        "World updated: {}",
-                                        e.path.display()
-                                    );
-                                    let world = e
-                                        .path
-                                        .parent()
-                                        .unwrap()
-                                        .file_name()
-                                        .unwrap()
-                                        .to_string_lossy()
-                                        .to_string();
-                                    if !e.path.is_file() {
-                                        let profile_path_str = profile_path_str.clone();
-                                        let world = world.clone();
-                                        tokio::spawn(async move {
-                                            if let Ok(state) = State::get().await
-                                                && let Err(e) = attached_world_data::AttachedWorldData::remove_for_world(
-                                                    &profile_path_str,
-                                                    WorldType::Singleplayer,
-                                                    &world,
-                                                    &state.pool
-                                                ).await {
-                                                    tracing::warn!("Failed to remove AttachedWorldData for '{world}': {e}")
-                                                }
-                                        });
-                                    }
-                                    Some(ProfilePayloadType::WorldUpdated { world })
-                                } else if first_file_name
-                                    .as_ref()
-                                    .is_none_or(|x| *x != "saves")
-                                {
-                                    Some(ProfilePayloadType::Synced)
-                                } else {
-                                    None
-                                };
-                                if let Some(event) = event {
-                                    tokio::spawn(async move {
-                                        let _ = emit_profile(
-                                            &profile_path_str,
-                                            event,
-                                        )
-                                        .await;
-                                    });
-                                    visited_profiles.push(profile_path);
-                                }
-                            }
-                        }
-                    });
-                }
-                Err(error) => tracing::warn!("Unable to watch file: {error}"),
-            }
-        }
-    });
-
-    Ok(RwLock::new(file_watcher))
-}
-
-/// Watches all existing profiles
-pub(crate) async fn watch_profiles_init(
-    watcher: &FileWatcher,
-    dirs: &DirectoryInfo,
-) {
-    let Ok(mut profiles_dir) = tokio::fs::read_dir(dirs.profiles_dir()).await
-    else {
-        return;
-    };
-
-    while let Ok(Some(profile_dir)) = profiles_dir.next_entry().await {
-        let file_name = profile_dir.file_name();
-        let file_name = file_name.to_string_lossy();
-        if file_name.starts_with(".DS_Store") {
-            continue;
-        }
-
-        watch_profile(&file_name, watcher, dirs).await;
-    }
-}
-
-pub(crate) async fn watch_profile(
-    profile_path: &str,
-    watcher: &FileWatcher,
-    dirs: &DirectoryInfo,
-) {
-    let profile_path = dirs.profiles_dir().join(profile_path);
-
-    let Ok(metadata) = tokio::fs::metadata(&profile_path).await else {
-        return;
-    };
-
-    if !metadata.is_dir() {
-        return;
-    }
-
-    let mut to_watch = Vec::new();
-    for sub_path in ProjectType::iterator()
-        .map(|x| x.get_folder())
-        .chain(["crash-reports", "saves"])
-    {
-        let full_path = profile_path.join(sub_path);
-
-        let meta = tokio::fs::symlink_metadata(&full_path).await;
-        let exists = meta.is_ok();
-        let is_symlink = meta.ok().is_some_and(|m| m.file_type().is_symlink());
-
-        if !exists
-            && !is_symlink
-            && !sub_path.contains(".")
-            && let Err(e) = crate::util::io::create_dir_all(&full_path).await
-        {
-            tracing::error!(
-                "Failed to create directory for watcher {full_path:?}: {e}"
-            );
-            return;
-        }
-
-        to_watch.push(full_path);
-    }
-
-    let mut watcher = watcher.write().await;
-    for full_path in &to_watch {
-        if let Err(e) =
-            watcher.watcher().watch(full_path, RecursiveMode::Recursive)
-        {
-            tracing::error!(
-                "Failed to watch directory for watcher {full_path:?}: {e}"
-            );
-            return;
-        }
-    }
-
-    if let Err(e) = watcher
-        .watcher()
-        .watch(&profile_path, RecursiveMode::NonRecursive)
-    {
-        tracing::error!(
-            "Failed to watch root profile directory for watcher {profile_path:?}: {e}"
-        );
-    }
-}
-
-fn crash_task(path: String) {
-    tokio::task::spawn(async move {
-        let res = async {
-            let profile = crate::api::profile::get(&path).await?;
-
-            if let Some(profile) = profile {
-                // Hide warning if profile is not yet installed
-                if profile.install_stage == ProfileInstallStage::Installed {
-                    emit_warning(&format!("Profile {} has crashed! Visit the logs page to see a crash report.", profile.name)).await?;
-                }
-            }
-
-            Ok::<(), crate::Error>(())
-        }
-            .await;
-
-        match res {
-            Ok(()) => {}
-            Err(err) => {
-                tracing::warn!("Unable to send crash report to frontend: {err}")
-            }
-        };
-    });
-}
diff --git a/packages/app-lib/src/state/instance_types.rs b/packages/app-lib/src/state/instance_types.rs
new file mode 100644
index 0000000000..2641e47354
--- /dev/null
+++ b/packages/app-lib/src/state/instance_types.rs
@@ -0,0 +1,215 @@
+use serde::{Deserialize, Serialize};
+use std::path::Path;
+
+#[derive(Serialize, Deserialize, Clone, Copy, Debug, Eq, PartialEq)]
+#[serde(rename_all = "snake_case")]
+pub enum InstanceInstallStage {
+    Installed,
+    MinecraftInstalling,
+    PackInstalled,
+    PackInstalling,
+    NotInstalled,
+}
+
+impl InstanceInstallStage {
+    pub fn as_str(&self) -> &'static str {
+        match *self {
+            Self::Installed => "installed",
+            Self::MinecraftInstalling => "minecraft_installing",
+            Self::PackInstalled => "pack_installed",
+            Self::PackInstalling => "pack_installing",
+            Self::NotInstalled => "not_installed",
+        }
+    }
+
+    pub fn from_str(val: &str) -> Self {
+        match val {
+            "installed" => Self::Installed,
+            "minecraft_installing" => Self::MinecraftInstalling,
+            "installing" => Self::MinecraftInstalling,
+            "pack_installed" => Self::PackInstalled,
+            "pack_installing" => Self::PackInstalling,
+            "not_installed" => Self::NotInstalled,
+            _ => Self::NotInstalled,
+        }
+    }
+}
+
+#[derive(
+    Serialize, Deserialize, Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd,
+)]
+#[serde(rename_all = "snake_case")]
+pub enum LauncherFeatureVersion {
+    None,
+    MigratedServerLastPlayTime,
+    MigratedLaunchHooks,
+}
+
+impl LauncherFeatureVersion {
+    pub const MOST_RECENT: Self = Self::MigratedLaunchHooks;
+
+    pub fn as_str(&self) -> &'static str {
+        match *self {
+            Self::None => "none",
+            Self::MigratedServerLastPlayTime => {
+                "migrated_server_last_play_time"
+            }
+            Self::MigratedLaunchHooks => "migrated_launch_hooks",
+        }
+    }
+
+    pub fn from_str(val: &str) -> Self {
+        match val {
+            "none" => Self::None,
+            "migrated_server_last_play_time" => {
+                Self::MigratedServerLastPlayTime
+            }
+            "migrated_launch_hooks" => Self::MigratedLaunchHooks,
+            _ => Self::None,
+        }
+    }
+}
+
+#[derive(Debug, Eq, PartialEq, Clone, Copy, Deserialize, Serialize)]
+#[serde(rename_all = "lowercase")]
+pub enum ModLoader {
+    Vanilla,
+    Forge,
+    Fabric,
+    Quilt,
+    NeoForge,
+}
+
+impl ModLoader {
+    pub fn as_str(&self) -> &'static str {
+        match *self {
+            Self::Vanilla => "vanilla",
+            Self::Forge => "forge",
+            Self::Fabric => "fabric",
+            Self::Quilt => "quilt",
+            Self::NeoForge => "neoforge",
+        }
+    }
+
+    pub fn as_meta_str(&self) -> &'static str {
+        match *self {
+            Self::Vanilla => "vanilla",
+            Self::Forge => "forge",
+            Self::Fabric => "fabric",
+            Self::Quilt => "quilt",
+            Self::NeoForge => "neo",
+        }
+    }
+
+    pub fn from_string(val: &str) -> Self {
+        match val {
+            "vanilla" => Self::Vanilla,
+            "forge" => Self::Forge,
+            "fabric" => Self::Fabric,
+            "quilt" => Self::Quilt,
+            "neoforge" => Self::NeoForge,
+            _ => Self::Vanilla,
+        }
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct ContentFile {
+    pub hash: String,
+    pub file_name: String,
+    pub size: u64,
+    pub metadata: Option<FileMetadata>,
+    pub update_version_id: Option<String>,
+    pub project_type: ProjectType,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct FileMetadata {
+    pub project_id: String,
+    pub version_id: String,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, Copy, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum ProjectType {
+    Mod,
+    DataPack,
+    ResourcePack,
+    ShaderPack,
+}
+
+impl ProjectType {
+    pub fn get_from_loaders(loaders: Vec<String>) -> Option<Self> {
+        if loaders
+            .iter()
+            .any(|x| ["fabric", "forge", "quilt", "neoforge"].contains(&&**x))
+        {
+            Some(ProjectType::Mod)
+        } else if loaders.iter().any(|x| x == "datapack") {
+            Some(ProjectType::DataPack)
+        } else if loaders.iter().any(|x| ["iris", "optifine"].contains(&&**x)) {
+            Some(ProjectType::ShaderPack)
+        } else if loaders
+            .iter()
+            .any(|x| ["vanilla", "canvas", "minecraft"].contains(&&**x))
+        {
+            Some(ProjectType::ResourcePack)
+        } else {
+            None
+        }
+    }
+
+    pub fn get_from_parent_folder(path: impl AsRef<Path>) -> Option<Self> {
+        match path
+            .as_ref()
+            .parent()?
+            .file_name()?
+            .to_str()
+            .unwrap_or_default()
+        {
+            "mods" => Some(ProjectType::Mod),
+            "datapacks" => Some(ProjectType::DataPack),
+            "resourcepacks" => Some(ProjectType::ResourcePack),
+            "shaderpacks" => Some(ProjectType::ShaderPack),
+            _ => None,
+        }
+    }
+
+    pub fn get_name(&self) -> &'static str {
+        match self {
+            ProjectType::Mod => "mod",
+            ProjectType::DataPack => "datapack",
+            ProjectType::ResourcePack => "resourcepack",
+            ProjectType::ShaderPack => "shader",
+        }
+    }
+
+    pub fn get_folder(&self) -> &'static str {
+        match self {
+            ProjectType::Mod => "mods",
+            ProjectType::DataPack => "datapacks",
+            ProjectType::ResourcePack => "resourcepacks",
+            ProjectType::ShaderPack => "shaderpacks",
+        }
+    }
+
+    pub fn get_loaders(&self) -> &'static [&'static str] {
+        match self {
+            ProjectType::Mod => &["fabric", "forge", "quilt", "neoforge"],
+            ProjectType::DataPack => &["datapack"],
+            ProjectType::ResourcePack => &["vanilla", "canvas", "minecraft"],
+            ProjectType::ShaderPack => &["iris", "optifine"],
+        }
+    }
+
+    pub fn iterator() -> impl Iterator<Item = ProjectType> {
+        [
+            ProjectType::Mod,
+            ProjectType::DataPack,
+            ProjectType::ResourcePack,
+            ProjectType::ShaderPack,
+        ]
+        .iter()
+        .copied()
+    }
+}
diff --git a/packages/app-lib/src/state/instances/adapters/filesystem.rs b/packages/app-lib/src/state/instances/adapters/filesystem.rs
new file mode 100644
index 0000000000..df81f0c3a8
--- /dev/null
+++ b/packages/app-lib/src/state/instances/adapters/filesystem.rs
@@ -0,0 +1,88 @@
+use crate::state::ProjectType;
+use crate::util::io::{self, IOError};
+use std::path::{Path, PathBuf};
+
+#[derive(Clone, Debug)]
+pub(crate) struct ScannedContentFile {
+    pub relative_path: String,
+    pub file_name: String,
+    pub enabled: bool,
+    pub size: u64,
+    pub hash_cache_key: String,
+}
+
+pub(crate) fn scan_content_files(
+    instances_dir: &Path,
+    instance_path: &str,
+) -> crate::Result<Vec<ScannedContentFile>> {
+    let instance_dir = io::canonicalize(instances_dir.join(instance_path))?;
+    let mut files = Vec::new();
+
+    for project_type in ProjectType::iterator() {
+        let folder = project_type.get_folder();
+        let folder_path = instance_dir.join(folder);
+
+        if !folder_path.exists() {
+            continue;
+        }
+
+        for entry in std::fs::read_dir(&folder_path)
+            .map_err(|err| IOError::with_path(err, &folder_path))?
+        {
+            let path = entry.map_err(IOError::from)?.path();
+            if !path.is_file() {
+                continue;
+            }
+
+            let Some(file_name) =
+                path.file_name().and_then(|value| value.to_str())
+            else {
+                continue;
+            };
+
+            if !is_scannable_project_file(project_type, file_name) {
+                continue;
+            }
+
+            let size = path.metadata().map_err(IOError::from)?.len();
+            let relative_path = format!("{folder}/{file_name}");
+
+            files.push(ScannedContentFile {
+                relative_path,
+                file_name: file_name.to_string(),
+                enabled: !file_name.ends_with(".disabled"),
+                size,
+                hash_cache_key: format!(
+                    "{size}-{instance_path}/{folder}/{file_name}"
+                ),
+            });
+        }
+    }
+
+    Ok(files)
+}
+
+pub(crate) fn project_type_from_relative_path(
+    relative_path: &str,
+) -> Option<ProjectType> {
+    ProjectType::get_from_parent_folder(PathBuf::from(relative_path))
+}
+
+fn is_scannable_project_file(
+    project_type: ProjectType,
+    file_name: &str,
+) -> bool {
+    let Some(extension) = Path::new(file_name.trim_end_matches(".disabled"))
+        .extension()
+        .and_then(|ext| ext.to_str())
+    else {
+        return false;
+    };
+
+    match project_type {
+        ProjectType::Mod => extension.eq_ignore_ascii_case("jar"),
+        ProjectType::DataPack
+        | ProjectType::ResourcePack
+        | ProjectType::ShaderPack => extension.eq_ignore_ascii_case("zip"),
+    }
+}
diff --git a/packages/app-lib/src/state/instances/adapters/mod.rs b/packages/app-lib/src/state/instances/adapters/mod.rs
new file mode 100644
index 0000000000..9682edda16
--- /dev/null
+++ b/packages/app-lib/src/state/instances/adapters/mod.rs
@@ -0,0 +1,2 @@
+pub(crate) mod filesystem;
+pub(crate) mod sqlite;
diff --git a/packages/app-lib/src/state/instances/adapters/sqlite/content_rows.rs b/packages/app-lib/src/state/instances/adapters/sqlite/content_rows.rs
new file mode 100644
index 0000000000..8287e197ba
--- /dev/null
+++ b/packages/app-lib/src/state/instances/adapters/sqlite/content_rows.rs
@@ -0,0 +1,895 @@
+#![allow(dead_code)]
+
+use crate::state::instances::{
+    ContentEntry, ContentRequirement, ContentSet, ContentSetRemoteRef,
+    ContentSetRemoteRefType, ContentSetStatus, ContentSetSyncProvider,
+    ContentSetSyncState, ContentSetSyncStatus, ContentSourceKind,
+    ContentUpdateCheck, InstanceFile,
+};
+use crate::state::{ModLoader, ProjectType, ReleaseChannel};
+use chrono::{DateTime, TimeZone, Utc};
+use sqlx::{Executor, Sqlite, SqlitePool, Transaction};
+use uuid::Uuid;
+
+#[derive(Debug, sqlx::FromRow)]
+pub(crate) struct ContentSetRow {
+    pub id: String,
+    pub instance_id: String,
+    pub name: String,
+    pub source_kind: String,
+    pub status: String,
+    pub game_version: String,
+    pub protocol_version: Option<i64>,
+    pub loader: String,
+    pub loader_version: Option<String>,
+    pub created: i64,
+    pub modified: i64,
+}
+
+impl TryFrom<ContentSetRow> for ContentSet {
+    type Error = crate::Error;
+
+    fn try_from(row: ContentSetRow) -> crate::Result<Self> {
+        Ok(Self {
+            id: row.id,
+            instance_id: row.instance_id,
+            name: row.name,
+            source_kind: ContentSourceKind::from_str(&row.source_kind)?,
+            status: ContentSetStatus::from_str(&row.status)?,
+            game_version: row.game_version,
+            protocol_version: row.protocol_version.map(|value| value as u32),
+            loader: ModLoader::from_string(&row.loader),
+            loader_version: row.loader_version,
+            created: timestamp(row.created),
+            modified: timestamp(row.modified),
+        })
+    }
+}
+
+#[derive(Debug, sqlx::FromRow)]
+pub(crate) struct ContentSetRemoteRefRow {
+    pub content_set_id: String,
+    pub ref_type: String,
+    pub ref_id: String,
+}
+
+impl TryFrom<ContentSetRemoteRefRow> for ContentSetRemoteRef {
+    type Error = crate::Error;
+
+    fn try_from(row: ContentSetRemoteRefRow) -> crate::Result<Self> {
+        Ok(Self {
+            content_set_id: row.content_set_id,
+            ref_type: ContentSetRemoteRefType::from_str(&row.ref_type)?,
+            ref_id: row.ref_id,
+        })
+    }
+}
+
+#[derive(Debug, sqlx::FromRow)]
+pub(crate) struct ContentSetSyncStateRow {
+    pub content_set_id: String,
+    pub provider: String,
+    pub applied_update_id: Option<String>,
+    pub latest_available_update_id: Option<String>,
+    pub checked_at: Option<i64>,
+    pub status: String,
+}
+
+impl TryFrom<ContentSetSyncStateRow> for ContentSetSyncState {
+    type Error = crate::Error;
+
+    fn try_from(row: ContentSetSyncStateRow) -> crate::Result<Self> {
+        Ok(Self {
+            content_set_id: row.content_set_id,
+            provider: ContentSetSyncProvider::from_str(&row.provider)?,
+            applied_update_id: row.applied_update_id,
+            latest_available_update_id: row.latest_available_update_id,
+            checked_at: row.checked_at.and_then(optional_timestamp),
+            status: ContentSetSyncStatus::from_str(&row.status)?,
+        })
+    }
+}
+
+#[derive(Debug, sqlx::FromRow)]
+pub(crate) struct InstanceFileRow {
+    pub id: String,
+    pub instance_id: String,
+    pub relative_path: String,
+    pub file_name: String,
+    pub enabled: i64,
+    pub sha1: String,
+    pub size: i64,
+    pub missing: i64,
+    pub added_at: i64,
+    pub modified_at: i64,
+}
+
+impl TryFrom<InstanceFileRow> for InstanceFile {
+    type Error = crate::Error;
+
+    fn try_from(row: InstanceFileRow) -> crate::Result<Self> {
+        Ok(Self {
+            id: row.id,
+            instance_id: row.instance_id,
+            relative_path: row.relative_path,
+            file_name: row.file_name,
+            enabled: row.enabled == 1,
+            sha1: row.sha1,
+            size: unsigned(row.size, "size")?,
+            missing: row.missing == 1,
+            added_at: timestamp(row.added_at),
+            modified_at: timestamp(row.modified_at),
+        })
+    }
+}
+
+#[derive(Debug, sqlx::FromRow)]
+pub(crate) struct ContentEntryRow {
+    pub id: String,
+    pub instance_id: String,
+    pub content_set_id: String,
+    pub file_id: Option<String>,
+    pub project_type: String,
+    pub project_id: Option<String>,
+    pub version_id: Option<String>,
+    pub source_kind: String,
+    pub server_requirement: String,
+    pub client_requirement: String,
+    pub enabled: i64,
+    pub added_at: i64,
+    pub modified_at: i64,
+}
+
+impl TryFrom<ContentEntryRow> for ContentEntry {
+    type Error = crate::Error;
+
+    fn try_from(row: ContentEntryRow) -> crate::Result<Self> {
+        Ok(Self {
+            id: row.id,
+            instance_id: row.instance_id,
+            content_set_id: row.content_set_id,
+            file_id: row.file_id,
+            project_type: project_type_from_str(&row.project_type)?,
+            project_id: row.project_id,
+            version_id: row.version_id,
+            source_kind: ContentSourceKind::from_str(&row.source_kind)?,
+            server_requirement: ContentRequirement::from_str(
+                &row.server_requirement,
+            )?,
+            client_requirement: ContentRequirement::from_str(
+                &row.client_requirement,
+            )?,
+            enabled: row.enabled == 1,
+            added_at: timestamp(row.added_at),
+            modified_at: timestamp(row.modified_at),
+        })
+    }
+}
+
+#[derive(Debug, sqlx::FromRow)]
+pub(crate) struct ContentUpdateCheckRow {
+    pub content_entry_id: String,
+    pub update_channel: String,
+    pub update_version_id: Option<String>,
+    pub checked_at: i64,
+}
+
+impl From<ContentUpdateCheckRow> for ContentUpdateCheck {
+    fn from(row: ContentUpdateCheckRow) -> Self {
+        Self {
+            content_entry_id: row.content_entry_id,
+            update_channel: ReleaseChannel::from_key(&row.update_channel),
+            update_version_id: row.update_version_id,
+            checked_at: timestamp(row.checked_at),
+        }
+    }
+}
+
+pub(crate) async fn get_applied_content_set<'e, E>(
+    instance_id: &str,
+    exec: E,
+) -> crate::Result<Option<ContentSet>>
+where
+    E: Executor<'e, Database = Sqlite>,
+{
+    let row = sqlx::query_as::<_, ContentSetRow>(
+        "
+		SELECT cs.*
+		FROM instances i
+		INNER JOIN instance_content_sets cs
+			ON cs.id = i.applied_content_set_id
+		WHERE i.id = ?
+		",
+    )
+    .bind(instance_id)
+    .fetch_optional(exec)
+    .await?;
+
+    row.map(TryInto::try_into).transpose()
+}
+
+pub(crate) async fn get_content_set<'e, E>(
+    content_set_id: &str,
+    exec: E,
+) -> crate::Result<Option<ContentSet>>
+where
+    E: Executor<'e, Database = Sqlite>,
+{
+    let row = sqlx::query_as::<_, ContentSetRow>(
+        "
+		SELECT *
+		FROM instance_content_sets
+		WHERE id = ?
+		",
+    )
+    .bind(content_set_id)
+    .fetch_optional(exec)
+    .await?;
+
+    row.map(TryInto::try_into).transpose()
+}
+
+pub(crate) async fn get_content_sets_for_instance<'e, E>(
+    instance_id: &str,
+    exec: E,
+) -> crate::Result<Vec<ContentSet>>
+where
+    E: Executor<'e, Database = Sqlite>,
+{
+    let rows = sqlx::query_as::<_, ContentSetRow>(
+        "
+		SELECT *
+		FROM instance_content_sets
+		WHERE instance_id = ?
+		ORDER BY created ASC, id ASC
+		",
+    )
+    .bind(instance_id)
+    .fetch_all(exec)
+    .await?;
+
+    rows.into_iter().map(TryInto::try_into).collect()
+}
+
+pub(crate) async fn insert_content_set(
+    content_set: &ContentSet,
+    tx: &mut Transaction<'_, Sqlite>,
+) -> crate::Result<()> {
+    sqlx::query(
+        "
+		INSERT INTO instance_content_sets (
+			id,
+			instance_id,
+			name,
+			source_kind,
+			status,
+			game_version,
+			protocol_version,
+			loader,
+			loader_version,
+			created,
+			modified
+		)
+		VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+		",
+    )
+    .bind(content_set.id.as_str())
+    .bind(content_set.instance_id.as_str())
+    .bind(content_set.name.as_str())
+    .bind(content_set.source_kind.as_str())
+    .bind(content_set.status.as_str())
+    .bind(content_set.game_version.as_str())
+    .bind(content_set.protocol_version.map(|value| value as i64))
+    .bind(content_set.loader.as_str())
+    .bind(content_set.loader_version.as_deref())
+    .bind(content_set.created.timestamp())
+    .bind(content_set.modified.timestamp())
+    .execute(&mut **tx)
+    .await?;
+
+    Ok(())
+}
+
+pub(crate) async fn update_content_set(
+    content_set: &ContentSet,
+    tx: &mut Transaction<'_, Sqlite>,
+) -> crate::Result<()> {
+    sqlx::query(
+        "
+		UPDATE instance_content_sets
+		SET
+			name = ?,
+			source_kind = ?,
+			status = ?,
+			game_version = ?,
+			protocol_version = ?,
+			loader = ?,
+			loader_version = ?,
+			modified = ?
+		WHERE id = ?
+		",
+    )
+    .bind(content_set.name.as_str())
+    .bind(content_set.source_kind.as_str())
+    .bind(content_set.status.as_str())
+    .bind(content_set.game_version.as_str())
+    .bind(content_set.protocol_version.map(|value| value as i64))
+    .bind(content_set.loader.as_str())
+    .bind(content_set.loader_version.as_deref())
+    .bind(content_set.modified.timestamp())
+    .bind(content_set.id.as_str())
+    .execute(&mut **tx)
+    .await?;
+
+    Ok(())
+}
+
+pub(crate) async fn get_content_set_remote_refs<'e, E>(
+    content_set_id: &str,
+    exec: E,
+) -> crate::Result<Vec<ContentSetRemoteRef>>
+where
+    E: Executor<'e, Database = Sqlite>,
+{
+    let rows = sqlx::query_as::<_, ContentSetRemoteRefRow>(
+        "
+		SELECT *
+		FROM instance_content_set_remote_refs
+		WHERE content_set_id = ?
+		ORDER BY ref_type ASC
+		",
+    )
+    .bind(content_set_id)
+    .fetch_all(exec)
+    .await?;
+
+    rows.into_iter().map(TryInto::try_into).collect()
+}
+
+pub(crate) async fn get_content_set_sync_state<'e, E>(
+    content_set_id: &str,
+    exec: E,
+) -> crate::Result<Option<ContentSetSyncState>>
+where
+    E: Executor<'e, Database = Sqlite>,
+{
+    let row = sqlx::query_as::<_, ContentSetSyncStateRow>(
+        "
+		SELECT *
+		FROM instance_content_set_sync_state
+		WHERE content_set_id = ?
+		",
+    )
+    .bind(content_set_id)
+    .fetch_optional(exec)
+    .await?;
+
+    row.map(TryInto::try_into).transpose()
+}
+
+pub(crate) async fn get_instance_files<'e, E>(
+    instance_id: &str,
+    exec: E,
+) -> crate::Result<Vec<InstanceFile>>
+where
+    E: Executor<'e, Database = Sqlite>,
+{
+    let rows = sqlx::query_as::<_, InstanceFileRow>(
+        "
+		SELECT *
+		FROM instance_files
+		WHERE instance_id = ?
+		ORDER BY relative_path ASC
+		",
+    )
+    .bind(instance_id)
+    .fetch_all(exec)
+    .await?;
+
+    rows.into_iter().map(TryInto::try_into).collect()
+}
+
+pub(crate) async fn mark_instance_files_missing(
+    instance_id: &str,
+    tx: &mut Transaction<'_, Sqlite>,
+) -> crate::Result<()> {
+    sqlx::query(
+        "
+		UPDATE instance_files
+		SET
+			missing = 1,
+			modified_at = ?
+		WHERE instance_id = ?
+		",
+    )
+    .bind(Utc::now().timestamp())
+    .bind(instance_id)
+    .execute(&mut **tx)
+    .await?;
+
+    Ok(())
+}
+
+pub(crate) async fn upsert_instance_file(
+    file: &InstanceFile,
+    tx: &mut Transaction<'_, Sqlite>,
+) -> crate::Result<()> {
+    sqlx::query(
+        "
+		INSERT INTO instance_files (
+			id,
+			instance_id,
+			relative_path,
+			file_name,
+			enabled,
+			sha1,
+			size,
+			missing,
+			added_at,
+			modified_at
+		)
+		VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+		ON CONFLICT (instance_id, relative_path) DO UPDATE SET
+			file_name = excluded.file_name,
+			enabled = excluded.enabled,
+			sha1 = excluded.sha1,
+			size = excluded.size,
+			missing = excluded.missing,
+			modified_at = excluded.modified_at
+		",
+    )
+    .bind(file.id.as_str())
+    .bind(file.instance_id.as_str())
+    .bind(file.relative_path.as_str())
+    .bind(file.file_name.as_str())
+    .bind(i64::from(file.enabled))
+    .bind(file.sha1.as_str())
+    .bind(file.size as i64)
+    .bind(i64::from(file.missing))
+    .bind(file.added_at.timestamp())
+    .bind(file.modified_at.timestamp())
+    .execute(&mut **tx)
+    .await?;
+
+    Ok(())
+}
+
+pub(crate) async fn get_content_entries<'e, E>(
+    content_set_id: &str,
+    exec: E,
+) -> crate::Result<Vec<ContentEntry>>
+where
+    E: Executor<'e, Database = Sqlite>,
+{
+    let rows = sqlx::query_as::<_, ContentEntryRow>(
+        "
+		SELECT *
+		FROM instance_content_entries
+		WHERE content_set_id = ?
+		ORDER BY added_at ASC, id ASC
+		",
+    )
+    .bind(content_set_id)
+    .fetch_all(exec)
+    .await?;
+
+    rows.into_iter().map(TryInto::try_into).collect()
+}
+
+pub(crate) async fn get_content_update_check<'e, E>(
+    content_entry_id: &str,
+    exec: E,
+) -> crate::Result<Option<ContentUpdateCheck>>
+where
+    E: Executor<'e, Database = Sqlite>,
+{
+    let row = sqlx::query_as::<_, ContentUpdateCheckRow>(
+        "
+		SELECT *
+		FROM instance_content_update_checks
+		WHERE content_entry_id = ?
+		",
+    )
+    .bind(content_entry_id)
+    .fetch_optional(exec)
+    .await?;
+
+    Ok(row.map(Into::into))
+}
+
+pub(crate) struct UpsertInstanceFile<'a> {
+    pub instance_id: &'a str,
+    pub relative_path: &'a str,
+    pub file_name: &'a str,
+    pub enabled: bool,
+    pub sha1: &'a str,
+    pub size: u64,
+    pub missing: bool,
+}
+
+pub(crate) async fn get_instance_file_by_relative_path(
+    instance_id: &str,
+    relative_path: &str,
+    pool: &SqlitePool,
+) -> crate::Result<Option<InstanceFile>> {
+    let row = sqlx::query_as::<_, InstanceFileRow>(
+        "
+		SELECT *
+		FROM instance_files
+		WHERE instance_id = ? AND relative_path = ?
+		",
+    )
+    .bind(instance_id)
+    .bind(relative_path)
+    .fetch_optional(pool)
+    .await?;
+
+    row.map(TryInto::try_into).transpose()
+}
+
+pub(crate) async fn upsert_instance_file_from_parts(
+    input: UpsertInstanceFile<'_>,
+    pool: &SqlitePool,
+) -> crate::Result<InstanceFile> {
+    let existing = get_instance_file_by_relative_path(
+        input.instance_id,
+        input.relative_path,
+        pool,
+    )
+    .await?;
+    let file = InstanceFile {
+        id: existing
+            .as_ref()
+            .map(|file| file.id.clone())
+            .unwrap_or_else(|| format!("instance-file:{}", Uuid::new_v4())),
+        instance_id: input.instance_id.to_string(),
+        relative_path: input.relative_path.to_string(),
+        file_name: input.file_name.to_string(),
+        enabled: input.enabled,
+        sha1: input.sha1.to_string(),
+        size: input.size,
+        missing: input.missing,
+        added_at: existing
+            .as_ref()
+            .map(|file| file.added_at)
+            .unwrap_or_else(Utc::now),
+        modified_at: Utc::now(),
+    };
+
+    let mut tx = pool.begin().await?;
+    upsert_instance_file(&file, &mut tx).await?;
+    tx.commit().await?;
+
+    Ok(file)
+}
+
+pub(crate) async fn rename_instance_file(
+    instance_id: &str,
+    old_relative_path: &str,
+    new_relative_path: &str,
+    new_file_name: &str,
+    enabled: bool,
+    pool: &SqlitePool,
+) -> crate::Result<Option<InstanceFile>> {
+    sqlx::query(
+        "
+		UPDATE instance_files
+		SET
+			relative_path = ?,
+			file_name = ?,
+			enabled = ?,
+			modified_at = ?
+		WHERE instance_id = ? AND relative_path = ?
+		",
+    )
+    .bind(new_relative_path)
+    .bind(new_file_name)
+    .bind(i64::from(enabled))
+    .bind(Utc::now().timestamp())
+    .bind(instance_id)
+    .bind(old_relative_path)
+    .execute(pool)
+    .await?;
+
+    get_instance_file_by_relative_path(instance_id, new_relative_path, pool)
+        .await
+}
+
+pub(crate) async fn remove_instance_file_by_relative_path(
+    instance_id: &str,
+    relative_path: &str,
+    pool: &SqlitePool,
+) -> crate::Result<()> {
+    sqlx::query(
+        "
+		DELETE FROM instance_files
+		WHERE instance_id = ? AND relative_path = ?
+		",
+    )
+    .bind(instance_id)
+    .bind(relative_path)
+    .execute(pool)
+    .await?;
+
+    Ok(())
+}
+
+pub(crate) struct UpsertContentEntry<'a> {
+    pub instance_id: &'a str,
+    pub content_set_id: &'a str,
+    pub file_id: Option<&'a str>,
+    pub project_type: ProjectType,
+    pub project_id: Option<&'a str>,
+    pub version_id: Option<&'a str>,
+    pub source_kind: ContentSourceKind,
+    pub server_requirement: ContentRequirement,
+    pub client_requirement: ContentRequirement,
+    pub enabled: bool,
+}
+
+pub(crate) async fn get_content_entry_by_id(
+    id: &str,
+    pool: &SqlitePool,
+) -> crate::Result<Option<ContentEntry>> {
+    let row = sqlx::query_as::<_, ContentEntryRow>(
+        "
+		SELECT *
+		FROM instance_content_entries
+		WHERE id = ?
+		",
+    )
+    .bind(id)
+    .fetch_optional(pool)
+    .await?;
+
+    row.map(TryInto::try_into).transpose()
+}
+
+pub(crate) async fn get_content_entry_by_file(
+    content_set_id: &str,
+    file_id: &str,
+    pool: &SqlitePool,
+) -> crate::Result<Option<ContentEntry>> {
+    let row = sqlx::query_as::<_, ContentEntryRow>(
+        "
+		SELECT *
+		FROM instance_content_entries
+		WHERE content_set_id = ? AND file_id = ?
+		ORDER BY modified_at DESC
+		LIMIT 1
+		",
+    )
+    .bind(content_set_id)
+    .bind(file_id)
+    .fetch_optional(pool)
+    .await?;
+
+    row.map(TryInto::try_into).transpose()
+}
+
+pub(crate) async fn upsert_content_entry_from_parts(
+    input: UpsertContentEntry<'_>,
+    pool: &SqlitePool,
+) -> crate::Result<ContentEntry> {
+    let existing_id = if let Some(file_id) = input.file_id {
+        sqlx::query_scalar::<_, String>(
+            "
+			SELECT id
+			FROM instance_content_entries
+			WHERE content_set_id = ? AND file_id = ?
+			ORDER BY modified_at DESC
+			LIMIT 1
+			",
+        )
+        .bind(input.content_set_id)
+        .bind(file_id)
+        .fetch_optional(pool)
+        .await?
+    } else if let (Some(project_id), Some(version_id)) =
+        (input.project_id, input.version_id)
+    {
+        sqlx::query_scalar::<_, String>(
+            "
+			SELECT id
+			FROM instance_content_entries
+			WHERE content_set_id = ?
+				AND project_id = ?
+				AND version_id = ?
+			ORDER BY modified_at DESC
+			LIMIT 1
+			",
+        )
+        .bind(input.content_set_id)
+        .bind(project_id)
+        .bind(version_id)
+        .fetch_optional(pool)
+        .await?
+    } else {
+        None
+    };
+    let now = Utc::now();
+    let entry = ContentEntry {
+        id: existing_id
+            .unwrap_or_else(|| format!("content-entry:{}", Uuid::new_v4())),
+        instance_id: input.instance_id.to_string(),
+        content_set_id: input.content_set_id.to_string(),
+        file_id: input.file_id.map(ToString::to_string),
+        project_type: input.project_type,
+        project_id: input.project_id.map(ToString::to_string),
+        version_id: input.version_id.map(ToString::to_string),
+        source_kind: input.source_kind,
+        server_requirement: input.server_requirement,
+        client_requirement: input.client_requirement,
+        enabled: input.enabled,
+        added_at: now,
+        modified_at: now,
+    };
+
+    let added_at = get_content_entry_by_id(&entry.id, pool)
+        .await?
+        .map(|entry| entry.added_at)
+        .unwrap_or(entry.added_at);
+
+    sqlx::query(
+        "
+		INSERT INTO instance_content_entries (
+			id,
+			instance_id,
+			content_set_id,
+			file_id,
+			project_type,
+			project_id,
+			version_id,
+			source_kind,
+			server_requirement,
+			client_requirement,
+			enabled,
+			added_at,
+			modified_at
+		)
+		VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+		ON CONFLICT(id) DO UPDATE SET
+			file_id = excluded.file_id,
+			project_type = excluded.project_type,
+			project_id = excluded.project_id,
+			version_id = excluded.version_id,
+			source_kind = excluded.source_kind,
+			server_requirement = excluded.server_requirement,
+			client_requirement = excluded.client_requirement,
+			enabled = excluded.enabled,
+			modified_at = excluded.modified_at
+		",
+    )
+    .bind(entry.id.as_str())
+    .bind(entry.instance_id.as_str())
+    .bind(entry.content_set_id.as_str())
+    .bind(entry.file_id.as_deref())
+    .bind(entry.project_type.get_name())
+    .bind(entry.project_id.as_deref())
+    .bind(entry.version_id.as_deref())
+    .bind(entry.source_kind.as_str())
+    .bind(entry.server_requirement.as_str())
+    .bind(entry.client_requirement.as_str())
+    .bind(i64::from(entry.enabled))
+    .bind(added_at.timestamp())
+    .bind(entry.modified_at.timestamp())
+    .execute(pool)
+    .await?;
+
+    get_content_entry_by_id(&entry.id, pool)
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::OtherError(format!(
+                "Failed to read content entry {} after upsert",
+                entry.id
+            ))
+            .into()
+        })
+}
+
+pub(crate) async fn set_content_entry_enabled_for_file(
+    content_set_id: &str,
+    file_id: &str,
+    enabled: bool,
+    pool: &SqlitePool,
+) -> crate::Result<()> {
+    sqlx::query(
+        "
+		UPDATE instance_content_entries
+		SET enabled = ?, modified_at = ?
+		WHERE content_set_id = ? AND file_id = ?
+		",
+    )
+    .bind(i64::from(enabled))
+    .bind(Utc::now().timestamp())
+    .bind(content_set_id)
+    .bind(file_id)
+    .execute(pool)
+    .await?;
+
+    Ok(())
+}
+
+pub(crate) async fn remove_content_entries_for_file(
+    content_set_id: &str,
+    file_id: &str,
+    pool: &SqlitePool,
+) -> crate::Result<()> {
+    sqlx::query(
+        "
+		DELETE FROM instance_content_entries
+		WHERE content_set_id = ? AND file_id = ?
+		",
+    )
+    .bind(content_set_id)
+    .bind(file_id)
+    .execute(pool)
+    .await?;
+
+    Ok(())
+}
+
+pub(crate) async fn upsert_content_update_check(
+    content_entry_id: &str,
+    update_channel: ReleaseChannel,
+    update_version_id: Option<&str>,
+    pool: &SqlitePool,
+) -> crate::Result<()> {
+    sqlx::query(
+        "
+		INSERT INTO instance_content_update_checks (
+			content_entry_id,
+			update_channel,
+			update_version_id,
+			checked_at
+		)
+		VALUES (?, ?, ?, ?)
+		ON CONFLICT(content_entry_id) DO UPDATE SET
+			update_channel = excluded.update_channel,
+			update_version_id = excluded.update_version_id,
+			checked_at = excluded.checked_at
+		",
+    )
+    .bind(content_entry_id)
+    .bind(update_channel.key())
+    .bind(update_version_id)
+    .bind(Utc::now().timestamp())
+    .execute(pool)
+    .await?;
+
+    Ok(())
+}
+
+fn project_type_from_str(value: &str) -> crate::Result<ProjectType> {
+    match value {
+        "mod" => Ok(ProjectType::Mod),
+        "datapack" => Ok(ProjectType::DataPack),
+        "resourcepack" => Ok(ProjectType::ResourcePack),
+        "shader" | "shaderpack" => Ok(ProjectType::ShaderPack),
+        other => Err(crate::ErrorKind::InputError(format!(
+            "Unknown content project type {other}"
+        ))
+        .into()),
+    }
+}
+
+fn timestamp(value: i64) -> DateTime<Utc> {
+    Utc.timestamp_opt(value, 0)
+        .single()
+        .unwrap_or_else(Utc::now)
+}
+
+fn optional_timestamp(value: i64) -> Option<DateTime<Utc>> {
+    Utc.timestamp_opt(value, 0).single()
+}
+
+fn unsigned(value: i64, column: &str) -> crate::Result<u64> {
+    if value < 0 {
+        return Err(crate::ErrorKind::InputError(format!(
+            "Expected {column} to be non-negative"
+        ))
+        .into());
+    }
+
+    Ok(value as u64)
+}
diff --git a/packages/app-lib/src/state/instances/adapters/sqlite/instance_rows.rs b/packages/app-lib/src/state/instances/adapters/sqlite/instance_rows.rs
new file mode 100644
index 0000000000..1df639b964
--- /dev/null
+++ b/packages/app-lib/src/state/instances/adapters/sqlite/instance_rows.rs
@@ -0,0 +1,793 @@
+#![allow(dead_code)]
+
+use crate::state::instances::{
+    Instance, InstanceLaunchOverrides, InstanceLink,
+};
+use crate::state::{
+    Hooks, InstanceInstallStage, LauncherFeatureVersion, MemorySettings,
+    ReleaseChannel, WindowSize,
+};
+use chrono::{DateTime, TimeZone, Utc};
+use serde::de::DeserializeOwned;
+use sqlx::{Executor, Sqlite, SqlitePool, Transaction};
+use uuid::Uuid;
+
+#[derive(Debug, sqlx::FromRow)]
+pub(crate) struct InstanceRow {
+    pub id: String,
+    pub path: String,
+    pub applied_content_set_id: Option<String>,
+    pub install_stage: String,
+    pub launcher_feature_version: String,
+    pub update_channel: String,
+    pub name: String,
+    pub icon_path: Option<String>,
+    pub created: i64,
+    pub modified: i64,
+    pub last_played: Option<i64>,
+    pub submitted_time_played: i64,
+    pub recent_time_played: i64,
+}
+
+impl TryFrom<InstanceRow> for Instance {
+    type Error = crate::Error;
+
+    fn try_from(row: InstanceRow) -> crate::Result<Self> {
+        Ok(Self {
+            id: row.id,
+            path: row.path,
+            applied_content_set_id: row.applied_content_set_id,
+            install_stage: InstanceInstallStage::from_str(&row.install_stage),
+            launcher_feature_version: LauncherFeatureVersion::from_str(
+                &row.launcher_feature_version,
+            ),
+            update_channel: ReleaseChannel::from_key(&row.update_channel),
+            name: row.name,
+            icon_path: row.icon_path,
+            created: timestamp(row.created),
+            modified: timestamp(row.modified),
+            last_played: row.last_played.and_then(optional_timestamp),
+            submitted_time_played: unsigned(
+                row.submitted_time_played,
+                "submitted_time_played",
+            )?,
+            recent_time_played: unsigned(
+                row.recent_time_played,
+                "recent_time_played",
+            )?,
+        })
+    }
+}
+
+#[derive(Debug, sqlx::FromRow)]
+pub(crate) struct InstanceLinkRow {
+    pub instance_id: String,
+    pub link_kind: String,
+    pub modrinth_project_id: Option<String>,
+    pub modrinth_version_id: Option<String>,
+    pub server_project_id: Option<String>,
+    pub content_project_id: Option<String>,
+    pub content_version_id: Option<String>,
+    pub hosting_server_id: Option<String>,
+    pub hosting_instance_ids: Option<String>,
+    pub hosting_active_instance_id: Option<String>,
+    pub shared_instance_id: Option<String>,
+}
+
+impl TryFrom<InstanceLinkRow> for InstanceLink {
+    type Error = crate::Error;
+
+    fn try_from(row: InstanceLinkRow) -> crate::Result<Self> {
+        match row.link_kind.as_str() {
+            "unmanaged" => Ok(Self::Unmanaged),
+            "modrinth_modpack" => Ok(Self::ModrinthModpack {
+                project_id: required(
+                    row.modrinth_project_id,
+                    "modrinth_project_id",
+                )?,
+                version_id: required(
+                    row.modrinth_version_id,
+                    "modrinth_version_id",
+                )?,
+            }),
+            "server_project" => Ok(Self::ServerProject {
+                project_id: required(
+                    row.server_project_id,
+                    "server_project_id",
+                )?,
+            }),
+            "server_project_modpack" => Ok(Self::ServerProjectModpack {
+                server_project_id: required(
+                    row.server_project_id,
+                    "server_project_id",
+                )?,
+                content_project_id: required(
+                    row.content_project_id,
+                    "content_project_id",
+                )?,
+                content_version_id: required(
+                    row.content_version_id,
+                    "content_version_id",
+                )?,
+            }),
+            "modrinth_hosting" => Ok(Self::ModrinthHosting {
+                server_id: parse_uuid(
+                    row.hosting_server_id,
+                    "hosting_server_id",
+                )?,
+                instance_ids: parse_optional_json(
+                    row.hosting_instance_ids,
+                    "hosting_instance_ids",
+                )?
+                .unwrap_or_default(),
+                active_instance_id: parse_optional_uuid(
+                    row.hosting_active_instance_id,
+                    "hosting_active_instance_id",
+                )?,
+            }),
+            "imported_modpack" => Ok(Self::ImportedModpack {
+                project_id: row.modrinth_project_id,
+                version_id: row.modrinth_version_id,
+            }),
+            "shared_instance" => Ok(Self::SharedInstance {
+                shared_instance_id: parse_uuid(
+                    row.shared_instance_id,
+                    "shared_instance_id",
+                )?,
+            }),
+            other => Err(crate::ErrorKind::InputError(format!(
+                "Unknown instance link kind {other}"
+            ))
+            .into()),
+        }
+    }
+}
+
+#[derive(Debug, sqlx::FromRow)]
+pub(crate) struct InstanceLaunchOverridesRow {
+    pub instance_id: String,
+    pub java_path: Option<String>,
+    pub extra_launch_args: Option<String>,
+    pub custom_env_vars: Option<String>,
+    pub memory: Option<i64>,
+    pub force_fullscreen: Option<i64>,
+    pub game_resolution_x: Option<i64>,
+    pub game_resolution_y: Option<i64>,
+    pub hook_pre_launch: Option<String>,
+    pub hook_wrapper: Option<String>,
+    pub hook_post_exit: Option<String>,
+}
+
+impl TryFrom<InstanceLaunchOverridesRow> for InstanceLaunchOverrides {
+    type Error = crate::Error;
+
+    fn try_from(row: InstanceLaunchOverridesRow) -> crate::Result<Self> {
+        Ok(Self {
+            instance_id: row.instance_id,
+            java_path: row.java_path,
+            extra_launch_args: parse_optional_json(
+                row.extra_launch_args,
+                "extra_launch_args",
+            )?,
+            custom_env_vars: parse_optional_json(
+                row.custom_env_vars,
+                "custom_env_vars",
+            )?,
+            memory: match row.memory {
+                Some(maximum) => Some(MemorySettings {
+                    maximum: unsigned(maximum, "memory")? as u32,
+                }),
+                None => None,
+            },
+            force_fullscreen: row.force_fullscreen.map(|value| value == 1),
+            game_resolution: match (
+                row.game_resolution_x,
+                row.game_resolution_y,
+            ) {
+                (Some(x), Some(y)) => Some(WindowSize(
+                    unsigned(x, "game_resolution_x")? as u16,
+                    unsigned(y, "game_resolution_y")? as u16,
+                )),
+                _ => None,
+            },
+            hooks: Hooks {
+                pre_launch: row.hook_pre_launch,
+                wrapper: row.hook_wrapper,
+                post_exit: row.hook_post_exit,
+            },
+        })
+    }
+}
+
+pub(crate) async fn get_instance_by_id<'e, E>(
+    id: &str,
+    exec: E,
+) -> crate::Result<Option<Instance>>
+where
+    E: Executor<'e, Database = Sqlite>,
+{
+    let row = sqlx::query_as::<_, InstanceRow>(
+        "
+		SELECT *
+		FROM instances
+		WHERE id = ?
+		",
+    )
+    .bind(id)
+    .fetch_optional(exec)
+    .await?;
+
+    row.map(TryInto::try_into).transpose()
+}
+
+pub(crate) async fn get_instance_by_path<'e, E>(
+    path: &str,
+    exec: E,
+) -> crate::Result<Option<Instance>>
+where
+    E: Executor<'e, Database = Sqlite>,
+{
+    let row = sqlx::query_as::<_, InstanceRow>(
+        "
+		SELECT *
+		FROM instances
+		WHERE path = ?
+		",
+    )
+    .bind(path)
+    .fetch_optional(exec)
+    .await?;
+
+    row.map(TryInto::try_into).transpose()
+}
+
+pub(crate) async fn list_instances(
+    pool: &SqlitePool,
+) -> crate::Result<Vec<Instance>> {
+    let rows = sqlx::query_as::<_, InstanceRow>(
+        "
+		SELECT *
+		FROM instances
+		",
+    )
+    .fetch_all(pool)
+    .await?;
+
+    rows.into_iter().map(TryInto::try_into).collect()
+}
+
+pub(crate) async fn get_instance_link<'e, E>(
+    instance_id: &str,
+    exec: E,
+) -> crate::Result<InstanceLink>
+where
+    E: Executor<'e, Database = Sqlite>,
+{
+    let row = sqlx::query_as::<_, InstanceLinkRow>(
+        "
+        SELECT
+            instance_id,
+            link_kind,
+            modrinth_project_id,
+            modrinth_version_id,
+            server_project_id,
+            content_project_id,
+            content_version_id,
+            hosting_server_id,
+            json(hosting_instance_ids) AS hosting_instance_ids,
+            hosting_active_instance_id,
+            shared_instance_id
+        FROM instance_links
+        WHERE instance_id = ?
+        ",
+    )
+    .bind(instance_id)
+    .fetch_optional(exec)
+    .await?;
+
+    match row {
+        Some(row) => row.try_into(),
+        None => Ok(InstanceLink::Unmanaged),
+    }
+}
+
+pub(crate) async fn get_instance_groups<'e, E>(
+    instance_id: &str,
+    exec: E,
+) -> crate::Result<Vec<String>>
+where
+    E: Executor<'e, Database = Sqlite>,
+{
+    let rows = sqlx::query_scalar::<_, String>(
+        "
+		SELECT group_name
+		FROM instance_groups
+		WHERE instance_id = ?
+		ORDER BY group_name
+		",
+    )
+    .bind(instance_id)
+    .fetch_all(exec)
+    .await?;
+
+    Ok(rows)
+}
+
+pub(crate) async fn get_instance_launch_overrides<'e, E>(
+    instance_id: &str,
+    exec: E,
+) -> crate::Result<Option<InstanceLaunchOverrides>>
+where
+    E: Executor<'e, Database = Sqlite>,
+{
+    let row = sqlx::query_as::<_, InstanceLaunchOverridesRow>(
+        "
+		SELECT
+			instance_id,
+			java_path,
+			json(extra_launch_args) AS extra_launch_args,
+			json(custom_env_vars) AS custom_env_vars,
+			memory,
+			force_fullscreen,
+			game_resolution_x,
+			game_resolution_y,
+			hook_pre_launch,
+			hook_wrapper,
+			hook_post_exit
+		FROM instance_launch_overrides
+		WHERE instance_id = ?
+		",
+    )
+    .bind(instance_id)
+    .fetch_optional(exec)
+    .await?;
+
+    row.map(TryInto::try_into).transpose()
+}
+
+pub(crate) async fn insert_instance(
+    instance: &Instance,
+    tx: &mut Transaction<'_, Sqlite>,
+) -> crate::Result<()> {
+    sqlx::query(
+        "
+		INSERT INTO instances (
+			id,
+			path,
+			applied_content_set_id,
+			install_stage,
+			launcher_feature_version,
+			update_channel,
+			name,
+			icon_path,
+			created,
+			modified,
+			last_played,
+			submitted_time_played,
+			recent_time_played
+		)
+		VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+		",
+    )
+    .bind(instance.id.as_str())
+    .bind(instance.path.as_str())
+    .bind(instance.applied_content_set_id.as_deref())
+    .bind(instance.install_stage.as_str())
+    .bind(instance.launcher_feature_version.as_str())
+    .bind(instance.update_channel.key())
+    .bind(instance.name.as_str())
+    .bind(instance.icon_path.as_deref())
+    .bind(instance.created.timestamp())
+    .bind(instance.modified.timestamp())
+    .bind(instance.last_played.map(|value| value.timestamp()))
+    .bind(instance.submitted_time_played as i64)
+    .bind(instance.recent_time_played as i64)
+    .execute(&mut **tx)
+    .await?;
+
+    Ok(())
+}
+
+pub(crate) async fn update_instance(
+    instance: &Instance,
+    tx: &mut Transaction<'_, Sqlite>,
+) -> crate::Result<()> {
+    sqlx::query(
+        "
+		UPDATE instances
+		SET
+			path = ?,
+			applied_content_set_id = ?,
+			install_stage = ?,
+			launcher_feature_version = ?,
+			update_channel = ?,
+			name = ?,
+			icon_path = ?,
+			modified = ?,
+			last_played = ?,
+			submitted_time_played = ?,
+			recent_time_played = ?
+		WHERE id = ?
+		",
+    )
+    .bind(instance.path.as_str())
+    .bind(instance.applied_content_set_id.as_deref())
+    .bind(instance.install_stage.as_str())
+    .bind(instance.launcher_feature_version.as_str())
+    .bind(instance.update_channel.key())
+    .bind(instance.name.as_str())
+    .bind(instance.icon_path.as_deref())
+    .bind(instance.modified.timestamp())
+    .bind(instance.last_played.map(|value| value.timestamp()))
+    .bind(instance.submitted_time_played as i64)
+    .bind(instance.recent_time_played as i64)
+    .bind(instance.id.as_str())
+    .execute(&mut **tx)
+    .await?;
+
+    Ok(())
+}
+
+pub(crate) async fn upsert_instance_link(
+    instance_id: &str,
+    link: &InstanceLink,
+    tx: &mut Transaction<'_, Sqlite>,
+) -> crate::Result<()> {
+    let columns = instance_link_columns(link)?;
+
+    sqlx::query(
+        "
+		INSERT INTO instance_links (
+			instance_id,
+			link_kind,
+			modrinth_project_id,
+			modrinth_version_id,
+			server_project_id,
+			content_project_id,
+			content_version_id,
+			hosting_server_id,
+			hosting_instance_ids,
+			hosting_active_instance_id,
+			shared_instance_id
+		)
+		VALUES (?, ?, ?, ?, ?, ?, ?, ?, jsonb(?), ?, ?)
+		ON CONFLICT (instance_id) DO UPDATE SET
+			link_kind = excluded.link_kind,
+			modrinth_project_id = excluded.modrinth_project_id,
+			modrinth_version_id = excluded.modrinth_version_id,
+			server_project_id = excluded.server_project_id,
+			content_project_id = excluded.content_project_id,
+			content_version_id = excluded.content_version_id,
+			hosting_server_id = excluded.hosting_server_id,
+			hosting_instance_ids = excluded.hosting_instance_ids,
+			hosting_active_instance_id = excluded.hosting_active_instance_id,
+			shared_instance_id = excluded.shared_instance_id
+		",
+    )
+    .bind(instance_id)
+    .bind(columns.link_kind)
+    .bind(columns.modrinth_project_id.as_deref())
+    .bind(columns.modrinth_version_id.as_deref())
+    .bind(columns.server_project_id.as_deref())
+    .bind(columns.content_project_id.as_deref())
+    .bind(columns.content_version_id.as_deref())
+    .bind(columns.hosting_server_id.as_deref())
+    .bind(columns.hosting_instance_ids.as_deref())
+    .bind(columns.hosting_active_instance_id.as_deref())
+    .bind(columns.shared_instance_id.as_deref())
+    .execute(&mut **tx)
+    .await?;
+
+    Ok(())
+}
+
+pub(crate) async fn replace_instance_groups(
+    instance_id: &str,
+    groups: &[String],
+    tx: &mut Transaction<'_, Sqlite>,
+) -> crate::Result<()> {
+    sqlx::query(
+        "
+		DELETE FROM instance_groups
+		WHERE instance_id = ?
+		",
+    )
+    .bind(instance_id)
+    .execute(&mut **tx)
+    .await?;
+
+    for group in groups {
+        sqlx::query(
+            "
+			INSERT OR IGNORE INTO instance_groups (instance_id, group_name)
+			VALUES (?, ?)
+			",
+        )
+        .bind(instance_id)
+        .bind(group.as_str())
+        .execute(&mut **tx)
+        .await?;
+    }
+
+    Ok(())
+}
+
+pub(crate) async fn upsert_instance_launch_overrides(
+    overrides: &InstanceLaunchOverrides,
+    tx: &mut Transaction<'_, Sqlite>,
+) -> crate::Result<()> {
+    let extra_launch_args = overrides
+        .extra_launch_args
+        .as_ref()
+        .map(serde_json::to_string)
+        .transpose()?;
+    let custom_env_vars = overrides
+        .custom_env_vars
+        .as_ref()
+        .map(serde_json::to_string)
+        .transpose()?;
+    let memory = overrides.memory.map(|value| value.maximum as i64);
+    let force_fullscreen = overrides.force_fullscreen.map(i64::from);
+    let game_resolution_x =
+        overrides.game_resolution.map(|value| value.0 as i64);
+    let game_resolution_y =
+        overrides.game_resolution.map(|value| value.1 as i64);
+
+    sqlx::query(
+        "
+		INSERT INTO instance_launch_overrides (
+			instance_id,
+			java_path,
+			extra_launch_args,
+			custom_env_vars,
+			memory,
+			force_fullscreen,
+			game_resolution_x,
+			game_resolution_y,
+			hook_pre_launch,
+			hook_wrapper,
+			hook_post_exit
+		)
+		VALUES (?, ?, jsonb(?), jsonb(?), ?, ?, ?, ?, ?, ?, ?)
+		ON CONFLICT (instance_id) DO UPDATE SET
+			java_path = excluded.java_path,
+			extra_launch_args = excluded.extra_launch_args,
+			custom_env_vars = excluded.custom_env_vars,
+			memory = excluded.memory,
+			force_fullscreen = excluded.force_fullscreen,
+			game_resolution_x = excluded.game_resolution_x,
+			game_resolution_y = excluded.game_resolution_y,
+			hook_pre_launch = excluded.hook_pre_launch,
+			hook_wrapper = excluded.hook_wrapper,
+			hook_post_exit = excluded.hook_post_exit
+		",
+    )
+    .bind(overrides.instance_id.as_str())
+    .bind(overrides.java_path.as_deref())
+    .bind(extra_launch_args)
+    .bind(custom_env_vars)
+    .bind(memory)
+    .bind(force_fullscreen)
+    .bind(game_resolution_x)
+    .bind(game_resolution_y)
+    .bind(overrides.hooks.pre_launch.as_deref())
+    .bind(overrides.hooks.wrapper.as_deref())
+    .bind(overrides.hooks.post_exit.as_deref())
+    .execute(&mut **tx)
+    .await?;
+
+    Ok(())
+}
+
+pub(crate) async fn delete_instance_by_id(
+    instance_id: &str,
+    pool: &SqlitePool,
+) -> crate::Result<()> {
+    sqlx::query(
+        "
+		DELETE FROM instances
+		WHERE id = ?
+		",
+    )
+    .bind(instance_id)
+    .execute(pool)
+    .await?;
+
+    Ok(())
+}
+
+struct InstanceLinkColumns {
+    link_kind: &'static str,
+    modrinth_project_id: Option<String>,
+    modrinth_version_id: Option<String>,
+    server_project_id: Option<String>,
+    content_project_id: Option<String>,
+    content_version_id: Option<String>,
+    hosting_server_id: Option<String>,
+    hosting_instance_ids: Option<String>,
+    hosting_active_instance_id: Option<String>,
+    shared_instance_id: Option<String>,
+}
+
+fn instance_link_columns(
+    link: &InstanceLink,
+) -> crate::Result<InstanceLinkColumns> {
+    match link {
+        InstanceLink::Unmanaged => Ok(InstanceLinkColumns {
+            link_kind: "unmanaged",
+            modrinth_project_id: None,
+            modrinth_version_id: None,
+            server_project_id: None,
+            content_project_id: None,
+            content_version_id: None,
+            hosting_server_id: None,
+            hosting_instance_ids: None,
+            hosting_active_instance_id: None,
+            shared_instance_id: None,
+        }),
+        InstanceLink::ModrinthModpack {
+            project_id,
+            version_id,
+        } => Ok(InstanceLinkColumns {
+            link_kind: "modrinth_modpack",
+            modrinth_project_id: Some(project_id.clone()),
+            modrinth_version_id: Some(version_id.clone()),
+            server_project_id: None,
+            content_project_id: None,
+            content_version_id: None,
+            hosting_server_id: None,
+            hosting_instance_ids: None,
+            hosting_active_instance_id: None,
+            shared_instance_id: None,
+        }),
+        InstanceLink::ServerProject { project_id } => Ok(InstanceLinkColumns {
+            link_kind: "server_project",
+            modrinth_project_id: None,
+            modrinth_version_id: None,
+            server_project_id: Some(project_id.clone()),
+            content_project_id: None,
+            content_version_id: None,
+            hosting_server_id: None,
+            hosting_instance_ids: None,
+            hosting_active_instance_id: None,
+            shared_instance_id: None,
+        }),
+        InstanceLink::ServerProjectModpack {
+            server_project_id,
+            content_project_id,
+            content_version_id,
+        } => Ok(InstanceLinkColumns {
+            link_kind: "server_project_modpack",
+            modrinth_project_id: None,
+            modrinth_version_id: None,
+            server_project_id: Some(server_project_id.clone()),
+            content_project_id: Some(content_project_id.clone()),
+            content_version_id: Some(content_version_id.clone()),
+            hosting_server_id: None,
+            hosting_instance_ids: None,
+            hosting_active_instance_id: None,
+            shared_instance_id: None,
+        }),
+        InstanceLink::ModrinthHosting {
+            server_id,
+            instance_ids,
+            active_instance_id,
+        } => Ok(InstanceLinkColumns {
+            link_kind: "modrinth_hosting",
+            modrinth_project_id: None,
+            modrinth_version_id: None,
+            server_project_id: None,
+            content_project_id: None,
+            content_version_id: None,
+            hosting_server_id: Some(server_id.to_string()),
+            hosting_instance_ids: Some(serde_json::to_string(instance_ids)?),
+            hosting_active_instance_id: active_instance_id
+                .map(|value| value.to_string()),
+            shared_instance_id: None,
+        }),
+        InstanceLink::ImportedModpack {
+            project_id,
+            version_id,
+        } => Ok(InstanceLinkColumns {
+            link_kind: "imported_modpack",
+            modrinth_project_id: project_id.clone(),
+            modrinth_version_id: version_id.clone(),
+            server_project_id: None,
+            content_project_id: None,
+            content_version_id: None,
+            hosting_server_id: None,
+            hosting_instance_ids: None,
+            hosting_active_instance_id: None,
+            shared_instance_id: None,
+        }),
+        InstanceLink::SharedInstance { shared_instance_id } => {
+            Ok(InstanceLinkColumns {
+                link_kind: "shared_instance",
+                modrinth_project_id: None,
+                modrinth_version_id: None,
+                server_project_id: None,
+                content_project_id: None,
+                content_version_id: None,
+                hosting_server_id: None,
+                hosting_instance_ids: None,
+                hosting_active_instance_id: None,
+                shared_instance_id: Some(shared_instance_id.to_string()),
+            })
+        }
+    }
+}
+
+fn required(value: Option<String>, column: &str) -> crate::Result<String> {
+    value.ok_or_else(|| {
+        crate::ErrorKind::InputError(format!(
+            "Missing required instance link column {column}"
+        ))
+        .into()
+    })
+}
+
+fn parse_uuid(value: Option<String>, column: &str) -> crate::Result<Uuid> {
+    let value = required(value, column)?;
+
+    value.parse().map_err(|err| {
+        crate::ErrorKind::InputError(format!("Invalid {column}: {err}")).into()
+    })
+}
+
+fn parse_optional_uuid(
+    value: Option<String>,
+    column: &str,
+) -> crate::Result<Option<Uuid>> {
+    value
+        .map(|value| {
+            value.parse().map_err(|err| {
+                crate::ErrorKind::InputError(format!("Invalid {column}: {err}"))
+                    .into()
+            })
+        })
+        .transpose()
+}
+
+fn parse_optional_json<T>(
+    value: Option<String>,
+    column: &str,
+) -> crate::Result<Option<T>>
+where
+    T: DeserializeOwned,
+{
+    let Some(value) = value else {
+        return Ok(None);
+    };
+
+    if value == "null" {
+        return Ok(None);
+    }
+
+    serde_json::from_str(&value).map(Some).map_err(|err| {
+        crate::ErrorKind::InputError(format!(
+            "Invalid launch override JSON in {column}: {err}"
+        ))
+        .into()
+    })
+}
+
+fn timestamp(value: i64) -> DateTime<Utc> {
+    Utc.timestamp_opt(value, 0)
+        .single()
+        .unwrap_or_else(Utc::now)
+}
+
+fn optional_timestamp(value: i64) -> Option<DateTime<Utc>> {
+    Utc.timestamp_opt(value, 0).single()
+}
+
+fn unsigned(value: i64, column: &str) -> crate::Result<u64> {
+    if value < 0 {
+        return Err(crate::ErrorKind::InputError(format!(
+            "Expected {column} to be non-negative"
+        ))
+        .into());
+    }
+
+    Ok(value as u64)
+}
diff --git a/packages/app-lib/src/state/instances/adapters/sqlite/mod.rs b/packages/app-lib/src/state/instances/adapters/sqlite/mod.rs
new file mode 100644
index 0000000000..d8b478f4da
--- /dev/null
+++ b/packages/app-lib/src/state/instances/adapters/sqlite/mod.rs
@@ -0,0 +1,2 @@
+pub(crate) mod content_rows;
+pub(crate) mod instance_rows;
diff --git a/packages/app-lib/src/state/instances/commands/apply_content_install.rs b/packages/app-lib/src/state/instances/commands/apply_content_install.rs
new file mode 100644
index 0000000000..ce597f8d0b
--- /dev/null
+++ b/packages/app-lib/src/state/instances/commands/apply_content_install.rs
@@ -0,0 +1,499 @@
+use crate::state::instances::{
+    ContentRequirement, ContentSourceKind, Instance, InstanceFile,
+    adapters::sqlite::{content_rows, instance_rows},
+};
+use crate::state::{
+    CachedEntry, KnownModrinthFile, ProjectType, State, cache_file_hash,
+};
+use crate::util::fetch::{self, DownloadMeta, DownloadReason};
+use crate::util::io;
+use bytes::Bytes;
+use std::path::{Path, PathBuf};
+
+pub(crate) struct ContentScope {
+    pub instance: Instance,
+    pub content_set_id: String,
+}
+
+pub(crate) struct InstalledContentFile {
+    pub relative_path: String,
+    pub project_id: Option<String>,
+    pub enabled: bool,
+}
+
+pub(crate) async fn resolve_content_scope(
+    instance_id: &str,
+    content_set_id: Option<&str>,
+    state: &State,
+) -> crate::Result<ContentScope> {
+    let instance = instance_rows::get_instance_by_id(instance_id, &state.pool)
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError("Unknown instance".to_string())
+        })?;
+    let content_set_id = match content_set_id {
+        Some(id) => id.to_string(),
+        None => instance.applied_content_set_id.clone().ok_or_else(|| {
+            crate::ErrorKind::InputError(format!(
+                "Instance {} has no applied content set",
+                instance.id
+            ))
+        })?,
+    };
+
+    Ok(ContentScope {
+        instance,
+        content_set_id,
+    })
+}
+
+pub(crate) async fn add_project_from_version(
+    instance_id: &str,
+    version_id: &str,
+    reason: DownloadReason,
+    dependent_on_version_id: Option<String>,
+    source_kind: ContentSourceKind,
+    state: &State,
+) -> crate::Result<String> {
+    let scope = resolve_content_scope(instance_id, None, state).await?;
+    let content_set =
+        content_rows::get_content_set(&scope.content_set_id, &state.pool)
+            .await?
+            .ok_or_else(|| {
+                crate::ErrorKind::InputError(format!(
+                    "Unknown content set {}",
+                    scope.content_set_id
+                ))
+            })?;
+    let version = CachedEntry::get_version(
+        version_id,
+        None,
+        &state.pool,
+        &state.api_semaphore,
+    )
+    .await?
+    .ok_or_else(|| {
+        crate::ErrorKind::InputError(format!(
+            "Unable to install version id {version_id}. Not found."
+        ))
+    })?;
+    let file = version
+        .files
+        .iter()
+        .find(|file| file.primary)
+        .or_else(|| version.files.first())
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError(
+                "No files for input version present!".to_string(),
+            )
+        })?;
+    let download_meta = DownloadMeta {
+        reason,
+        game_version: content_set.game_version,
+        loader: content_set.loader.as_str().to_string(),
+        dependent_on: dependent_on_version_id,
+    };
+    let bytes = fetch::fetch(
+        &file.url,
+        file.hashes.get("sha1").map(|hash| hash.as_str()),
+        Some(&download_meta),
+        None,
+        &state.fetch_semaphore,
+        &state.pool,
+    )
+    .await?;
+    let project_type = ProjectType::get_from_loaders(version.loaders.clone())
+        .ok_or_else(|| {
+        crate::ErrorKind::InputError(format!(
+            "Unable to infer project type for version {version_id}"
+        ))
+    })?;
+
+    add_project_bytes(
+        &scope.instance.id,
+        &file.filename,
+        bytes,
+        file.hashes.get("sha1").map(|hash| hash.as_str()),
+        Some(project_type),
+        source_kind,
+        Some(version.project_id.as_str()),
+        Some(version.id.as_str()),
+        state,
+    )
+    .await
+}
+
+pub(crate) async fn add_project_from_path(
+    instance_id: &str,
+    path: &Path,
+    project_type: Option<ProjectType>,
+    state: &State,
+) -> crate::Result<String> {
+    let file = io::read(path).await?;
+    let file_name = path
+        .file_name()
+        .unwrap_or_default()
+        .to_string_lossy()
+        .to_string();
+
+    add_project_bytes(
+        instance_id,
+        &file_name,
+        Bytes::from(file),
+        None,
+        project_type,
+        ContentSourceKind::Local,
+        None,
+        None,
+        state,
+    )
+    .await
+}
+
+pub(crate) async fn add_project_bytes(
+    instance_id: &str,
+    file_name: &str,
+    bytes: Bytes,
+    hash: Option<&str>,
+    project_type: Option<ProjectType>,
+    source_kind: ContentSourceKind,
+    project_id: Option<&str>,
+    version_id: Option<&str>,
+    state: &State,
+) -> crate::Result<String> {
+    let scope = resolve_content_scope(instance_id, None, state).await?;
+    let project_type = match project_type {
+        Some(project_type) => project_type,
+        None => infer_project_type(&bytes)?,
+    };
+    let relative_path = format!("{}/{}", project_type.get_folder(), file_name);
+    let full_path =
+        instance_full_path(state, &scope.instance).join(&relative_path);
+    let sha1 = match hash {
+        Some(hash) => hash.to_string(),
+        None => fetch::sha1_async(bytes.clone()).await?,
+    };
+
+    cache_file_hash(
+        bytes.clone(),
+        &scope.instance.id,
+        &relative_path,
+        Some(&sha1),
+        Some(project_type),
+        project_id.zip(version_id).map(|(project_id, version_id)| {
+            KnownModrinthFile {
+                project_id,
+                version_id,
+            }
+        }),
+        &state.pool,
+    )
+    .await?;
+    fetch::write(&full_path, &bytes, &state.io_semaphore).await?;
+
+    let file = content_rows::upsert_instance_file_from_parts(
+        content_rows::UpsertInstanceFile {
+            instance_id: &scope.instance.id,
+            relative_path: &relative_path,
+            file_name,
+            enabled: !relative_path.ends_with(".disabled"),
+            sha1: &sha1,
+            size: bytes.len() as u64,
+            missing: false,
+        },
+        &state.pool,
+    )
+    .await?;
+    upsert_entry_for_file(
+        &scope,
+        &file,
+        project_type,
+        project_id,
+        version_id,
+        source_kind,
+        &state.pool,
+    )
+    .await?;
+
+    Ok(relative_path)
+}
+
+pub(crate) async fn record_project_file(
+    instance_id: &str,
+    relative_path: &str,
+    sha1: &str,
+    size: u64,
+    project_type: ProjectType,
+    source_kind: ContentSourceKind,
+    project_id: Option<&str>,
+    version_id: Option<&str>,
+    state: &State,
+) -> crate::Result<()> {
+    let scope = resolve_content_scope(instance_id, None, state).await?;
+    let file_name = Path::new(relative_path)
+        .file_name()
+        .unwrap_or_default()
+        .to_string_lossy()
+        .to_string();
+    let file = content_rows::upsert_instance_file_from_parts(
+        content_rows::UpsertInstanceFile {
+            instance_id: &scope.instance.id,
+            relative_path,
+            file_name: &file_name,
+            enabled: !relative_path.ends_with(".disabled"),
+            sha1,
+            size,
+            missing: false,
+        },
+        &state.pool,
+    )
+    .await?;
+    upsert_entry_for_file(
+        &scope,
+        &file,
+        project_type,
+        project_id,
+        version_id,
+        source_kind,
+        &state.pool,
+    )
+    .await
+}
+
+pub(crate) async fn toggle_disable_project(
+    instance_id: &str,
+    project_path: &str,
+    state: &State,
+) -> crate::Result<String> {
+    let scope = resolve_content_scope(instance_id, None, state).await?;
+    let base = instance_full_path(state, &scope.instance);
+    let trimmed = project_path.trim_end_matches(".disabled");
+    let current_path = if base.join(project_path).exists() {
+        project_path.to_string()
+    } else if base.join(format!("{trimmed}.disabled")).exists() {
+        format!("{trimmed}.disabled")
+    } else if base.join(trimmed).exists() {
+        trimmed.to_string()
+    } else {
+        return Err(crate::ErrorKind::FSError(format!(
+            "Could not find project file for '{project_path}' in instance"
+        ))
+        .into());
+    };
+    let new_path = if current_path.ends_with(".disabled") {
+        current_path.trim_end_matches(".disabled").to_string()
+    } else {
+        format!("{current_path}.disabled")
+    };
+
+    io::rename_or_move(&base.join(&current_path), &base.join(&new_path))
+        .await?;
+
+    let file_name = Path::new(&new_path)
+        .file_name()
+        .unwrap_or_default()
+        .to_string_lossy()
+        .to_string();
+    let enabled = !new_path.ends_with(".disabled");
+    let file = match content_rows::rename_instance_file(
+        &scope.instance.id,
+        &current_path,
+        &new_path,
+        &file_name,
+        enabled,
+        &state.pool,
+    )
+    .await?
+    {
+        Some(file) => file,
+        None => index_existing_file(&scope, &new_path, state).await?,
+    };
+    content_rows::set_content_entry_enabled_for_file(
+        &scope.content_set_id,
+        &file.id,
+        enabled,
+        &state.pool,
+    )
+    .await?;
+
+    Ok(new_path)
+}
+
+pub(crate) async fn remove_project(
+    instance_id: &str,
+    project_path: &str,
+    state: &State,
+) -> crate::Result<()> {
+    let scope = resolve_content_scope(instance_id, None, state).await?;
+    let base = instance_full_path(state, &scope.instance);
+    let file = content_rows::get_instance_file_by_relative_path(
+        &scope.instance.id,
+        project_path,
+        &state.pool,
+    )
+    .await?;
+
+    io::remove_file(base.join(project_path)).await?;
+
+    if let Some(file) = file {
+        content_rows::remove_content_entries_for_file(
+            &scope.content_set_id,
+            &file.id,
+            &state.pool,
+        )
+        .await?;
+        content_rows::remove_instance_file_by_relative_path(
+            &scope.instance.id,
+            project_path,
+            &state.pool,
+        )
+        .await?;
+    }
+
+    Ok(())
+}
+
+pub(crate) async fn list_project_files(
+    instance_id: &str,
+    state: &State,
+) -> crate::Result<Vec<InstalledContentFile>> {
+    let scope = resolve_content_scope(instance_id, None, state).await?;
+    let entries =
+        content_rows::get_content_entries(&scope.content_set_id, &state.pool)
+            .await?;
+    let files =
+        content_rows::get_instance_files(&scope.instance.id, &state.pool)
+            .await?
+            .into_iter()
+            .map(|file| (file.id.clone(), file))
+            .collect::<std::collections::HashMap<_, _>>();
+
+    Ok(entries
+        .into_iter()
+        .filter_map(|entry| {
+            let file = files.get(entry.file_id.as_ref()?)?;
+            Some(InstalledContentFile {
+                relative_path: file.relative_path.clone(),
+                project_id: entry.project_id,
+                enabled: entry.enabled && file.enabled,
+            })
+        })
+        .collect())
+}
+
+pub(crate) fn instance_full_path(
+    state: &State,
+    instance: &Instance,
+) -> PathBuf {
+    state.directories.instances_dir().join(&instance.path)
+}
+
+async fn index_existing_file(
+    scope: &ContentScope,
+    relative_path: &str,
+    state: &State,
+) -> crate::Result<InstanceFile> {
+    let full_path =
+        instance_full_path(state, &scope.instance).join(relative_path);
+    let (size, sha1) = fetch::sha1_file_async(&full_path).await?;
+    let file_name = Path::new(relative_path)
+        .file_name()
+        .unwrap_or_default()
+        .to_string_lossy()
+        .to_string();
+    let project_type = ProjectType::get_from_parent_folder(relative_path)
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError(format!(
+                "Unable to infer project type from {relative_path}"
+            ))
+        })?;
+
+    let file = content_rows::upsert_instance_file_from_parts(
+        content_rows::UpsertInstanceFile {
+            instance_id: &scope.instance.id,
+            relative_path,
+            file_name: &file_name,
+            enabled: !relative_path.ends_with(".disabled"),
+            sha1: &sha1,
+            size,
+            missing: false,
+        },
+        &state.pool,
+    )
+    .await?;
+    upsert_entry_for_file(
+        scope,
+        &file,
+        project_type,
+        None,
+        None,
+        ContentSourceKind::Local,
+        &state.pool,
+    )
+    .await?;
+
+    Ok(file)
+}
+
+async fn upsert_entry_for_file(
+    scope: &ContentScope,
+    file: &InstanceFile,
+    project_type: ProjectType,
+    project_id: Option<&str>,
+    version_id: Option<&str>,
+    source_kind: ContentSourceKind,
+    pool: &sqlx::SqlitePool,
+) -> crate::Result<()> {
+    content_rows::upsert_content_entry_from_parts(
+        content_rows::UpsertContentEntry {
+            instance_id: &scope.instance.id,
+            content_set_id: &scope.content_set_id,
+            file_id: Some(&file.id),
+            project_type,
+            project_id,
+            version_id,
+            source_kind,
+            server_requirement: ContentRequirement::Required,
+            client_requirement: ContentRequirement::Required,
+            enabled: file.enabled,
+        },
+        pool,
+    )
+    .await?;
+
+    Ok(())
+}
+
+fn infer_project_type(bytes: &Bytes) -> crate::Result<ProjectType> {
+    let cursor = std::io::Cursor::new(&**bytes);
+    let mut archive = zip::ZipArchive::new(cursor).map_err(|_| {
+        crate::ErrorKind::InputError(
+            "Unable to infer project type for input file".to_string(),
+        )
+    })?;
+
+    if archive.by_name("fabric.mod.json").is_ok()
+        || archive.by_name("quilt.mod.json").is_ok()
+        || archive.by_name("META-INF/neoforge.mods.toml").is_ok()
+        || archive.by_name("META-INF/mods.toml").is_ok()
+        || archive.by_name("mcmod.info").is_ok()
+    {
+        Ok(ProjectType::Mod)
+    } else if archive.by_name("pack.mcmeta").is_ok() {
+        if archive.file_names().any(|name| name.starts_with("data/")) {
+            Ok(ProjectType::DataPack)
+        } else {
+            Ok(ProjectType::ResourcePack)
+        }
+    } else if archive
+        .file_names()
+        .any(|name| name.starts_with("shaders/"))
+    {
+        Ok(ProjectType::ShaderPack)
+    } else {
+        Err(crate::ErrorKind::InputError(
+            "Unable to infer project type for input file".to_string(),
+        )
+        .into())
+    }
+}
diff --git a/packages/app-lib/src/state/instances/commands/apply_content_update.rs b/packages/app-lib/src/state/instances/commands/apply_content_update.rs
new file mode 100644
index 0000000000..6199b19958
--- /dev/null
+++ b/packages/app-lib/src/state/instances/commands/apply_content_update.rs
@@ -0,0 +1,71 @@
+use crate::state::instances::ContentSourceKind;
+use crate::state::{CacheBehaviour, State};
+use crate::util::fetch::DownloadReason;
+use std::collections::HashMap;
+
+use super::apply_content_install::{
+    add_project_from_version, remove_project, toggle_disable_project,
+};
+use super::check_content_updates::check_content_updates;
+
+pub(crate) async fn update_project(
+    instance_id: &str,
+    project_path: &str,
+    state: &State,
+) -> crate::Result<String> {
+    let updates = check_content_updates(
+        instance_id,
+        Some(CacheBehaviour::MustRevalidate),
+        state,
+    )
+    .await?;
+    let update = updates
+        .into_iter()
+        .find(|update| update.relative_path == project_path)
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError(
+                "This project cannot be updated!".to_string(),
+            )
+        })?;
+    let mut new_path = add_project_from_version(
+        instance_id,
+        &update.update_version_id,
+        DownloadReason::Update,
+        Some(update.current_version_id),
+        ContentSourceKind::Local,
+        state,
+    )
+    .await?;
+
+    if project_path.ends_with(".disabled") {
+        new_path =
+            toggle_disable_project(instance_id, &new_path, state).await?;
+    }
+
+    if new_path != project_path {
+        remove_project(instance_id, project_path, state).await?;
+    }
+
+    Ok(new_path)
+}
+
+pub(crate) async fn update_all_projects(
+    instance_id: &str,
+    state: &State,
+) -> crate::Result<HashMap<String, String>> {
+    let updates = check_content_updates(
+        instance_id,
+        Some(CacheBehaviour::MustRevalidate),
+        state,
+    )
+    .await?;
+    let mut changed = HashMap::new();
+
+    for update in updates {
+        let new_path =
+            update_project(instance_id, &update.relative_path, state).await?;
+        changed.insert(update.relative_path, new_path);
+    }
+
+    Ok(changed)
+}
diff --git a/packages/app-lib/src/state/instances/commands/check_content_updates.rs b/packages/app-lib/src/state/instances/commands/check_content_updates.rs
new file mode 100644
index 0000000000..ca47a49f48
--- /dev/null
+++ b/packages/app-lib/src/state/instances/commands/check_content_updates.rs
@@ -0,0 +1,183 @@
+use crate::state::instances::{
+    ContentEntry, InstanceFile,
+    adapters::sqlite::{content_rows, instance_rows},
+};
+use crate::state::{
+    CacheBehaviour, CachedEntry, ProjectType, ReleaseChannel, State,
+};
+use std::collections::HashMap;
+
+#[derive(Clone, Debug)]
+pub(crate) struct ContentUpdate {
+    pub relative_path: String,
+    pub current_version_id: String,
+    pub update_version_id: String,
+}
+
+pub(crate) async fn check_content_updates(
+    instance_id: &str,
+    cache_behaviour: Option<CacheBehaviour>,
+    state: &State,
+) -> crate::Result<Vec<ContentUpdate>> {
+    let instance = instance_rows::get_instance_by_id(instance_id, &state.pool)
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError("Unknown instance".to_string())
+        })?;
+    let content_set =
+        content_rows::get_applied_content_set(&instance.id, &state.pool)
+            .await?
+            .ok_or_else(|| {
+                crate::ErrorKind::InputError(format!(
+                    "Instance {} has no applied content set",
+                    instance.id
+                ))
+            })?;
+    let entries =
+        content_rows::get_content_entries(&content_set.id, &state.pool).await?;
+    let files =
+        content_rows::get_instance_files(&instance.id, &state.pool).await?;
+    let files_by_id = files
+        .into_iter()
+        .map(|file| (file.id.clone(), file))
+        .collect::<HashMap<_, _>>();
+    let candidates = entries
+        .into_iter()
+        .filter_map(|entry| {
+            let file = files_by_id.get(entry.file_id.as_ref()?)?;
+            let version_id = entry.version_id.clone()?;
+            Some((entry, file.clone(), version_id))
+        })
+        .collect::<Vec<_>>();
+
+    if candidates.is_empty() {
+        return Ok(Vec::new());
+    }
+
+    let installed_channels =
+        installed_update_channels(&candidates, cache_behaviour, state).await?;
+    let update_keys = candidates
+        .iter()
+        .map(|(entry, file, _)| {
+            update_cache_key(
+                file,
+                entry.project_type,
+                effective_update_channel(
+                    instance.update_channel,
+                    installed_channels.get(&file.sha1).copied(),
+                ),
+                &content_set.game_version,
+                content_set.loader.as_str(),
+            )
+        })
+        .collect::<Vec<_>>();
+    let update_key_refs = update_keys
+        .iter()
+        .map(|key| key.as_str())
+        .collect::<Vec<_>>();
+    let updates = CachedEntry::get_file_update_many(
+        &update_key_refs,
+        cache_behaviour,
+        &state.pool,
+        &state.api_semaphore,
+    )
+    .await?;
+    let mut updates_by_hash: HashMap<String, Vec<String>> = HashMap::new();
+    for update in updates {
+        updates_by_hash
+            .entry(update.hash)
+            .or_default()
+            .push(update.update_version_id);
+    }
+
+    let mut output = Vec::new();
+    for (entry, file, current_version_id) in candidates {
+        let update_version_id = updates_by_hash
+            .remove(&file.sha1)
+            .unwrap_or_default()
+            .into_iter()
+            .find(|update_version_id| update_version_id != &current_version_id);
+
+        content_rows::upsert_content_update_check(
+            &entry.id,
+            instance.update_channel,
+            update_version_id.as_deref(),
+            &state.pool,
+        )
+        .await?;
+
+        if let Some(update_version_id) = update_version_id {
+            output.push(ContentUpdate {
+                relative_path: file.relative_path,
+                current_version_id,
+                update_version_id,
+            });
+        }
+    }
+
+    Ok(output)
+}
+
+async fn installed_update_channels(
+    candidates: &[(ContentEntry, InstanceFile, String)],
+    cache_behaviour: Option<CacheBehaviour>,
+    state: &State,
+) -> crate::Result<HashMap<String, ReleaseChannel>> {
+    let version_ids = candidates
+        .iter()
+        .map(|(_, _, version_id)| version_id.as_str())
+        .collect::<Vec<_>>();
+    let versions = CachedEntry::get_version_many(
+        &version_ids,
+        cache_behaviour,
+        &state.pool,
+        &state.api_semaphore,
+    )
+    .await?;
+    let channels_by_version_id = versions
+        .into_iter()
+        .map(|version| {
+            (
+                version.id,
+                ReleaseChannel::from_version_type(&version.version_type),
+            )
+        })
+        .collect::<HashMap<_, _>>();
+
+    Ok(candidates
+        .iter()
+        .filter_map(|(_, file, version_id)| {
+            channels_by_version_id
+                .get(version_id)
+                .copied()
+                .map(|channel| (file.sha1.clone(), channel))
+        })
+        .collect())
+}
+
+fn effective_update_channel(
+    preferred: ReleaseChannel,
+    installed: Option<ReleaseChannel>,
+) -> ReleaseChannel {
+    installed.map_or(preferred, |channel| preferred.least_stable(channel))
+}
+
+fn update_cache_key(
+    file: &InstanceFile,
+    project_type: ProjectType,
+    channel: ReleaseChannel,
+    game_version: &str,
+    loader: &str,
+) -> String {
+    format!(
+        "{}-{}-{}-{}",
+        file.sha1,
+        if project_type == ProjectType::Mod {
+            loader.to_string()
+        } else {
+            project_type.get_loaders().join("+")
+        },
+        channel.key(),
+        game_version
+    )
+}
diff --git a/packages/app-lib/src/state/instances/commands/create_instance.rs b/packages/app-lib/src/state/instances/commands/create_instance.rs
new file mode 100644
index 0000000000..4f381f2816
--- /dev/null
+++ b/packages/app-lib/src/state/instances/commands/create_instance.rs
@@ -0,0 +1,233 @@
+use crate::launcher::get_loader_version_from_profile;
+use crate::state::instances::{
+    ContentSet, ContentSetStatus, ContentSourceKind, Instance,
+    InstanceLaunchOverrides, InstanceLink,
+    adapters::sqlite::{content_rows, instance_rows},
+};
+use crate::state::{
+    InstanceInstallStage, LauncherFeatureVersion, ModLoader, ReleaseChannel,
+    State,
+};
+use crate::util::fetch::{self, write_cached_icon};
+use crate::util::io;
+use chrono::Utc;
+use serde::{Deserialize, Serialize};
+use tracing::{info, trace};
+use uuid::Uuid;
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct CreateInstance {
+    pub name: String,
+    pub path: Option<String>,
+    pub game_version: String,
+    pub loader: ModLoader,
+    pub loader_version: Option<String>,
+    pub icon_path: Option<String>,
+    pub link: InstanceLink,
+}
+
+pub(crate) async fn create_instance(
+    input: CreateInstance,
+    state: &State,
+) -> crate::Result<Instance> {
+    trace!("Creating new instance. {}", input.name);
+
+    let (path, full_path) =
+        resolve_instance_path(&input.name, input.path.as_deref(), state)
+            .await?;
+    io::create_dir_all(&full_path).await?;
+
+    let result = async {
+        info!(
+            "Creating instance at path {}",
+            &io::canonicalize(&full_path)?.display()
+        );
+
+        let loader_version = if input.loader != ModLoader::Vanilla {
+            get_loader_version_from_profile(
+                &input.game_version,
+                input.loader,
+                input.loader_version.as_deref(),
+            )
+            .await?
+            .map(|value| value.id)
+        } else {
+            None
+        };
+
+        let icon_path =
+            resolve_icon_path(input.icon_path.as_deref(), state).await?;
+        let now = Utc::now();
+        let instance_id = format!("local:{}", Uuid::new_v4());
+        let content_set_id = format!("content-set:{}", Uuid::new_v4());
+        let instance = Instance {
+            id: instance_id.clone(),
+            path: path.clone(),
+            applied_content_set_id: Some(content_set_id.clone()),
+            install_stage: InstanceInstallStage::NotInstalled,
+            launcher_feature_version: LauncherFeatureVersion::MOST_RECENT,
+            update_channel: ReleaseChannel::Release,
+            name: input.name,
+            icon_path,
+            created: now,
+            modified: now,
+            last_played: None,
+            submitted_time_played: 0,
+            recent_time_played: 0,
+        };
+        let content_set = ContentSet {
+            id: content_set_id,
+            instance_id: instance_id.clone(),
+            name: "Default".to_string(),
+            source_kind: content_source_kind(&input.link),
+            status: ContentSetStatus::Available,
+            game_version: input.game_version,
+            protocol_version: None,
+            loader: input.loader,
+            loader_version,
+            created: now,
+            modified: now,
+        };
+        let launch_overrides =
+            InstanceLaunchOverrides::empty(instance_id.clone());
+
+        let mut tx = state.pool.begin().await?;
+        instance_rows::insert_instance(&instance, &mut tx).await?;
+        content_rows::insert_content_set(&content_set, &mut tx).await?;
+        instance_rows::upsert_instance_link(&instance_id, &input.link, &mut tx)
+            .await?;
+        instance_rows::replace_instance_groups(&instance_id, &[], &mut tx)
+            .await?;
+        instance_rows::upsert_instance_launch_overrides(
+            &launch_overrides,
+            &mut tx,
+        )
+        .await?;
+        tx.commit().await?;
+
+        crate::state::instances::watcher::watch_instance_folder(
+            &instance.path,
+            &state.file_watcher,
+            &state.directories,
+        )
+        .await;
+
+        Ok(instance)
+    }
+    .await;
+
+    if result.is_err() {
+        let _ = io::remove_dir_all(&full_path).await;
+    }
+
+    result
+}
+
+async fn resolve_instance_path(
+    name: &str,
+    path: Option<&str>,
+    state: &State,
+) -> crate::Result<(String, std::path::PathBuf)> {
+    let base_path = path
+        .map(ToOwned::to_owned)
+        .unwrap_or_else(|| sanitize_instance_name(name));
+    let mut path = base_path.clone();
+    let mut full_path = state.directories.instances_dir().join(&path);
+
+    if path_available(&path, &full_path, state).await? {
+        return Ok((path, full_path));
+    }
+
+    let mut which = 1;
+    loop {
+        path = format!("{base_path} ({which})");
+        full_path = state.directories.instances_dir().join(&path);
+
+        if path_available(&path, &full_path, state).await? {
+            return Ok((path, full_path));
+        }
+
+        which += 1;
+    }
+}
+
+async fn path_available(
+    path: &str,
+    full_path: &std::path::Path,
+    state: &State,
+) -> crate::Result<bool> {
+    if full_path.exists() {
+        return Ok(false);
+    }
+
+    Ok(instance_rows::get_instance_by_path(path, &state.pool)
+        .await?
+        .is_none())
+}
+
+async fn resolve_icon_path(
+    icon_path: Option<&str>,
+    state: &State,
+) -> crate::Result<Option<String>> {
+    let Some(icon) = icon_path else {
+        return Ok(None);
+    };
+
+    let (bytes, file_name) = if icon.starts_with("https://")
+        || icon.starts_with("http://")
+    {
+        let fetched = fetch::fetch(
+            icon,
+            None,
+            None,
+            None,
+            &state.fetch_semaphore,
+            &state.pool,
+        )
+        .await?;
+        let name = icon.rsplit('/').next().unwrap_or("icon").to_string();
+        (fetched, name)
+    } else {
+        let data = io::read(state.directories.caches_dir().join(icon)).await?;
+        (bytes::Bytes::from(data), icon.to_string())
+    };
+
+    let file = write_cached_icon(
+        &file_name,
+        &state.directories.caches_dir(),
+        bytes,
+        &state.io_semaphore,
+    )
+    .await?;
+
+    Ok(Some(file.to_string_lossy().to_string()))
+}
+
+fn content_source_kind(link: &InstanceLink) -> ContentSourceKind {
+    match link {
+        InstanceLink::Unmanaged => ContentSourceKind::Local,
+        InstanceLink::ModrinthModpack { .. } => {
+            ContentSourceKind::ModrinthModpack
+        }
+        InstanceLink::ServerProject { .. }
+        | InstanceLink::ServerProjectModpack { .. } => {
+            ContentSourceKind::ServerProject
+        }
+        InstanceLink::ModrinthHosting { .. } => {
+            ContentSourceKind::ModrinthHosting
+        }
+        InstanceLink::ImportedModpack { .. } => {
+            ContentSourceKind::ImportedModpack
+        }
+        InstanceLink::SharedInstance { .. } => {
+            ContentSourceKind::SharedInstance
+        }
+    }
+}
+
+fn sanitize_instance_name(input: &str) -> String {
+    input.replace(
+        ['/', '\\', '?', '*', ':', '\'', '\"', '|', '<', '>', '!'],
+        "_",
+    )
+}
diff --git a/packages/app-lib/src/state/instances/commands/edit_instance.rs b/packages/app-lib/src/state/instances/commands/edit_instance.rs
new file mode 100644
index 0000000000..0c13191fd5
--- /dev/null
+++ b/packages/app-lib/src/state/instances/commands/edit_instance.rs
@@ -0,0 +1,255 @@
+use crate::state::instances::{
+    Instance, InstanceLaunchOverrides, InstanceLink,
+    adapters::sqlite::{content_rows, instance_rows},
+};
+use crate::state::{
+    Hooks, InstanceInstallStage, LauncherFeatureVersion, MemorySettings,
+    ModLoader, ReleaseChannel, WindowSize,
+};
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+use sqlx::SqlitePool;
+
+#[derive(Clone, Debug, Default, Serialize, Deserialize)]
+pub struct EditInstance {
+    pub install_stage: Option<InstanceInstallStage>,
+    pub launcher_feature_version: Option<LauncherFeatureVersion>,
+    pub name: Option<String>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        with = "serde_with::rust::double_option"
+    )]
+    pub icon_path: Option<Option<String>>,
+    pub update_channel: Option<ReleaseChannel>,
+    pub groups: Option<Vec<String>>,
+    pub link: Option<InstanceLink>,
+    pub launch_overrides: Option<InstanceLaunchOverridesPatch>,
+    pub content_set_patch: Option<AppliedContentSetPatch>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        with = "serde_with::rust::double_option"
+    )]
+    pub last_played: Option<Option<DateTime<Utc>>>,
+    pub submitted_time_played: Option<u64>,
+    pub recent_time_played: Option<u64>,
+}
+
+#[derive(Clone, Debug, Default, Serialize, Deserialize)]
+pub struct InstanceLaunchOverridesPatch {
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        with = "serde_with::rust::double_option"
+    )]
+    pub java_path: Option<Option<String>>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        with = "serde_with::rust::double_option"
+    )]
+    pub extra_launch_args: Option<Option<Vec<String>>>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        with = "serde_with::rust::double_option"
+    )]
+    pub custom_env_vars: Option<Option<Vec<(String, String)>>>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        with = "serde_with::rust::double_option"
+    )]
+    pub memory: Option<Option<MemorySettings>>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        with = "serde_with::rust::double_option"
+    )]
+    pub force_fullscreen: Option<Option<bool>>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        with = "serde_with::rust::double_option"
+    )]
+    pub game_resolution: Option<Option<WindowSize>>,
+    pub hooks: Option<Hooks>,
+}
+
+#[derive(Clone, Debug, Default, Serialize, Deserialize)]
+pub struct AppliedContentSetPatch {
+    pub game_version: Option<String>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        with = "serde_with::rust::double_option"
+    )]
+    pub protocol_version: Option<Option<u32>>,
+    pub loader: Option<ModLoader>,
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        with = "serde_with::rust::double_option"
+    )]
+    pub loader_version: Option<Option<String>>,
+}
+
+pub(crate) async fn edit_instance(
+    instance_id: &str,
+    patch: EditInstance,
+    pool: &SqlitePool,
+) -> crate::Result<Instance> {
+    let mut instance = instance_rows::get_instance_by_id(instance_id, pool)
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError("Unknown instance".to_string())
+        })?;
+    let now = Utc::now();
+
+    apply_instance_patch(&mut instance, &patch, now);
+
+    let mut content_set = match patch.content_set_patch {
+        Some(content_set_patch) => {
+            let applied_content_set =
+                content_rows::get_applied_content_set(&instance.id, pool)
+                    .await?
+                    .ok_or_else(|| {
+                        crate::ErrorKind::InputError(format!(
+                            "Instance {} has no applied content set",
+                            instance.id
+                        ))
+                    })?;
+            Some(apply_content_set_patch(
+                applied_content_set,
+                content_set_patch,
+                now,
+            ))
+        }
+        None => None,
+    };
+    let mut launch_overrides = match patch.launch_overrides {
+        Some(launch_patch) => {
+            let current = instance_rows::get_instance_launch_overrides(
+                &instance.id,
+                pool,
+            )
+            .await?
+            .unwrap_or_else(|| {
+                InstanceLaunchOverrides::empty(instance.id.clone())
+            });
+            Some(apply_launch_overrides_patch(current, launch_patch))
+        }
+        None => None,
+    };
+
+    let mut tx = pool.begin().await?;
+    instance_rows::update_instance(&instance, &mut tx).await?;
+
+    if let Some(content_set) = content_set.as_mut() {
+        content_rows::update_content_set(content_set, &mut tx).await?;
+    }
+
+    if let Some(link) = &patch.link {
+        instance_rows::upsert_instance_link(&instance.id, link, &mut tx)
+            .await?;
+    }
+
+    if let Some(groups) = &patch.groups {
+        instance_rows::replace_instance_groups(&instance.id, groups, &mut tx)
+            .await?;
+    }
+
+    if let Some(overrides) = launch_overrides.as_mut() {
+        instance_rows::upsert_instance_launch_overrides(overrides, &mut tx)
+            .await?;
+    }
+
+    tx.commit().await?;
+
+    Ok(instance)
+}
+
+fn apply_instance_patch(
+    instance: &mut Instance,
+    patch: &EditInstance,
+    now: DateTime<Utc>,
+) {
+    if let Some(install_stage) = patch.install_stage {
+        instance.install_stage = install_stage;
+    }
+    if let Some(launcher_feature_version) = patch.launcher_feature_version {
+        instance.launcher_feature_version = launcher_feature_version;
+    }
+    if let Some(name) = &patch.name {
+        instance.name = name.clone();
+    }
+    if let Some(icon_path) = &patch.icon_path {
+        instance.icon_path = icon_path.clone();
+    }
+    if let Some(update_channel) = patch.update_channel {
+        instance.update_channel = update_channel;
+    }
+    if let Some(last_played) = &patch.last_played {
+        instance.last_played = *last_played;
+    }
+    if let Some(submitted_time_played) = patch.submitted_time_played {
+        instance.submitted_time_played = submitted_time_played;
+    }
+    if let Some(recent_time_played) = patch.recent_time_played {
+        instance.recent_time_played = recent_time_played;
+    }
+
+    instance.modified = now;
+}
+
+fn apply_content_set_patch(
+    mut content_set: crate::state::instances::ContentSet,
+    patch: AppliedContentSetPatch,
+    now: DateTime<Utc>,
+) -> crate::state::instances::ContentSet {
+    if let Some(game_version) = patch.game_version {
+        content_set.game_version = game_version;
+    }
+    if let Some(protocol_version) = patch.protocol_version {
+        content_set.protocol_version = protocol_version;
+    }
+    if let Some(loader) = patch.loader {
+        content_set.loader = loader;
+    }
+    if let Some(loader_version) = patch.loader_version {
+        content_set.loader_version = loader_version;
+    }
+
+    content_set.modified = now;
+    content_set
+}
+
+fn apply_launch_overrides_patch(
+    mut overrides: InstanceLaunchOverrides,
+    patch: InstanceLaunchOverridesPatch,
+) -> InstanceLaunchOverrides {
+    if let Some(java_path) = patch.java_path {
+        overrides.java_path = java_path;
+    }
+    if let Some(extra_launch_args) = patch.extra_launch_args {
+        overrides.extra_launch_args = extra_launch_args;
+    }
+    if let Some(custom_env_vars) = patch.custom_env_vars {
+        overrides.custom_env_vars = custom_env_vars;
+    }
+    if let Some(memory) = patch.memory {
+        overrides.memory = memory;
+    }
+    if let Some(force_fullscreen) = patch.force_fullscreen {
+        overrides.force_fullscreen = force_fullscreen;
+    }
+    if let Some(game_resolution) = patch.game_resolution {
+        overrides.game_resolution = game_resolution;
+    }
+    if let Some(hooks) = patch.hooks {
+        overrides.hooks = hooks;
+    }
+
+    overrides
+}
diff --git a/packages/app-lib/src/state/instances/commands/get_instance.rs b/packages/app-lib/src/state/instances/commands/get_instance.rs
new file mode 100644
index 0000000000..ea0b85d37d
--- /dev/null
+++ b/packages/app-lib/src/state/instances/commands/get_instance.rs
@@ -0,0 +1,79 @@
+use crate::state::instances::{
+    ContentSet, Instance, InstanceLaunchOverrides, InstanceLink,
+    adapters::sqlite::{content_rows, instance_rows},
+};
+use serde::{Deserialize, Serialize};
+use sqlx::SqlitePool;
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct InstanceMetadata {
+    pub instance: Instance,
+    pub applied_content_set: ContentSet,
+    pub link: InstanceLink,
+    pub groups: Vec<String>,
+    pub launch_overrides: InstanceLaunchOverrides,
+}
+
+pub(crate) async fn get_instance(
+    instance_id: &str,
+    pool: &SqlitePool,
+) -> crate::Result<Option<InstanceMetadata>> {
+    get_instance_metadata(instance_id, pool).await
+}
+
+pub(crate) async fn get_instance_metadata(
+    instance_id: &str,
+    pool: &SqlitePool,
+) -> crate::Result<Option<InstanceMetadata>> {
+    let Some(instance) =
+        instance_rows::get_instance_by_id(instance_id, pool).await?
+    else {
+        return Ok(None);
+    };
+
+    instance_metadata(instance, pool).await.map(Some)
+}
+
+pub(crate) async fn list_instances(
+    pool: &SqlitePool,
+) -> crate::Result<Vec<InstanceMetadata>> {
+    let instances = instance_rows::list_instances(pool).await?;
+    let mut metadata = Vec::with_capacity(instances.len());
+
+    for instance in instances {
+        metadata.push(instance_metadata(instance, pool).await?);
+    }
+
+    Ok(metadata)
+}
+
+async fn instance_metadata(
+    instance: Instance,
+    pool: &SqlitePool,
+) -> crate::Result<InstanceMetadata> {
+    let applied_content_set =
+        content_rows::get_applied_content_set(&instance.id, pool)
+            .await?
+            .ok_or_else(|| {
+                crate::ErrorKind::InputError(format!(
+                    "Instance {} has no applied content set",
+                    instance.id
+                ))
+            })?;
+    let link = instance_rows::get_instance_link(&instance.id, pool).await?;
+    let groups = instance_rows::get_instance_groups(&instance.id, pool).await?;
+    let launch_overrides =
+        instance_rows::get_instance_launch_overrides(&instance.id, pool)
+            .await?
+            .unwrap_or_else(|| {
+                InstanceLaunchOverrides::empty(instance.id.clone())
+            });
+
+    Ok(InstanceMetadata {
+        instance,
+        applied_content_set,
+        link,
+        groups,
+        launch_overrides,
+    })
+}
diff --git a/packages/app-lib/src/state/instances/commands/launch_context.rs b/packages/app-lib/src/state/instances/commands/launch_context.rs
new file mode 100644
index 0000000000..2192466304
--- /dev/null
+++ b/packages/app-lib/src/state/instances/commands/launch_context.rs
@@ -0,0 +1,179 @@
+use crate::state::InstanceInstallStage;
+use crate::state::instances::{
+    InstanceLaunchContext, InstanceLaunchOverrides,
+    adapters::sqlite::{content_rows, instance_rows},
+};
+use chrono::{DateTime, Utc};
+use sqlx::SqlitePool;
+
+pub(crate) async fn get_instance_launch_context(
+    instance_id: &str,
+    pool: &SqlitePool,
+) -> crate::Result<Option<InstanceLaunchContext>> {
+    let Some(instance) =
+        instance_rows::get_instance_by_id(instance_id, pool).await?
+    else {
+        return Ok(None);
+    };
+
+    let applied_content_set =
+        content_rows::get_applied_content_set(&instance.id, pool)
+            .await?
+            .ok_or_else(|| {
+                crate::ErrorKind::InputError(format!(
+                    "Instance {} has no applied content set",
+                    instance.id
+                ))
+            })?;
+    let link = instance_rows::get_instance_link(&instance.id, pool).await?;
+    let launch_overrides =
+        instance_rows::get_instance_launch_overrides(&instance.id, pool)
+            .await?
+            .unwrap_or_else(|| {
+                InstanceLaunchOverrides::empty(instance.id.clone())
+            });
+
+    Ok(Some(InstanceLaunchContext {
+        instance,
+        applied_content_set,
+        link,
+        launch_overrides,
+    }))
+}
+
+pub(crate) async fn set_instance_install_stage(
+    instance_id: &str,
+    install_stage: InstanceInstallStage,
+    pool: &SqlitePool,
+) -> crate::Result<()> {
+    sqlx::query(
+        "
+		UPDATE instances
+		SET install_stage = ?, modified = ?
+		WHERE id = ?
+		",
+    )
+    .bind(install_stage.as_str())
+    .bind(Utc::now().timestamp())
+    .bind(instance_id)
+    .execute(pool)
+    .await?;
+
+    Ok(())
+}
+
+pub(crate) async fn set_applied_content_set_loader_version(
+    instance_id: &str,
+    loader_version: Option<&str>,
+    pool: &SqlitePool,
+) -> crate::Result<()> {
+    sqlx::query(
+        "
+		UPDATE instance_content_sets
+		SET loader_version = ?, modified = ?
+		WHERE id = (
+			SELECT applied_content_set_id
+			FROM instances
+			WHERE id = ?
+		)
+		",
+    )
+    .bind(loader_version)
+    .bind(Utc::now().timestamp())
+    .bind(instance_id)
+    .execute(pool)
+    .await?;
+
+    Ok(())
+}
+
+pub(crate) async fn set_applied_content_set_protocol_version(
+    instance_id: &str,
+    protocol_version: Option<u32>,
+    pool: &SqlitePool,
+) -> crate::Result<()> {
+    sqlx::query(
+        "
+		UPDATE instance_content_sets
+		SET protocol_version = ?, modified = ?
+		WHERE id = (
+			SELECT applied_content_set_id
+			FROM instances
+			WHERE id = ?
+		)
+		",
+    )
+    .bind(protocol_version.map(i64::from))
+    .bind(Utc::now().timestamp())
+    .bind(instance_id)
+    .execute(pool)
+    .await?;
+
+    Ok(())
+}
+
+pub(crate) async fn set_instance_last_played(
+    instance_id: &str,
+    last_played: DateTime<Utc>,
+    pool: &SqlitePool,
+) -> crate::Result<()> {
+    sqlx::query(
+        "
+		UPDATE instances
+		SET last_played = ?, modified = ?
+		WHERE id = ?
+		",
+    )
+    .bind(last_played.timestamp())
+    .bind(Utc::now().timestamp())
+    .bind(instance_id)
+    .execute(pool)
+    .await?;
+
+    Ok(())
+}
+
+pub(crate) async fn add_instance_recent_playtime(
+    instance_id: &str,
+    seconds: u64,
+    pool: &SqlitePool,
+) -> crate::Result<()> {
+    sqlx::query(
+        "
+		UPDATE instances
+		SET recent_time_played = recent_time_played + ?, modified = ?
+		WHERE id = ?
+		",
+    )
+    .bind(seconds as i64)
+    .bind(Utc::now().timestamp())
+    .bind(instance_id)
+    .execute(pool)
+    .await?;
+
+    Ok(())
+}
+
+pub(crate) async fn mark_instance_playtime_submitted(
+    instance_id: &str,
+    recent_time_played: u64,
+    pool: &SqlitePool,
+) -> crate::Result<()> {
+    sqlx::query(
+        "
+		UPDATE instances
+		SET
+			submitted_time_played = submitted_time_played + ?,
+			recent_time_played = 0,
+			modified = ?
+		WHERE id = ?
+		",
+    )
+    .bind(recent_time_played as i64)
+    .bind(Utc::now().timestamp())
+    .bind(instance_id)
+    .execute(pool)
+    .await?;
+
+    Ok(())
+}
diff --git a/packages/app-lib/src/state/instances/commands/list_content.rs b/packages/app-lib/src/state/instances/commands/list_content.rs
new file mode 100644
index 0000000000..b2d6ff9b21
--- /dev/null
+++ b/packages/app-lib/src/state/instances/commands/list_content.rs
@@ -0,0 +1,1168 @@
+use super::sync_content_files::{
+    project_type_for_file, sync_instance_content_files,
+};
+use crate::State;
+use crate::pack::install_from::{PackFileHash, PackFormat};
+use crate::state::instances::adapters::sqlite;
+use crate::state::instances::{
+    ContentEntry, ContentSet, Instance, InstanceLink,
+};
+use crate::state::{
+    CacheBehaviour, CachedEntry, CachedFile, ContentFile, ContentItem,
+    ContentItemOwner, ContentItemProject, ContentItemVersion, Dependency,
+    LinkedModpackInfo, Organization, OwnerType, Project, ProjectType,
+    ReleaseChannel, TeamMember, Version,
+};
+use crate::util::fetch::{
+    DownloadMeta, DownloadReason, FetchSemaphore, fetch_mirrors, sha1_async,
+};
+use async_zip::base::read::seek::ZipFileReader;
+use dashmap::DashMap;
+use sqlx::SqlitePool;
+use std::collections::{HashMap, HashSet};
+use std::io::Cursor;
+
+#[derive(Clone, Debug)]
+struct ResolvedContentScope {
+    instance: Instance,
+    content_set: ContentSet,
+}
+
+#[derive(Clone, Copy, Debug)]
+enum ContentFilter<'a> {
+    All,
+    ExcludeModpack(&'a ModpackIdentifiers),
+    OnlyModpack(&'a ModpackIdentifiers),
+}
+
+pub(crate) async fn list_content_sets(
+    instance_id: &str,
+    pool: &SqlitePool,
+) -> crate::Result<Vec<ContentSet>> {
+    let instance = sqlite::instance_rows::get_instance_by_id(instance_id, pool)
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError("Unknown instance".to_string())
+        })?;
+
+    sqlite::content_rows::get_content_sets_for_instance(&instance.id, pool)
+        .await
+}
+
+pub(crate) async fn get_content_projects(
+    instance_id: &str,
+    content_set_id: Option<&str>,
+    cache_behaviour: Option<CacheBehaviour>,
+    state: &State,
+) -> crate::Result<DashMap<String, ContentFile>> {
+    let resolved = resolve_content_scope_with_instance(
+        instance_id,
+        content_set_id,
+        &state.pool,
+    )
+    .await?;
+
+    content_projects_for_scope(
+        &resolved,
+        cache_behaviour,
+        state,
+        ContentFilter::All,
+    )
+    .await
+}
+
+pub(crate) async fn get_installed_project_ids_for_instance(
+    instance_id: &str,
+    content_set_id: Option<&str>,
+    state: &State,
+) -> crate::Result<Vec<String>> {
+    let projects =
+        get_content_projects(instance_id, content_set_id, None, state).await?;
+
+    Ok(projects
+        .into_iter()
+        .filter_map(|(_, file)| {
+            file.metadata.map(|metadata| metadata.project_id)
+        })
+        .collect::<HashSet<_>>()
+        .into_iter()
+        .collect())
+}
+
+pub(crate) async fn list_content(
+    instance_id: &str,
+    content_set_id: Option<&str>,
+    cache_behaviour: Option<CacheBehaviour>,
+    state: &State,
+) -> crate::Result<Vec<ContentItem>> {
+    let resolved = resolve_content_scope_with_instance(
+        instance_id,
+        content_set_id,
+        &state.pool,
+    )
+    .await?;
+    let modpack_ids = match linked_modpack_ids_for_instance(
+        &resolved.instance.id,
+        &state.pool,
+    )
+    .await?
+    {
+        Some((_, version_id)) => get_modpack_identifiers(
+            &version_id,
+            &resolved.content_set,
+            &state.pool,
+            &state.api_semaphore,
+        )
+        .await
+        .ok(),
+        None => None,
+    };
+    let filter = modpack_ids
+        .as_ref()
+        .map(ContentFilter::ExcludeModpack)
+        .unwrap_or(ContentFilter::All);
+    let files =
+        content_projects_for_scope(&resolved, cache_behaviour, state, filter)
+            .await?;
+    let files = files.into_iter().collect::<Vec<_>>();
+
+    content_files_to_content_items(
+        &resolved.instance,
+        &files,
+        cache_behaviour,
+        state,
+    )
+    .await
+}
+
+pub(crate) async fn list_linked_modpack_content(
+    instance_id: &str,
+    content_set_id: Option<&str>,
+    cache_behaviour: Option<CacheBehaviour>,
+    state: &State,
+) -> crate::Result<Vec<ContentItem>> {
+    let resolved = resolve_content_scope_with_instance(
+        instance_id,
+        content_set_id,
+        &state.pool,
+    )
+    .await?;
+    let Some((_, version_id)) =
+        linked_modpack_ids_for_instance(&resolved.instance.id, &state.pool)
+            .await?
+    else {
+        return Ok(Vec::new());
+    };
+    let ids = match get_modpack_identifiers(
+        &version_id,
+        &resolved.content_set,
+        &state.pool,
+        &state.api_semaphore,
+    )
+    .await
+    {
+        Ok(ids) => ids,
+        Err(err) => {
+            tracing::warn!("Failed to fetch modpack identifiers: {}", err);
+            return Ok(Vec::new());
+        }
+    };
+    let files = content_projects_for_scope(
+        &resolved,
+        cache_behaviour,
+        state,
+        ContentFilter::OnlyModpack(&ids),
+    )
+    .await?;
+    let files = files.into_iter().collect::<Vec<_>>();
+
+    content_files_to_content_items(
+        &resolved.instance,
+        &files,
+        cache_behaviour,
+        state,
+    )
+    .await
+}
+
+pub(crate) async fn get_linked_modpack_info(
+    instance_id: &str,
+    content_set_id: Option<&str>,
+    cache_behaviour: Option<CacheBehaviour>,
+    state: &State,
+) -> crate::Result<Option<LinkedModpackInfo>> {
+    let resolved = resolve_content_scope_with_instance(
+        instance_id,
+        content_set_id,
+        &state.pool,
+    )
+    .await?;
+    let Some((project_id, version_id)) =
+        linked_modpack_ids_for_instance(&resolved.instance.id, &state.pool)
+            .await?
+    else {
+        return Ok(None);
+    };
+    let (project, version, all_versions) = tokio::try_join!(
+        CachedEntry::get_project(
+            &project_id,
+            cache_behaviour,
+            &state.pool,
+            &state.api_semaphore,
+        ),
+        CachedEntry::get_version(
+            &version_id,
+            cache_behaviour,
+            &state.pool,
+            &state.api_semaphore,
+        ),
+        CachedEntry::get_project_versions(
+            &project_id,
+            cache_behaviour,
+            &state.pool,
+            &state.api_semaphore,
+        ),
+    )?;
+    let version = version.ok_or_else(|| {
+        crate::ErrorKind::InputError(format!(
+            "Linked modpack version {version_id} not found"
+        ))
+    })?;
+    let (project, all_versions) = if version.project_id != project_id {
+        let (modpack_project, modpack_versions) = tokio::try_join!(
+            CachedEntry::get_project(
+                &version.project_id,
+                cache_behaviour,
+                &state.pool,
+                &state.api_semaphore,
+            ),
+            CachedEntry::get_project_versions(
+                &version.project_id,
+                cache_behaviour,
+                &state.pool,
+                &state.api_semaphore,
+            ),
+        )?;
+        (modpack_project.or(project), modpack_versions)
+    } else {
+        (project, all_versions)
+    };
+    let project = project.ok_or_else(|| {
+        crate::ErrorKind::InputError(format!(
+            "Linked modpack project {project_id} not found"
+        ))
+    })?;
+    let owner = if let Some(org_id) = &project.organization {
+        let org = CachedEntry::get_organization(
+            org_id,
+            cache_behaviour,
+            &state.pool,
+            &state.api_semaphore,
+        )
+        .await?;
+        org.map(|org| ContentItemOwner {
+            id: org.id,
+            name: org.name,
+            avatar_url: org.icon_url,
+            owner_type: OwnerType::Organization,
+        })
+    } else {
+        let team = CachedEntry::get_team(
+            &project.team,
+            cache_behaviour,
+            &state.pool,
+            &state.api_semaphore,
+        )
+        .await?;
+        team.and_then(|team| {
+            team.into_iter()
+                .find(|member| member.is_owner)
+                .map(|member| ContentItemOwner {
+                    id: member.user.id,
+                    name: member.user.username,
+                    avatar_url: member.user.avatar_url,
+                    owner_type: OwnerType::User,
+                })
+        })
+    };
+    let (has_update, update_version_id, update_version) = check_modpack_update(
+        &version_id,
+        &version,
+        all_versions,
+        resolved.instance.update_channel,
+    );
+
+    Ok(Some(LinkedModpackInfo {
+        project,
+        version,
+        owner,
+        has_update,
+        update_version_id,
+        update_version,
+    }))
+}
+
+pub(crate) async fn dependencies_to_content_items(
+    dependencies: &[Dependency],
+    cache_behaviour: Option<CacheBehaviour>,
+    pool: &SqlitePool,
+    fetch_semaphore: &FetchSemaphore,
+) -> crate::Result<Vec<ContentItem>> {
+    let project_ids = dependencies
+        .iter()
+        .filter_map(|dependency| dependency.project_id.clone())
+        .collect::<HashSet<_>>();
+    if project_ids.is_empty() {
+        return Ok(Vec::new());
+    }
+    let version_ids = dependencies
+        .iter()
+        .filter_map(|dependency| dependency.version_id.clone())
+        .collect::<HashSet<_>>();
+    let meta = resolve_metadata(
+        &project_ids,
+        &version_ids,
+        cache_behaviour,
+        pool,
+        fetch_semaphore,
+    )
+    .await?;
+    let mut items = dependencies
+        .iter()
+        .filter_map(|dependency| {
+            let project_id = dependency.project_id.as_ref()?;
+            let project = meta
+                .projects
+                .iter()
+                .find(|project| &project.id == project_id)?;
+            let version =
+                dependency.version_id.as_ref().and_then(|version_id| {
+                    meta.versions
+                        .iter()
+                        .find(|version| &version.id == version_id)
+                });
+            let owner =
+                resolve_owner(project, &meta.teams, &meta.organizations);
+            let project_type =
+                project_type_from_api_name(&project.project_type);
+
+            Some(ContentItem {
+                file_name: version
+                    .and_then(|version| version.files.first())
+                    .map(|file| file.filename.clone())
+                    .unwrap_or_else(|| {
+                        format!(
+                            "{}.jar",
+                            project.slug.as_deref().unwrap_or(&project.id)
+                        )
+                    }),
+                file_path: String::new(),
+                id: String::new(),
+                size: version
+                    .and_then(|version| version.files.first())
+                    .map(|file| file.size as u64)
+                    .unwrap_or(0),
+                enabled: true,
+                project_type,
+                project: Some(ContentItemProject {
+                    id: project.id.clone(),
+                    slug: project.slug.clone(),
+                    title: project.title.clone(),
+                    icon_url: project.icon_url.clone(),
+                }),
+                version: version.map(|version| ContentItemVersion {
+                    id: version.id.clone(),
+                    version_number: version.version_number.clone(),
+                    file_name: version
+                        .files
+                        .first()
+                        .map(|file| file.filename.clone())
+                        .unwrap_or_default(),
+                    date_published: Some(version.date_published.to_rfc3339()),
+                }),
+                owner,
+                has_update: false,
+                update_version_id: None,
+                date_added: None,
+            })
+        })
+        .collect::<Vec<_>>();
+    sort_content_items(&mut items);
+
+    Ok(items)
+}
+
+async fn resolve_content_scope_with_instance(
+    instance_id: &str,
+    content_set_id: Option<&str>,
+    pool: &SqlitePool,
+) -> crate::Result<ResolvedContentScope> {
+    let instance = sqlite::instance_rows::get_instance_by_id(instance_id, pool)
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError("Unknown instance".to_string())
+        })?;
+    let content_set = match content_set_id {
+        Some(content_set_id) => {
+            let content_set =
+                sqlite::content_rows::get_content_set(content_set_id, pool)
+                    .await?
+                    .ok_or_else(|| {
+                        crate::ErrorKind::InputError(format!(
+                            "Unknown content set {content_set_id}"
+                        ))
+                    })?;
+
+            if content_set.instance_id != instance.id {
+                return Err(crate::ErrorKind::InputError(format!(
+					"Content set {content_set_id} does not belong to instance {}",
+					instance.id
+				))
+				.into());
+            }
+
+            content_set
+        }
+        None => {
+            sqlite::content_rows::get_applied_content_set(&instance.id, pool)
+                .await?
+                .ok_or_else(|| {
+                    crate::ErrorKind::InputError(format!(
+                        "Instance {} has no applied content set",
+                        instance.id
+                    ))
+                })?
+        }
+    };
+
+    Ok(ResolvedContentScope {
+        instance,
+        content_set,
+    })
+}
+
+async fn content_projects_for_scope(
+    resolved: &ResolvedContentScope,
+    cache_behaviour: Option<CacheBehaviour>,
+    state: &State,
+    filter: ContentFilter<'_>,
+) -> crate::Result<DashMap<String, ContentFile>> {
+    let files = sync_instance_content_files(&resolved.instance, state).await?;
+    let entries = sqlite::content_rows::get_content_entries(
+        &resolved.content_set.id,
+        &state.pool,
+    )
+    .await?;
+    let entries_by_file_id = entries
+        .iter()
+        .filter_map(|entry| {
+            entry.file_id.as_deref().map(|file_id| (file_id, entry))
+        })
+        .collect::<HashMap<_, _>>();
+    let hashes = files
+        .iter()
+        .map(|file| file.sha1.as_str())
+        .collect::<Vec<_>>();
+    let file_info = CachedEntry::get_file_many(
+        &hashes,
+        cache_behaviour,
+        &state.pool,
+        &state.api_semaphore,
+    )
+    .await?;
+    let file_info_by_hash = file_info
+        .into_iter()
+        .map(|file| (file.hash.clone(), file))
+        .collect::<HashMap<_, _>>();
+    let installed_channels = get_installed_update_channels(
+        &file_info_by_hash,
+        cache_behaviour,
+        &state.pool,
+        &state.api_semaphore,
+    )
+    .await?;
+    let update_keys = files
+        .iter()
+        .filter(|file| file_info_by_hash.contains_key(&file.sha1))
+        .filter_map(|file| {
+            let project_type = project_type_for_file(file)?;
+            let channel = resolved.instance.update_channel.least_stable(
+                installed_channels
+                    .get(&file.sha1)
+                    .copied()
+                    .unwrap_or(resolved.instance.update_channel),
+            );
+            Some(file_update_cache_key(
+                &file.sha1,
+                project_type,
+                &resolved.content_set,
+                channel,
+            ))
+        })
+        .collect::<Vec<_>>();
+    let update_key_refs =
+        update_keys.iter().map(String::as_str).collect::<Vec<_>>();
+    let file_updates = CachedEntry::get_file_update_many(
+        &update_key_refs,
+        cache_behaviour,
+        &state.pool,
+        &state.api_semaphore,
+    )
+    .await?;
+    let mut updates_by_hash: HashMap<String, Vec<String>> = HashMap::new();
+    for update in file_updates {
+        updates_by_hash
+            .entry(update.hash)
+            .or_default()
+            .push(update.update_version_id);
+    }
+    let output = DashMap::new();
+
+    for file in files {
+        if file.missing {
+            continue;
+        }
+
+        let Some(project_type) = project_type_for_file(&file) else {
+            continue;
+        };
+        let metadata = file_info_by_hash.get(&file.sha1).cloned();
+        let entry = entries_by_file_id.get(file.id.as_str()).copied();
+
+        match filter {
+            ContentFilter::All => {}
+            ContentFilter::ExcludeModpack(ids) => {
+                if ids.is_modpack_file(
+                    &file.sha1,
+                    metadata.as_ref(),
+                    entry.and_then(|entry| entry.project_id.as_deref()),
+                ) {
+                    continue;
+                }
+            }
+            ContentFilter::OnlyModpack(ids) => {
+                if !ids.is_modpack_file(
+                    &file.sha1,
+                    metadata.as_ref(),
+                    entry.and_then(|entry| entry.project_id.as_deref()),
+                ) {
+                    continue;
+                }
+            }
+        }
+
+        let update_version_id = metadata.as_ref().and_then(|metadata| {
+            let update_ids =
+                updates_by_hash.remove(&file.sha1).unwrap_or_default();
+            if !update_ids.contains(&metadata.version_id) {
+                update_ids.into_iter().next()
+            } else {
+                None
+            }
+        });
+
+        output.insert(
+            file.relative_path.clone(),
+            ContentFile {
+                update_version_id,
+                hash: file.sha1,
+                file_name: file.file_name,
+                size: file.size,
+                metadata: file_metadata_from_entry_or_cache(entry, metadata),
+                project_type,
+            },
+        );
+    }
+
+    Ok(output)
+}
+
+async fn get_installed_update_channels(
+    file_info_by_hash: &HashMap<String, CachedFile>,
+    cache_behaviour: Option<CacheBehaviour>,
+    pool: &SqlitePool,
+    fetch_semaphore: &FetchSemaphore,
+) -> crate::Result<HashMap<String, ReleaseChannel>> {
+    let version_ids = file_info_by_hash
+        .values()
+        .map(|file| file.version_id.as_str())
+        .collect::<HashSet<_>>();
+    if version_ids.is_empty() {
+        return Ok(HashMap::new());
+    }
+    let version_id_refs = version_ids.iter().copied().collect::<Vec<_>>();
+    let versions = CachedEntry::get_version_many(
+        &version_id_refs,
+        cache_behaviour,
+        pool,
+        fetch_semaphore,
+    )
+    .await?;
+    let channels_by_version_id = versions
+        .into_iter()
+        .map(|version| {
+            (
+                version.id,
+                ReleaseChannel::from_version_type(&version.version_type),
+            )
+        })
+        .collect::<HashMap<_, _>>();
+
+    Ok(file_info_by_hash
+        .iter()
+        .filter_map(|(hash, file)| {
+            channels_by_version_id
+                .get(&file.version_id)
+                .copied()
+                .map(|channel| (hash.clone(), channel))
+        })
+        .collect())
+}
+
+fn file_update_cache_key(
+    hash: &str,
+    project_type: ProjectType,
+    content_set: &ContentSet,
+    channel: ReleaseChannel,
+) -> String {
+    let loader_key = if project_type == ProjectType::Mod {
+        content_set.loader.as_str().to_string()
+    } else {
+        project_type.get_loaders().join("+")
+    };
+
+    format!(
+        "{}-{}-{}-{}",
+        hash,
+        loader_key,
+        channel.key(),
+        content_set.game_version
+    )
+}
+
+async fn content_files_to_content_items(
+    instance: &Instance,
+    files: &[(String, ContentFile)],
+    cache_behaviour: Option<CacheBehaviour>,
+    state: &State,
+) -> crate::Result<Vec<ContentItem>> {
+    let project_ids = files
+        .iter()
+        .filter_map(|(_, file)| {
+            file.metadata
+                .as_ref()
+                .map(|metadata| metadata.project_id.clone())
+        })
+        .collect::<HashSet<_>>();
+    let version_ids = files
+        .iter()
+        .filter_map(|(_, file)| {
+            file.metadata
+                .as_ref()
+                .map(|metadata| metadata.version_id.clone())
+        })
+        .collect::<HashSet<_>>();
+    let meta = resolve_metadata(
+        &project_ids,
+        &version_ids,
+        cache_behaviour,
+        &state.pool,
+        &state.api_semaphore,
+    )
+    .await?;
+    let instance_path = state.directories.instances_dir().join(&instance.path);
+    let paths = files
+        .iter()
+        .map(|(path, _)| instance_path.join(path))
+        .collect::<Vec<_>>();
+    let modification_times: Vec<Option<String>> =
+        tokio::task::spawn_blocking(move || {
+            paths
+                .iter()
+                .map(|path| {
+                    std::fs::metadata(path)
+                        .and_then(|metadata| metadata.modified())
+                        .ok()
+                        .map(|time| {
+                            chrono::DateTime::<chrono::Utc>::from(time)
+                                .to_rfc3339()
+                        })
+                })
+                .collect()
+        })
+        .await?;
+    let mut items = files
+        .iter()
+        .enumerate()
+        .map(|(index, (path, file))| {
+            let project = file.metadata.as_ref().and_then(|metadata| {
+                meta.projects
+                    .iter()
+                    .find(|project| project.id == metadata.project_id)
+            });
+            let version = file.metadata.as_ref().and_then(|metadata| {
+                meta.versions
+                    .iter()
+                    .find(|version| version.id == metadata.version_id)
+            });
+            let owner = project.and_then(|project| {
+                resolve_owner(project, &meta.teams, &meta.organizations)
+            });
+
+            ContentItem {
+                file_name: file.file_name.clone(),
+                file_path: path.clone(),
+                id: file.hash.clone(),
+                size: file.size,
+                enabled: !file.file_name.ends_with(".disabled"),
+                project_type: file.project_type,
+                project: project.map(|project| ContentItemProject {
+                    id: project.id.clone(),
+                    slug: project.slug.clone(),
+                    title: project.title.clone(),
+                    icon_url: project.icon_url.clone(),
+                }),
+                version: version.map(|version| ContentItemVersion {
+                    id: version.id.clone(),
+                    version_number: version.version_number.clone(),
+                    file_name: file.file_name.clone(),
+                    date_published: Some(version.date_published.to_rfc3339()),
+                }),
+                owner,
+                has_update: file.update_version_id.is_some(),
+                update_version_id: file.update_version_id.clone(),
+                date_added: modification_times[index].clone(),
+            }
+        })
+        .collect::<Vec<_>>();
+    sort_content_items(&mut items);
+
+    Ok(items)
+}
+
+struct ResolvedMetadata {
+    projects: Vec<Project>,
+    versions: Vec<Version>,
+    teams: Vec<Vec<TeamMember>>,
+    organizations: Vec<Organization>,
+}
+
+async fn resolve_metadata(
+    project_ids: &HashSet<String>,
+    version_ids: &HashSet<String>,
+    cache_behaviour: Option<CacheBehaviour>,
+    pool: &SqlitePool,
+    fetch_semaphore: &FetchSemaphore,
+) -> crate::Result<ResolvedMetadata> {
+    let project_id_refs =
+        project_ids.iter().map(String::as_str).collect::<Vec<_>>();
+    let version_id_refs =
+        version_ids.iter().map(String::as_str).collect::<Vec<_>>();
+    let (projects, versions) =
+        if !project_ids.is_empty() || !version_ids.is_empty() {
+            tokio::try_join!(
+                async {
+                    if project_ids.is_empty() {
+                        Ok(Vec::new())
+                    } else {
+                        CachedEntry::get_project_many(
+                            &project_id_refs,
+                            cache_behaviour,
+                            pool,
+                            fetch_semaphore,
+                        )
+                        .await
+                    }
+                },
+                async {
+                    if version_ids.is_empty() {
+                        Ok(Vec::new())
+                    } else {
+                        CachedEntry::get_version_many(
+                            &version_id_refs,
+                            cache_behaviour,
+                            pool,
+                            fetch_semaphore,
+                        )
+                        .await
+                    }
+                }
+            )?
+        } else {
+            (Vec::new(), Vec::new())
+        };
+    let team_ids = projects
+        .iter()
+        .map(|project| project.team.clone())
+        .collect::<HashSet<_>>();
+    let org_ids = projects
+        .iter()
+        .filter_map(|project| project.organization.clone())
+        .collect::<HashSet<_>>();
+    let team_id_refs = team_ids.iter().map(String::as_str).collect::<Vec<_>>();
+    let org_id_refs = org_ids.iter().map(String::as_str).collect::<Vec<_>>();
+    let (teams, organizations) = if !team_ids.is_empty() || !org_ids.is_empty()
+    {
+        tokio::try_join!(
+            async {
+                if team_ids.is_empty() {
+                    Ok(Vec::new())
+                } else {
+                    CachedEntry::get_team_many(
+                        &team_id_refs,
+                        cache_behaviour,
+                        pool,
+                        fetch_semaphore,
+                    )
+                    .await
+                }
+            },
+            async {
+                if org_ids.is_empty() {
+                    Ok(Vec::new())
+                } else {
+                    CachedEntry::get_organization_many(
+                        &org_id_refs,
+                        cache_behaviour,
+                        pool,
+                        fetch_semaphore,
+                    )
+                    .await
+                }
+            }
+        )?
+    } else {
+        (Vec::new(), Vec::new())
+    };
+
+    Ok(ResolvedMetadata {
+        projects,
+        versions,
+        teams,
+        organizations,
+    })
+}
+
+fn resolve_owner(
+    project: &Project,
+    teams: &[Vec<TeamMember>],
+    organizations: &[Organization],
+) -> Option<ContentItemOwner> {
+    if let Some(org_id) = &project.organization {
+        organizations
+            .iter()
+            .find(|organization| &organization.id == org_id)
+            .map(|organization| ContentItemOwner {
+                id: organization.id.clone(),
+                name: organization.name.clone(),
+                avatar_url: organization.icon_url.clone(),
+                owner_type: OwnerType::Organization,
+            })
+    } else {
+        teams
+            .iter()
+            .find(|team| {
+                team.first()
+                    .is_some_and(|member| member.team_id == project.team)
+            })
+            .and_then(|team| team.iter().find(|member| member.is_owner))
+            .map(|member| ContentItemOwner {
+                id: member.user.id.clone(),
+                name: member.user.username.clone(),
+                avatar_url: member.user.avatar_url.clone(),
+                owner_type: OwnerType::User,
+            })
+    }
+}
+
+fn file_metadata_from_entry_or_cache(
+    entry: Option<&ContentEntry>,
+    cached: Option<CachedFile>,
+) -> Option<crate::state::FileMetadata> {
+    let project_id = entry
+        .and_then(|entry| entry.project_id.clone())
+        .or_else(|| cached.as_ref().map(|file| file.project_id.clone()))?;
+    let version_id = entry
+        .and_then(|entry| entry.version_id.clone())
+        .or_else(|| cached.as_ref().map(|file| file.version_id.clone()))?;
+
+    Some(crate::state::FileMetadata {
+        project_id,
+        version_id,
+    })
+}
+
+async fn linked_modpack_ids_for_instance(
+    instance_id: &str,
+    pool: &SqlitePool,
+) -> crate::Result<Option<(String, String)>> {
+    let link =
+        sqlite::instance_rows::get_instance_link(instance_id, pool).await?;
+    Ok(linked_modpack_ids(&link))
+}
+
+fn linked_modpack_ids(link: &InstanceLink) -> Option<(String, String)> {
+    match link {
+        InstanceLink::ModrinthModpack {
+            project_id,
+            version_id,
+        } => Some((project_id.clone(), version_id.clone())),
+        InstanceLink::ServerProjectModpack {
+            content_project_id,
+            content_version_id,
+            ..
+        } => Some((content_project_id.clone(), content_version_id.clone())),
+        InstanceLink::ImportedModpack {
+            project_id: Some(project_id),
+            version_id: Some(version_id),
+        } => Some((project_id.clone(), version_id.clone())),
+        _ => None,
+    }
+}
+
+fn check_modpack_update(
+    installed_version_id: &str,
+    installed_version: &Version,
+    all_versions: Option<Vec<Version>>,
+    preferred_update_channel: ReleaseChannel,
+) -> (bool, Option<String>, Option<Version>) {
+    let Some(versions) = all_versions else {
+        return (false, None, None);
+    };
+    let installed_channel =
+        ReleaseChannel::from_version_type(&installed_version.version_type);
+    let effective_channel =
+        preferred_update_channel.least_stable(installed_channel);
+
+    for version_types in effective_channel.version_type_fallbacks() {
+        if !versions.iter().any(|version| {
+            version_types.contains(&version.version_type.as_str())
+        }) {
+            continue;
+        }
+
+        let mut newer_versions = versions
+            .iter()
+            .filter(|version| {
+                version.id != installed_version_id
+                    && version.date_published > installed_version.date_published
+                    && version_types.contains(&version.version_type.as_str())
+            })
+            .collect::<Vec<_>>();
+        newer_versions
+            .sort_by_key(|version| std::cmp::Reverse(version.date_published));
+
+        if let Some(newest) = newer_versions.first() {
+            return (true, Some(newest.id.clone()), Some((*newest).clone()));
+        }
+
+        return (false, None, None);
+    }
+
+    (false, None, None)
+}
+
+#[derive(Clone, Debug)]
+struct ModpackIdentifiers {
+    hashes: HashSet<String>,
+    project_ids: HashSet<String>,
+}
+
+impl ModpackIdentifiers {
+    fn is_modpack_file(
+        &self,
+        hash: &str,
+        file: Option<&CachedFile>,
+        entry_project_id: Option<&str>,
+    ) -> bool {
+        self.hashes.contains(hash)
+            || entry_project_id
+                .is_some_and(|project_id| self.project_ids.contains(project_id))
+            || file
+                .is_some_and(|file| self.project_ids.contains(&file.project_id))
+    }
+}
+
+async fn get_modpack_identifiers(
+    version_id: &str,
+    content_set: &ContentSet,
+    pool: &SqlitePool,
+    fetch_semaphore: &FetchSemaphore,
+) -> crate::Result<ModpackIdentifiers> {
+    if let Some(cached) =
+        CachedEntry::get_modpack_files(version_id, pool, fetch_semaphore)
+            .await?
+    {
+        if !cached.project_ids.is_empty() {
+            return Ok(ModpackIdentifiers {
+                hashes: cached.file_hashes.into_iter().collect(),
+                project_ids: cached.project_ids.into_iter().collect(),
+            });
+        }
+
+        let hash_refs = cached
+            .file_hashes
+            .iter()
+            .map(String::as_str)
+            .collect::<Vec<_>>();
+        let files =
+            CachedEntry::get_file_many(&hash_refs, None, pool, fetch_semaphore)
+                .await?;
+        let project_ids = files
+            .iter()
+            .map(|file| file.project_id.clone())
+            .collect::<HashSet<_>>()
+            .into_iter()
+            .collect::<Vec<_>>();
+        CachedEntry::cache_modpack_files(
+            version_id,
+            cached.file_hashes.clone(),
+            project_ids.clone(),
+            pool,
+        )
+        .await?;
+
+        return Ok(ModpackIdentifiers {
+            hashes: cached.file_hashes.into_iter().collect(),
+            project_ids: project_ids.into_iter().collect(),
+        });
+    }
+
+    let version =
+        CachedEntry::get_version(version_id, None, pool, fetch_semaphore)
+            .await?
+            .ok_or_else(|| {
+                crate::ErrorKind::InputError(format!(
+                    "Modpack version {version_id} not found"
+                ))
+            })?;
+    let primary_file = version
+        .files
+        .iter()
+        .find(|file| file.primary)
+        .or_else(|| version.files.first())
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError(format!(
+                "No files found for modpack version {version_id}"
+            ))
+        })?;
+    let download_meta = DownloadMeta {
+        reason: DownloadReason::Modpack,
+        game_version: content_set.game_version.clone(),
+        loader: content_set.loader.as_str().to_string(),
+        dependent_on: Some(version_id.to_string()),
+    };
+    let mrpack_bytes = fetch_mirrors(
+        &[&primary_file.url],
+        primary_file.hashes.get("sha1").map(String::as_str),
+        Some(&download_meta),
+        None,
+        fetch_semaphore,
+        pool,
+    )
+    .await?;
+    let reader = Cursor::new(&mrpack_bytes);
+    let mut zip_reader =
+        ZipFileReader::with_tokio(reader).await.map_err(|_| {
+            crate::ErrorKind::InputError(
+                "Failed to read modpack zip".to_string(),
+            )
+        })?;
+    let manifest_idx = zip_reader
+        .file()
+        .entries()
+        .iter()
+        .position(|file| {
+            matches!(file.filename().as_str(), Ok("modrinth.index.json"))
+        })
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError(
+                "No modrinth.index.json found in mrpack".to_string(),
+            )
+        })?;
+    let mut manifest = String::new();
+    let mut entry_reader = zip_reader.reader_with_entry(manifest_idx).await?;
+    entry_reader.read_to_string_checked(&mut manifest).await?;
+    let pack: PackFormat = serde_json::from_str(&manifest)?;
+    let mut hashes = pack
+        .files
+        .iter()
+        .filter_map(|file| file.hashes.get(&PackFileHash::Sha1).cloned())
+        .collect::<Vec<_>>();
+    let project_ids = pack
+        .files
+        .iter()
+        .filter_map(|file| {
+            file.downloads.iter().find_map(|url| {
+                let parts = url.split('/').collect::<Vec<_>>();
+                let data_idx = parts.iter().position(|part| *part == "data")?;
+                parts.get(data_idx + 1).map(|part| part.to_string())
+            })
+        })
+        .collect::<HashSet<_>>()
+        .into_iter()
+        .collect::<Vec<_>>();
+    let override_entries = zip_reader
+        .file()
+        .entries()
+        .iter()
+        .enumerate()
+        .filter_map(|(index, entry)| {
+            let filename = entry.filename().as_str().ok()?;
+            let is_override = (filename.starts_with("overrides/")
+                || filename.starts_with("client-overrides/")
+                || filename.starts_with("server-overrides/"))
+                && !filename.ends_with('/');
+            is_override.then_some(index)
+        })
+        .collect::<Vec<_>>();
+
+    for index in override_entries {
+        let mut file_bytes = Vec::new();
+        let mut entry_reader = zip_reader.reader_with_entry(index).await?;
+        entry_reader.read_to_end_checked(&mut file_bytes).await?;
+        hashes.push(sha1_async(bytes::Bytes::from(file_bytes)).await?);
+    }
+
+    CachedEntry::cache_modpack_files(
+        version_id,
+        hashes.clone(),
+        project_ids.clone(),
+        pool,
+    )
+    .await?;
+
+    Ok(ModpackIdentifiers {
+        hashes: hashes.into_iter().collect(),
+        project_ids: project_ids.into_iter().collect(),
+    })
+}
+
+fn project_type_from_api_name(project_type: &str) -> ProjectType {
+    match project_type {
+        "resourcepack" => ProjectType::ResourcePack,
+        "shader" => ProjectType::ShaderPack,
+        "datapack" => ProjectType::DataPack,
+        _ => ProjectType::Mod,
+    }
+}
+
+fn sort_content_items(items: &mut [ContentItem]) {
+    items.sort_by(|left, right| {
+        let left_name = left
+            .project
+            .as_ref()
+            .map(|project| project.title.as_str())
+            .unwrap_or(&left.file_name);
+        let right_name = right
+            .project
+            .as_ref()
+            .map(|project| project.title.as_str())
+            .unwrap_or(&right.file_name);
+
+        left_name
+            .to_lowercase()
+            .cmp(&right_name.to_lowercase())
+            .then_with(|| left.file_name.cmp(&right.file_name))
+    });
+}
diff --git a/packages/app-lib/src/state/instances/commands/mod.rs b/packages/app-lib/src/state/instances/commands/mod.rs
new file mode 100644
index 0000000000..a702b7f9a4
--- /dev/null
+++ b/packages/app-lib/src/state/instances/commands/mod.rs
@@ -0,0 +1,45 @@
+mod create_instance;
+pub use self::create_instance::CreateInstance;
+pub(crate) use self::create_instance::create_instance;
+
+mod edit_instance;
+pub(crate) use self::edit_instance::edit_instance;
+pub use self::edit_instance::{
+    AppliedContentSetPatch, EditInstance, InstanceLaunchOverridesPatch,
+};
+
+mod get_instance;
+pub use self::get_instance::InstanceMetadata;
+pub(crate) use self::get_instance::{
+    get_instance, get_instance_metadata, list_instances,
+};
+
+mod list_content;
+pub(crate) use self::list_content::{
+    dependencies_to_content_items, get_content_projects,
+    get_installed_project_ids_for_instance, get_linked_modpack_info,
+    list_content, list_content_sets, list_linked_modpack_content,
+};
+
+mod remove_instance;
+pub(crate) use self::remove_instance::*;
+
+mod refresh_instances;
+pub(crate) use self::refresh_instances::*;
+
+mod sync_content_files;
+pub(crate) use self::sync_content_files::sync_content_files;
+
+mod launch_context;
+pub(crate) use self::launch_context::*;
+
+mod apply_content_install;
+pub(crate) use self::apply_content_install::*;
+
+mod check_content_updates;
+
+mod apply_content_update;
+pub(crate) use self::apply_content_update::*;
+
+mod replace_modpack;
+pub(crate) use self::replace_modpack::*;
diff --git a/packages/app-lib/src/state/instances/commands/refresh_instances.rs b/packages/app-lib/src/state/instances/commands/refresh_instances.rs
new file mode 100644
index 0000000000..d9d1c1857c
--- /dev/null
+++ b/packages/app-lib/src/state/instances/commands/refresh_instances.rs
@@ -0,0 +1,44 @@
+use crate::State;
+use crate::state::{InstanceInstallStage, LauncherFeatureVersion};
+
+use super::edit_instance::EditInstance;
+
+pub(crate) async fn refresh_all_instances() -> crate::Result<()> {
+    let state = State::get().await?;
+    let instances = crate::state::instances::adapters::sqlite::instance_rows::list_instances(
+		&state.pool,
+	)
+	.await?;
+
+    for instance in instances {
+        let install_stage = match instance.install_stage {
+            InstanceInstallStage::MinecraftInstalling => {
+                Some(InstanceInstallStage::PackInstalled)
+            }
+            InstanceInstallStage::PackInstalling => {
+                Some(InstanceInstallStage::NotInstalled)
+            }
+            _ => None,
+        };
+        let launcher_feature_version = (instance.launcher_feature_version
+            < LauncherFeatureVersion::MOST_RECENT)
+            .then_some(LauncherFeatureVersion::MOST_RECENT);
+
+        if install_stage.is_none() && launcher_feature_version.is_none() {
+            continue;
+        }
+
+        super::edit_instance::edit_instance(
+            &instance.id,
+            EditInstance {
+                install_stage,
+                launcher_feature_version,
+                ..EditInstance::default()
+            },
+            &state.pool,
+        )
+        .await?;
+    }
+
+    Ok(())
+}
diff --git a/packages/app-lib/src/state/instances/commands/remove_instance.rs b/packages/app-lib/src/state/instances/commands/remove_instance.rs
new file mode 100644
index 0000000000..bb27128ddb
--- /dev/null
+++ b/packages/app-lib/src/state/instances/commands/remove_instance.rs
@@ -0,0 +1,23 @@
+use crate::state::State;
+use crate::state::instances::adapters::sqlite::instance_rows;
+use crate::util::io;
+
+pub(crate) async fn remove_instance(
+    instance_id: &str,
+    state: &State,
+) -> crate::Result<()> {
+    let instance = instance_rows::get_instance_by_id(instance_id, &state.pool)
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError("Unknown instance".to_string())
+        })?;
+
+    instance_rows::delete_instance_by_id(&instance.id, &state.pool).await?;
+
+    let path = state.directories.instances_dir().join(&instance.path);
+    if path.exists() {
+        io::remove_dir_all(&path).await?;
+    }
+
+    Ok(())
+}
diff --git a/packages/app-lib/src/state/instances/commands/replace_modpack.rs b/packages/app-lib/src/state/instances/commands/replace_modpack.rs
new file mode 100644
index 0000000000..3a2130ab44
--- /dev/null
+++ b/packages/app-lib/src/state/instances/commands/replace_modpack.rs
@@ -0,0 +1,194 @@
+use crate::event::emit::init_loading;
+use crate::event::{InstancePayloadType, LoadingBarType, emit::emit_instance};
+use crate::pack::{self, install_from::generate_pack_from_version_id};
+use crate::state::instances::InstanceLink;
+use crate::state::{InstanceInstallStage, State};
+use crate::util::fetch::DownloadReason;
+use futures::try_join;
+use std::collections::HashSet;
+
+use super::{
+    get_instance_metadata, list_project_files, remove_project,
+    set_instance_install_stage, toggle_disable_project,
+};
+
+pub(crate) async fn update_managed_modrinth_version(
+    instance_id: &str,
+    new_version_id: &str,
+    state: &State,
+) -> crate::Result<()> {
+    let metadata = get_instance_metadata(instance_id, &state.pool)
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError("Unknown instance".to_string())
+        })?;
+    let InstanceLink::ModrinthModpack {
+        project_id,
+        version_id,
+    } = metadata.link
+    else {
+        return Err(unmanaged_pack_error(&metadata.instance.id).into());
+    };
+
+    replace_managed_modrinth(
+        &metadata.instance.id,
+        &metadata.instance.name,
+        &project_id,
+        &version_id,
+        Some(new_version_id),
+        true,
+        state,
+    )
+    .await?;
+
+    emit_instance(&metadata.instance.id, InstancePayloadType::Edited).await?;
+
+    Ok(())
+}
+
+pub(crate) async fn repair_managed_modrinth(
+    instance_id: &str,
+    state: &State,
+) -> crate::Result<()> {
+    let metadata = get_instance_metadata(instance_id, &state.pool)
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError("Unknown instance".to_string())
+        })?;
+    let InstanceLink::ModrinthModpack {
+        project_id,
+        version_id,
+    } = metadata.link
+    else {
+        return Err(unmanaged_pack_error(&metadata.instance.id).into());
+    };
+
+    for file in list_project_files(&metadata.instance.id, state).await? {
+        remove_project(&metadata.instance.id, &file.relative_path, state)
+            .await?;
+    }
+
+    replace_managed_modrinth(
+        &metadata.instance.id,
+        &metadata.instance.name,
+        &project_id,
+        &version_id,
+        None,
+        false,
+        state,
+    )
+    .await?;
+
+    emit_instance(&metadata.instance.id, InstancePayloadType::Edited).await?;
+
+    Ok(())
+}
+
+async fn replace_managed_modrinth(
+    instance_id: &str,
+    instance_name: &str,
+    project_id: &str,
+    version_id: &str,
+    new_version_id: Option<&str>,
+    ignore_lock: bool,
+    state: &State,
+) -> crate::Result<()> {
+    let metadata = get_instance_metadata(instance_id, &state.pool)
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError("Unknown instance".to_string())
+        })?;
+    let disabled_project_ids = list_project_files(instance_id, state)
+        .await?
+        .into_iter()
+        .filter_map(|file| (!file.enabled).then_some(file.project_id?))
+        .collect::<HashSet<_>>();
+
+    set_instance_install_stage(
+        &metadata.instance.id,
+        InstanceInstallStage::MinecraftInstalling,
+        &state.pool,
+    )
+    .await?;
+
+    let (old_pack_creator, new_pack_creator) =
+        if let Some(new_version_id) = new_version_id {
+            let shared_loading_bar = init_loading(
+                LoadingBarType::PackFileDownload {
+                    instance_id: instance_id.to_string(),
+                    pack_name: instance_name.to_string(),
+                    icon: None,
+                    pack_version: version_id.to_string(),
+                },
+                200.0,
+                "Downloading pack file",
+            )
+            .await?;
+
+            try_join!(
+                generate_pack_from_version_id(
+                    project_id.to_string(),
+                    version_id.to_string(),
+                    instance_name.to_string(),
+                    None,
+                    instance_id.to_string(),
+                    Some(shared_loading_bar.clone()),
+                    DownloadReason::Update,
+                ),
+                generate_pack_from_version_id(
+                    project_id.to_string(),
+                    new_version_id.to_string(),
+                    instance_name.to_string(),
+                    None,
+                    instance_id.to_string(),
+                    Some(shared_loading_bar),
+                    DownloadReason::Update,
+                )
+            )?
+        } else {
+            let mut old_pack_creator = generate_pack_from_version_id(
+                project_id.to_string(),
+                version_id.to_string(),
+                instance_name.to_string(),
+                None,
+                instance_id.to_string(),
+                None,
+                DownloadReason::Update,
+            )
+            .await?;
+            old_pack_creator.description.existing_loading_bar = None;
+            (old_pack_creator.clone(), old_pack_creator)
+        };
+
+    pack::install_mrpack::remove_all_related_files(
+        instance_id.to_string(),
+        old_pack_creator.file,
+    )
+    .await?;
+    pack::install_mrpack::install_zipped_mrpack_files(
+        new_pack_creator,
+        ignore_lock,
+        DownloadReason::Update,
+    )
+    .await?;
+
+    if !disabled_project_ids.is_empty() {
+        for file in list_project_files(instance_id, state).await? {
+            if file.enabled
+                && let Some(project_id) = &file.project_id
+                && disabled_project_ids.contains(project_id)
+            {
+                toggle_disable_project(instance_id, &file.relative_path, state)
+                    .await?;
+            }
+        }
+    }
+
+    Ok(())
+}
+
+fn unmanaged_pack_error(instance_id: &str) -> crate::ErrorKind {
+    crate::ErrorKind::InputError(format!(
+        "Instance {instance_id} is not a managed Modrinth pack, or has been disconnected."
+    ))
+}
diff --git a/packages/app-lib/src/state/instances/commands/sync_content_files.rs b/packages/app-lib/src/state/instances/commands/sync_content_files.rs
new file mode 100644
index 0000000000..1c19e1b4bf
--- /dev/null
+++ b/packages/app-lib/src/state/instances/commands/sync_content_files.rs
@@ -0,0 +1,90 @@
+use crate::State;
+use crate::state::instances::adapters::{filesystem, sqlite};
+use crate::state::instances::{Instance, InstanceFile};
+use crate::state::{CachedEntry, ProjectType};
+use chrono::Utc;
+use std::collections::HashMap;
+
+pub(crate) async fn sync_content_files(
+    instance_id: &str,
+    state: &State,
+) -> crate::Result<Vec<InstanceFile>> {
+    let instance =
+        sqlite::instance_rows::get_instance_by_id(instance_id, &state.pool)
+            .await?
+            .ok_or_else(|| {
+                crate::ErrorKind::InputError("Unknown instance".to_string())
+            })?;
+
+    sync_instance_content_files(&instance, state).await
+}
+
+pub(crate) async fn sync_instance_content_files(
+    instance: &Instance,
+    state: &State,
+) -> crate::Result<Vec<InstanceFile>> {
+    let scanned = filesystem::scan_content_files(
+        &state.directories.instances_dir(),
+        &instance.path,
+    )?;
+    let cache_keys = scanned
+        .iter()
+        .map(|file| file.hash_cache_key.as_str())
+        .collect::<Vec<_>>();
+    let hashes = CachedEntry::get_file_hash_many(
+        &cache_keys,
+        None,
+        &state.pool,
+        &state.api_semaphore,
+    )
+    .await?;
+    let hashes_by_path = hashes
+        .into_iter()
+        .map(|hash| (hash.path.clone(), hash))
+        .collect::<HashMap<_, _>>();
+
+    let now = Utc::now();
+    let mut files = Vec::new();
+
+    for file in scanned {
+        let cache_path = format!("{}/{}", instance.path, file.relative_path);
+        let Some(hash) = hashes_by_path.get(&cache_path) else {
+            continue;
+        };
+
+        files.push(InstanceFile {
+            id: instance_file_id(&instance.id, &file.relative_path),
+            instance_id: instance.id.clone(),
+            relative_path: file.relative_path,
+            file_name: file.file_name,
+            enabled: file.enabled,
+            sha1: hash.hash.clone(),
+            size: file.size,
+            missing: false,
+            added_at: now,
+            modified_at: now,
+        });
+    }
+
+    let mut tx = state.pool.begin().await?;
+    sqlite::content_rows::mark_instance_files_missing(&instance.id, &mut tx)
+        .await?;
+
+    for file in &files {
+        sqlite::content_rows::upsert_instance_file(file, &mut tx).await?;
+    }
+
+    tx.commit().await?;
+
+    Ok(files)
+}
+
+pub(crate) fn project_type_for_file(
+    file: &InstanceFile,
+) -> Option<ProjectType> {
+    filesystem::project_type_from_relative_path(&file.relative_path)
+}
+
+fn instance_file_id(instance_id: &str, relative_path: &str) -> String {
+    format!("instance-file:{instance_id}:{relative_path}")
+}
diff --git a/packages/app-lib/src/state/instances/content.rs b/packages/app-lib/src/state/instances/content.rs
index 0e477c6960..507d920927 100644
--- a/packages/app-lib/src/state/instances/content.rs
+++ b/packages/app-lib/src/state/instances/content.rs
@@ -1,65 +1,22 @@
-//! # Content API
-//!
-//! ## Data Flow
-//!
-//! 1. Frontend calls `get_content_items(profile_path)`
-//! 2. If profile is linked to a modpack:
-//!    - Fetch modpack file hashes from cache (populated during installation)
-//!    - Fallback: re-download .mrpack if cache miss (cleared/expired)
-//!    - Filter out files that belong to the modpack before update lookup
-//! 3. For remaining files, fetch project/version/owner metadata in parallel
-//! 4. Return sorted `ContentItem` list
-//!
-//! ## Caching
-//!
-//! Modpack file hashes are cached in `CacheValueType::ModpackFiles`
-//! during modpack installation. The cache never expires (version_id is
-//! immutable), so re-download is only needed if cache was cleared or
-//! profile predates this caching mechanism.
-
-use crate::pack::install_from::{PackFileHash, PackFormat};
-use crate::state::profiles::{Profile, ProfileFile, ProjectType};
-use crate::state::{CacheBehaviour, CachedEntry, ReleaseChannel};
-use crate::util::fetch::{
-    DownloadMeta, DownloadReason, FetchSemaphore, fetch_mirrors, sha1_async,
-};
-use async_zip::base::read::seek::ZipFileReader;
+use crate::state::{Project, ProjectType, Version};
 use serde::{Deserialize, Serialize};
-use sqlx::SqlitePool;
-use std::collections::HashSet;
-use std::io::Cursor;
 
-/// Content item with rich metadata for frontend display
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct ContentItem {
-    /// Display file name.
     pub file_name: String,
-    /// Relative path to the file within the profile
     pub file_path: String,
-    /// SHA1 hash of file content. Stable across renames, but not unique when
-    /// duplicate files have identical contents.
     pub id: String,
-    /// File size in bytes
     pub size: u64,
-    /// Whether the file is enabled (not .disabled)
     pub enabled: bool,
-    /// Type of project (mod, resourcepack, etc.)
     pub project_type: ProjectType,
-    /// Modrinth project info if recognized
     pub project: Option<ContentItemProject>,
-    /// Version info if recognized
     pub version: Option<ContentItemVersion>,
-    /// Owner info (organization or user)
     pub owner: Option<ContentItemOwner>,
-    /// Whether an update is available
     pub has_update: bool,
-    /// The recommended version ID to update to (if has_update is true)
     pub update_version_id: Option<String>,
-    /// When the file was added to the instance (file modification time)
     pub date_added: Option<String>,
 }
 
-/// Project information for content item display
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct ContentItemProject {
     pub id: String,
@@ -68,7 +25,6 @@ pub struct ContentItemProject {
     pub icon_url: Option<String>,
 }
 
-/// Version information for content item display
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct ContentItemVersion {
     pub id: String,
@@ -77,7 +33,6 @@ pub struct ContentItemVersion {
     pub date_published: Option<String>,
 }
 
-/// Owner information for content item display
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct ContentItemOwner {
     pub id: String,
@@ -87,7 +42,6 @@ pub struct ContentItemOwner {
     pub owner_type: OwnerType,
 }
 
-/// Type of content owner
 #[derive(Debug, Serialize, Deserialize, Clone, Copy, PartialEq, Eq)]
 #[serde(rename_all = "lowercase")]
 pub enum OwnerType {
@@ -95,894 +49,12 @@ pub enum OwnerType {
     Organization,
 }
 
-use crate::state::cache::{Dependency, Organization, TeamMember};
-use crate::state::{Project, Version};
-
-/// Full linked modpack information including owner and update status
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct LinkedModpackInfo {
     pub project: Project,
     pub version: Version,
     pub owner: Option<ContentItemOwner>,
-    /// Whether an update is available for this modpack
     pub has_update: bool,
-    /// The version ID to update to (if has_update is true)
     pub update_version_id: Option<String>,
-    /// The full version info for the update (if has_update is true)
     pub update_version: Option<Version>,
 }
-
-/// Get linked modpack info including project, version, owner, and update status.
-/// Returns None if the profile is not linked to a modpack.
-pub async fn get_linked_modpack_info(
-    profile: &Profile,
-    cache_behaviour: Option<CacheBehaviour>,
-    pool: &SqlitePool,
-    fetch_semaphore: &FetchSemaphore,
-) -> crate::Result<Option<LinkedModpackInfo>> {
-    let Some(linked_data) = &profile.linked_data else {
-        return Ok(None);
-    };
-
-    // Vanilla server projects have linked_data with an empty version_id
-    if linked_data.version_id.is_empty() {
-        return Ok(None);
-    }
-
-    // Fetch project, version, and all project versions in parallel
-    let (project, version, all_versions) = tokio::try_join!(
-        CachedEntry::get_project(
-            &linked_data.project_id,
-            cache_behaviour,
-            pool,
-            fetch_semaphore,
-        ),
-        CachedEntry::get_version(
-            &linked_data.version_id,
-            cache_behaviour,
-            pool,
-            fetch_semaphore,
-        ),
-        CachedEntry::get_project_versions(
-            &linked_data.project_id,
-            cache_behaviour,
-            pool,
-            fetch_semaphore,
-        ),
-    )?;
-
-    let version = version.ok_or_else(|| {
-        crate::ErrorKind::InputError(format!(
-            "Linked modpack version {} not found",
-            linked_data.version_id
-        ))
-    })?;
-
-    // For server instances, linked_data.project_id is the server project,
-    // but the version may belong to a different (modpack) project.
-    // If so, fetch the actual modpack project for display and update checking.
-    let (project, all_versions) =
-        if version.project_id != linked_data.project_id {
-            let (modpack_project, modpack_versions) = tokio::try_join!(
-                CachedEntry::get_project(
-                    &version.project_id,
-                    cache_behaviour,
-                    pool,
-                    fetch_semaphore,
-                ),
-                CachedEntry::get_project_versions(
-                    &version.project_id,
-                    cache_behaviour,
-                    pool,
-                    fetch_semaphore,
-                ),
-            )?;
-            (modpack_project.or(project), modpack_versions)
-        } else {
-            (project, all_versions)
-        };
-
-    let project = project.ok_or_else(|| {
-        crate::ErrorKind::InputError(format!(
-            "Linked modpack project {} not found",
-            linked_data.project_id
-        ))
-    })?;
-
-    // Resolve owner - prefer organization, fall back to team owner
-    let owner = if let Some(org_id) = &project.organization {
-        let org = CachedEntry::get_organization(
-            org_id,
-            cache_behaviour,
-            pool,
-            fetch_semaphore,
-        )
-        .await?;
-        org.map(|o| ContentItemOwner {
-            id: o.id,
-            name: o.name,
-            avatar_url: o.icon_url,
-            owner_type: OwnerType::Organization,
-        })
-    } else {
-        let team = CachedEntry::get_team(
-            &project.team,
-            cache_behaviour,
-            pool,
-            fetch_semaphore,
-        )
-        .await?;
-        team.and_then(|t| {
-            t.into_iter()
-                .find(|m| m.is_owner)
-                .map(|m| ContentItemOwner {
-                    id: m.user.id,
-                    name: m.user.username,
-                    avatar_url: m.user.avatar_url,
-                    owner_type: OwnerType::User,
-                })
-        })
-    };
-
-    // Check for updates
-    let (has_update, update_version_id, update_version) = check_modpack_update(
-        &linked_data.version_id,
-        &version,
-        all_versions,
-        profile.preferred_update_channel,
-    );
-
-    Ok(Some(LinkedModpackInfo {
-        project,
-        version,
-        owner,
-        has_update,
-        update_version_id,
-        update_version,
-    }))
-}
-
-/// Check if a newer version exists for the linked modpack.
-/// Returns (has_update, update_version_id, update_version).
-fn check_modpack_update(
-    installed_version_id: &str,
-    installed_version: &Version,
-    all_versions: Option<Vec<Version>>,
-    preferred_update_channel: ReleaseChannel,
-) -> (bool, Option<String>, Option<Version>) {
-    let Some(versions) = all_versions else {
-        return (false, None, None);
-    };
-
-    let installed_channel =
-        ReleaseChannel::from_version_type(&installed_version.version_type);
-    let effective_channel =
-        preferred_update_channel.least_stable(installed_channel);
-
-    for version_types in effective_channel.version_type_fallbacks() {
-        if !versions
-            .iter()
-            .any(|v| version_types.contains(&v.version_type.as_str()))
-        {
-            continue;
-        }
-
-        let mut newer_versions: Vec<&Version> = versions
-            .iter()
-            .filter(|v| {
-                v.id != installed_version_id
-                    && v.date_published > installed_version.date_published
-                    && version_types.contains(&v.version_type.as_str())
-            })
-            .collect();
-
-        // Sort by date_published descending (newest first)
-        newer_versions.sort_by_key(|b| std::cmp::Reverse(b.date_published));
-
-        if let Some(newest) = newer_versions.first() {
-            return (true, Some(newest.id.clone()), Some((*newest).clone()));
-        }
-
-        return (false, None, None);
-    }
-
-    (false, None, None)
-}
-
-/// Get content items with rich metadata, filtered to exclude modpack content.
-/// Returns only user-added content (not part of the linked modpack).
-pub async fn get_content_items(
-    profile: &Profile,
-    cache_behaviour: Option<CacheBehaviour>,
-    pool: &SqlitePool,
-    fetch_semaphore: &FetchSemaphore,
-) -> crate::Result<Vec<ContentItem>> {
-    let modpack_ids = if let Some(ref linked_data) = profile.linked_data {
-        if linked_data.version_id.is_empty() {
-            None
-        } else {
-            tracing::info!(
-                "Fetching modpack identifiers for version_id={}, project_id={}",
-                linked_data.version_id,
-                linked_data.project_id
-            );
-            match get_modpack_identifiers(
-                &linked_data.version_id,
-                profile,
-                pool,
-                fetch_semaphore,
-            )
-            .await
-            {
-                Ok(ids) => {
-                    tracing::info!(
-                        "Got {} modpack file hashes, {} project IDs for version {}",
-                        ids.hashes.len(),
-                        ids.project_ids.len(),
-                        linked_data.version_id
-                    );
-                    Some(ids)
-                }
-                Err(e) => {
-                    tracing::error!(
-                        "Failed to fetch modpack identifiers for version {}: {}",
-                        linked_data.version_id,
-                        e
-                    );
-                    None
-                }
-            }
-        }
-    } else {
-        None
-    };
-
-    let user_files: Vec<(String, ProfileFile)> = if let Some(ids) = &modpack_ids
-    {
-        let filtered_files = profile
-            .get_projects_excluding_modpack_files(
-                &ids.hashes,
-                &ids.project_ids,
-                cache_behaviour,
-                pool,
-                fetch_semaphore,
-            )
-            .await?;
-        filtered_files.into_iter().collect()
-    } else {
-        let all_files = profile
-            .get_projects(cache_behaviour, pool, fetch_semaphore)
-            .await?;
-        all_files.into_iter().collect()
-    };
-
-    let content_items = profile_files_to_content_items(
-        &profile.path,
-        &user_files,
-        cache_behaviour,
-        pool,
-        fetch_semaphore,
-    )
-    .await?;
-
-    Ok(content_items)
-}
-
-/// Pre-fetched metadata for projects, versions, teams, and organizations.
-struct ResolvedMetadata {
-    projects: Vec<Project>,
-    versions: Vec<Version>,
-    teams: Vec<Vec<TeamMember>>,
-    organizations: Vec<Organization>,
-}
-
-/// Fetch project, version, team, and organization metadata in parallel batches.
-async fn resolve_metadata(
-    project_ids: &HashSet<String>,
-    version_ids: &HashSet<String>,
-    cache_behaviour: Option<CacheBehaviour>,
-    pool: &SqlitePool,
-    fetch_semaphore: &FetchSemaphore,
-) -> crate::Result<ResolvedMetadata> {
-    let project_ids_vec: Vec<&str> =
-        project_ids.iter().map(|s| s.as_str()).collect();
-    let version_ids_vec: Vec<&str> =
-        version_ids.iter().map(|s| s.as_str()).collect();
-
-    let (projects, versions) =
-        if !project_ids.is_empty() || !version_ids.is_empty() {
-            tokio::try_join!(
-                async {
-                    if project_ids.is_empty() {
-                        Ok(Vec::new())
-                    } else {
-                        CachedEntry::get_project_many(
-                            &project_ids_vec,
-                            cache_behaviour,
-                            pool,
-                            fetch_semaphore,
-                        )
-                        .await
-                    }
-                },
-                async {
-                    if version_ids.is_empty() {
-                        Ok(Vec::new())
-                    } else {
-                        CachedEntry::get_version_many(
-                            &version_ids_vec,
-                            cache_behaviour,
-                            pool,
-                            fetch_semaphore,
-                        )
-                        .await
-                    }
-                }
-            )?
-        } else {
-            (Vec::new(), Vec::new())
-        };
-
-    let team_ids: HashSet<String> =
-        projects.iter().map(|p| p.team.clone()).collect();
-    let org_ids: HashSet<String> = projects
-        .iter()
-        .filter_map(|p| p.organization.clone())
-        .collect();
-
-    let team_ids_vec: Vec<&str> = team_ids.iter().map(|s| s.as_str()).collect();
-    let org_ids_vec: Vec<&str> = org_ids.iter().map(|s| s.as_str()).collect();
-
-    let (teams, organizations) = if !team_ids.is_empty() || !org_ids.is_empty()
-    {
-        tokio::try_join!(
-            async {
-                if team_ids.is_empty() {
-                    Ok(Vec::new())
-                } else {
-                    CachedEntry::get_team_many(
-                        &team_ids_vec,
-                        cache_behaviour,
-                        pool,
-                        fetch_semaphore,
-                    )
-                    .await
-                }
-            },
-            async {
-                if org_ids.is_empty() {
-                    Ok(Vec::new())
-                } else {
-                    CachedEntry::get_organization_many(
-                        &org_ids_vec,
-                        cache_behaviour,
-                        pool,
-                        fetch_semaphore,
-                    )
-                    .await
-                }
-            }
-        )?
-    } else {
-        (Vec::new(), Vec::new())
-    };
-
-    Ok(ResolvedMetadata {
-        projects,
-        versions,
-        teams,
-        organizations,
-    })
-}
-
-/// Shared helper: convert profile files to ContentItems with rich metadata.
-/// Used by both `get_content_items` (user-added files) and
-/// `get_linked_modpack_content` (modpack-bundled files).
-async fn profile_files_to_content_items(
-    profile_path: &str,
-    files: &[(String, ProfileFile)],
-    cache_behaviour: Option<CacheBehaviour>,
-    pool: &SqlitePool,
-    fetch_semaphore: &FetchSemaphore,
-) -> crate::Result<Vec<ContentItem>> {
-    let project_ids: HashSet<String> = files
-        .iter()
-        .filter_map(|(_, f)| f.metadata.as_ref().map(|m| m.project_id.clone()))
-        .collect();
-
-    let version_ids: HashSet<String> = files
-        .iter()
-        .filter_map(|(_, f)| f.metadata.as_ref().map(|m| m.version_id.clone()))
-        .collect();
-
-    let meta = resolve_metadata(
-        &project_ids,
-        &version_ids,
-        cache_behaviour,
-        pool,
-        fetch_semaphore,
-    )
-    .await?;
-
-    let profile_base_path =
-        crate::api::profile::get_full_path(profile_path).await?;
-
-    // Batch-read file modification times off the main async runtime
-    let paths: Vec<std::path::PathBuf> = files
-        .iter()
-        .map(|(path, _)| profile_base_path.join(path))
-        .collect();
-
-    let modification_times: Vec<Option<String>> =
-        tokio::task::spawn_blocking(move || {
-            paths
-                .iter()
-                .map(|path| {
-                    std::fs::metadata(path).and_then(|m| m.modified()).ok().map(
-                        |t| {
-                            chrono::DateTime::<chrono::Utc>::from(t)
-                                .to_rfc3339()
-                        },
-                    )
-                })
-                .collect()
-        })
-        .await?;
-
-    let mut items: Vec<ContentItem> = files
-        .iter()
-        .enumerate()
-        .map(|(i, (path, file))| {
-            let project = file.metadata.as_ref().and_then(|m| {
-                meta.projects.iter().find(|p| p.id == m.project_id)
-            });
-
-            let version = file.metadata.as_ref().and_then(|m| {
-                meta.versions.iter().find(|v| v.id == m.version_id)
-            });
-
-            let owner = project.and_then(|p| {
-                resolve_owner(p, &meta.teams, &meta.organizations)
-            });
-
-            ContentItem {
-                file_name: file.file_name.clone(),
-                file_path: path.clone(),
-                id: file.hash.clone(),
-                size: file.size,
-                enabled: !file.file_name.ends_with(".disabled"),
-                project_type: file.project_type,
-                project: project.map(|p| ContentItemProject {
-                    id: p.id.clone(),
-                    slug: p.slug.clone(),
-                    title: p.title.clone(),
-                    icon_url: p.icon_url.clone(),
-                }),
-                version: version.map(|v| ContentItemVersion {
-                    id: v.id.clone(),
-                    version_number: v.version_number.clone(),
-                    file_name: file.file_name.clone(),
-                    date_published: Some(v.date_published.to_rfc3339()),
-                }),
-                owner,
-                has_update: file.update_version_id.is_some(),
-                update_version_id: file.update_version_id.clone(),
-                date_added: modification_times[i].clone(),
-            }
-        })
-        .collect();
-
-    items.sort_by(|a, b| {
-        let name_a = a
-            .project
-            .as_ref()
-            .map(|p| p.title.as_str())
-            .unwrap_or(&a.file_name);
-        let name_b = b
-            .project
-            .as_ref()
-            .map(|p| p.title.as_str())
-            .unwrap_or(&b.file_name);
-        name_a
-            .to_lowercase()
-            .cmp(&name_b.to_lowercase())
-            .then_with(|| a.file_name.cmp(&b.file_name))
-    });
-
-    Ok(items)
-}
-
-/// Resolve the owner of a project from pre-fetched teams and organizations.
-fn resolve_owner(
-    project: &Project,
-    teams: &[Vec<TeamMember>],
-    organizations: &[Organization],
-) -> Option<ContentItemOwner> {
-    if let Some(org_id) = &project.organization {
-        organizations.iter().find(|o| &o.id == org_id).map(|o| {
-            ContentItemOwner {
-                id: o.id.clone(),
-                name: o.name.clone(),
-                avatar_url: o.icon_url.clone(),
-                owner_type: OwnerType::Organization,
-            }
-        })
-    } else {
-        teams
-            .iter()
-            .find(|t| t.first().is_some_and(|m| m.team_id == project.team))
-            .and_then(|t| t.iter().find(|m| m.is_owner))
-            .map(|m| ContentItemOwner {
-                id: m.user.id.clone(),
-                name: m.user.username.clone(),
-                avatar_url: m.user.avatar_url.clone(),
-                owner_type: OwnerType::User,
-            })
-    }
-}
-
-/// Get content items that are part of the linked modpack (not user-added).
-/// Returns modpack-bundled files with full on-disk metadata (file_path, enabled, etc).
-/// Returns empty vec if the profile is not linked to a modpack.
-pub async fn get_linked_modpack_content(
-    profile: &Profile,
-    cache_behaviour: Option<CacheBehaviour>,
-    pool: &SqlitePool,
-    fetch_semaphore: &FetchSemaphore,
-) -> crate::Result<Vec<ContentItem>> {
-    let Some(linked_data) = &profile.linked_data else {
-        return Ok(Vec::new());
-    };
-
-    let all_files = profile
-        .get_projects(cache_behaviour, pool, fetch_semaphore)
-        .await?;
-
-    let modpack_ids = match get_modpack_identifiers(
-        &linked_data.version_id,
-        profile,
-        pool,
-        fetch_semaphore,
-    )
-    .await
-    {
-        Ok(ids) => ids,
-        Err(e) => {
-            tracing::warn!("Failed to fetch modpack identifiers: {}", e);
-            return Ok(Vec::new());
-        }
-    };
-
-    // Inverse of get_content_items: keep only modpack-bundled files
-    let modpack_files: Vec<(String, ProfileFile)> = all_files
-        .into_iter()
-        .filter(|(_, file)| modpack_ids.is_modpack_file(file))
-        .collect();
-
-    profile_files_to_content_items(
-        &profile.path,
-        &modpack_files,
-        cache_behaviour,
-        pool,
-        fetch_semaphore,
-    )
-    .await
-}
-
-/// Convert a list of dependencies into ContentItems with rich metadata.
-/// Fetches project, version, and owner info for each dependency.
-pub async fn dependencies_to_content_items(
-    dependencies: &[Dependency],
-    cache_behaviour: Option<CacheBehaviour>,
-    pool: &SqlitePool,
-    fetch_semaphore: &FetchSemaphore,
-) -> crate::Result<Vec<ContentItem>> {
-    let project_ids: HashSet<String> = dependencies
-        .iter()
-        .filter_map(|d| d.project_id.clone())
-        .collect();
-
-    if project_ids.is_empty() {
-        return Ok(Vec::new());
-    }
-
-    let version_ids: HashSet<String> = dependencies
-        .iter()
-        .filter_map(|d| d.version_id.clone())
-        .collect();
-
-    let meta = resolve_metadata(
-        &project_ids,
-        &version_ids,
-        cache_behaviour,
-        pool,
-        fetch_semaphore,
-    )
-    .await?;
-
-    let mut items: Vec<ContentItem> = dependencies
-        .iter()
-        .filter_map(|dep| {
-            let project_id = dep.project_id.as_ref()?;
-            let project = meta.projects.iter().find(|p| &p.id == project_id)?;
-
-            let version = dep
-                .version_id
-                .as_ref()
-                .and_then(|vid| meta.versions.iter().find(|v| &v.id == vid));
-
-            let owner =
-                resolve_owner(project, &meta.teams, &meta.organizations);
-
-            let project_type = match project.project_type.as_str() {
-                "mod" => ProjectType::Mod,
-                "resourcepack" => ProjectType::ResourcePack,
-                "shader" => ProjectType::ShaderPack,
-                "datapack" => ProjectType::DataPack,
-                _ => ProjectType::Mod,
-            };
-
-            Some(ContentItem {
-                file_name: version
-                    .and_then(|v| v.files.first())
-                    .map(|f| f.filename.clone())
-                    .unwrap_or_else(|| {
-                        format!(
-                            "{}.jar",
-                            project.slug.as_deref().unwrap_or(&project.id)
-                        )
-                    }),
-                file_path: String::new(),
-                id: String::new(),
-                size: version
-                    .and_then(|v| v.files.first())
-                    .map(|f| f.size as u64)
-                    .unwrap_or(0),
-                enabled: true,
-                project_type,
-                project: Some(ContentItemProject {
-                    id: project.id.clone(),
-                    slug: project.slug.clone(),
-                    title: project.title.clone(),
-                    icon_url: project.icon_url.clone(),
-                }),
-                version: version.map(|v| ContentItemVersion {
-                    id: v.id.clone(),
-                    version_number: v.version_number.clone(),
-                    file_name: v
-                        .files
-                        .first()
-                        .map(|f| f.filename.clone())
-                        .unwrap_or_default(),
-                    date_published: Some(v.date_published.to_rfc3339()),
-                }),
-                owner,
-                has_update: false,
-                update_version_id: None,
-                date_added: None,
-            })
-        })
-        .collect();
-
-    items.sort_by(|a, b| {
-        let name_a = a
-            .project
-            .as_ref()
-            .map(|p| p.title.as_str())
-            .unwrap_or(&a.file_name);
-        let name_b = b
-            .project
-            .as_ref()
-            .map(|p| p.title.as_str())
-            .unwrap_or(&b.file_name);
-        name_a
-            .to_lowercase()
-            .cmp(&name_b.to_lowercase())
-            .then_with(|| a.file_name.cmp(&b.file_name))
-    });
-
-    Ok(items)
-}
-
-/// Modpack file identifiers: hashes for exact matching and project IDs for
-/// matching files whose version was switched by the user.
-struct ModpackIdentifiers {
-    hashes: HashSet<String>,
-    project_ids: HashSet<String>,
-}
-
-impl ModpackIdentifiers {
-    fn is_modpack_file(&self, file: &ProfileFile) -> bool {
-        self.hashes.contains(&file.hash)
-            || file
-                .metadata
-                .as_ref()
-                .is_some_and(|m| self.project_ids.contains(&m.project_id))
-    }
-}
-
-/// Gets SHA1 hashes and project IDs of all files in a modpack version.
-/// Checks cache first, falls back to downloading mrpack if not cached.
-async fn get_modpack_identifiers(
-    version_id: &str,
-    profile: &crate::state::Profile,
-    pool: &SqlitePool,
-    fetch_semaphore: &FetchSemaphore,
-) -> crate::Result<ModpackIdentifiers> {
-    if let Some(cached) =
-        CachedEntry::get_modpack_files(version_id, pool, fetch_semaphore)
-            .await?
-    {
-        if !cached.project_ids.is_empty() {
-            tracing::info!(
-                "Cache hit: {} modpack file hashes, {} project IDs for version {}",
-                cached.file_hashes.len(),
-                cached.project_ids.len(),
-                version_id
-            );
-            return Ok(ModpackIdentifiers {
-                hashes: cached.file_hashes.into_iter().collect(),
-                project_ids: cached.project_ids.into_iter().collect(),
-            });
-        }
-
-        // Legacy cache entry without project_ids — resolve via hash lookup API
-        tracing::info!(
-            "Legacy cache entry without project IDs, resolving via API for version {}",
-            version_id
-        );
-        let hash_refs: Vec<&str> =
-            cached.file_hashes.iter().map(|s| s.as_str()).collect();
-        let files =
-            CachedEntry::get_file_many(&hash_refs, None, pool, fetch_semaphore)
-                .await?;
-
-        let project_ids: Vec<String> = files
-            .iter()
-            .map(|f| f.project_id.clone())
-            .collect::<HashSet<_>>()
-            .into_iter()
-            .collect();
-
-        // Update cache with project_ids for next time
-        CachedEntry::cache_modpack_files(
-            version_id,
-            cached.file_hashes.clone(),
-            project_ids.clone(),
-            pool,
-        )
-        .await?;
-
-        return Ok(ModpackIdentifiers {
-            hashes: cached.file_hashes.into_iter().collect(),
-            project_ids: project_ids.into_iter().collect(),
-        });
-    }
-
-    tracing::warn!(
-        "Cache miss: modpack files not cached, downloading mrpack for version {}",
-        version_id
-    );
-
-    let version =
-        CachedEntry::get_version(version_id, None, pool, fetch_semaphore)
-            .await?
-            .ok_or_else(|| {
-                crate::ErrorKind::InputError(format!(
-                    "Modpack version {version_id} not found"
-                ))
-            })?;
-
-    let primary_file = version
-        .files
-        .iter()
-        .find(|f| f.primary)
-        .or_else(|| version.files.first())
-        .ok_or_else(|| {
-            crate::ErrorKind::InputError(format!(
-                "No files found for modpack version {version_id}"
-            ))
-        })?;
-
-    let download_meta = DownloadMeta {
-        reason: DownloadReason::Modpack,
-        game_version: profile.game_version.clone(),
-        loader: profile.loader.as_str().to_string(),
-        dependent_on: Some(version_id.to_string()),
-    };
-
-    let mrpack_bytes = fetch_mirrors(
-        &[&primary_file.url],
-        primary_file.hashes.get("sha1").map(|s| s.as_str()),
-        Some(&download_meta),
-        None,
-        fetch_semaphore,
-        pool,
-    )
-    .await?;
-
-    let reader = Cursor::new(&mrpack_bytes);
-    let mut zip_reader =
-        ZipFileReader::with_tokio(reader).await.map_err(|_| {
-            crate::ErrorKind::InputError(
-                "Failed to read modpack zip".to_string(),
-            )
-        })?;
-
-    let manifest_idx = zip_reader
-        .file()
-        .entries()
-        .iter()
-        .position(|f| {
-            matches!(f.filename().as_str(), Ok("modrinth.index.json"))
-        })
-        .ok_or_else(|| {
-            crate::ErrorKind::InputError(
-                "No modrinth.index.json found in mrpack".to_string(),
-            )
-        })?;
-
-    let mut manifest = String::new();
-    let mut entry_reader = zip_reader.reader_with_entry(manifest_idx).await?;
-    entry_reader.read_to_string_checked(&mut manifest).await?;
-
-    let pack: PackFormat = serde_json::from_str(&manifest)?;
-
-    let mut hashes: Vec<String> = pack
-        .files
-        .iter()
-        .filter_map(|f| f.hashes.get(&PackFileHash::Sha1).cloned())
-        .collect();
-
-    let project_ids: Vec<String> = pack
-        .files
-        .iter()
-        .filter_map(|f| {
-            f.downloads.iter().find_map(|url| {
-                let parts: Vec<&str> = url.split('/').collect();
-                let data_idx = parts.iter().position(|&p| p == "data")?;
-                parts.get(data_idx + 1).map(|s| s.to_string())
-            })
-        })
-        .collect::<HashSet<_>>()
-        .into_iter()
-        .collect();
-
-    // Also hash files from overrides folders (these aren't in modrinth.index.json)
-    let override_entries: Vec<usize> = zip_reader
-        .file()
-        .entries()
-        .iter()
-        .enumerate()
-        .filter_map(|(index, entry)| {
-            let filename = entry.filename().as_str().ok()?;
-            let is_override = (filename.starts_with("overrides/")
-                || filename.starts_with("client-overrides/")
-                || filename.starts_with("server-overrides/"))
-                && !filename.ends_with('/');
-            is_override.then_some(index)
-        })
-        .collect();
-
-    for index in override_entries {
-        let mut file_bytes = Vec::new();
-        let mut entry_reader = zip_reader.reader_with_entry(index).await?;
-        entry_reader.read_to_end_checked(&mut file_bytes).await?;
-
-        let hash = sha1_async(bytes::Bytes::from(file_bytes)).await?;
-        hashes.push(hash);
-    }
-
-    CachedEntry::cache_modpack_files(
-        version_id,
-        hashes.clone(),
-        project_ids.clone(),
-        pool,
-    )
-    .await?;
-
-    Ok(ModpackIdentifiers {
-        hashes: hashes.into_iter().collect(),
-        project_ids: project_ids.into_iter().collect(),
-    })
-}
diff --git a/packages/app-lib/src/state/instances/domain/mod.rs b/packages/app-lib/src/state/instances/domain/mod.rs
new file mode 100644
index 0000000000..70b786d12e
--- /dev/null
+++ b/packages/app-lib/src/state/instances/domain/mod.rs
@@ -0,0 +1 @@
+// TODO
diff --git a/packages/app-lib/src/state/instances/mod.rs b/packages/app-lib/src/state/instances/mod.rs
index 931e32a6c1..75dd1383b0 100644
--- a/packages/app-lib/src/state/instances/mod.rs
+++ b/packages/app-lib/src/state/instances/mod.rs
@@ -1,4 +1,24 @@
-//! Instance-related modules for profile/instance management.
-
 mod content;
 pub use self::content::*;
+
+mod model;
+pub use self::model::*;
+
+pub(crate) mod adapters;
+pub(crate) mod commands;
+pub use self::commands::{
+    AppliedContentSetPatch, CreateInstance, EditInstance,
+    InstanceLaunchOverridesPatch, InstanceMetadata,
+};
+pub(crate) use self::commands::{
+    create_instance, edit_instance, get_instance, list_instances,
+    refresh_all_instances, remove_instance,
+};
+pub(crate) use self::commands::{
+    dependencies_to_content_items, get_content_projects,
+    get_installed_project_ids_for_instance, get_linked_modpack_info,
+    list_content, list_content_sets, list_linked_modpack_content,
+    sync_content_files,
+};
+mod domain;
+pub(crate) mod watcher;
diff --git a/packages/app-lib/src/state/instances/model/content_entry.rs b/packages/app-lib/src/state/instances/model/content_entry.rs
new file mode 100644
index 0000000000..439cd86808
--- /dev/null
+++ b/packages/app-lib/src/state/instances/model/content_entry.rs
@@ -0,0 +1,52 @@
+use crate::state::ProjectType;
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+
+use super::{ContentSourceKind, unknown_value};
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum ContentRequirement {
+    Required,
+    Optional,
+    Unsupported,
+    Unknown,
+}
+
+impl ContentRequirement {
+    pub fn as_str(self) -> &'static str {
+        match self {
+            Self::Required => "required",
+            Self::Optional => "optional",
+            Self::Unsupported => "unsupported",
+            Self::Unknown => "unknown",
+        }
+    }
+
+    pub fn from_str(value: &str) -> crate::Result<Self> {
+        match value {
+            "required" => Ok(Self::Required),
+            "optional" => Ok(Self::Optional),
+            "unsupported" => Ok(Self::Unsupported),
+            "unknown" => Ok(Self::Unknown),
+            other => Err(unknown_value("content requirement", other)),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ContentEntry {
+    pub id: String,
+    pub instance_id: String,
+    pub content_set_id: String,
+    pub file_id: Option<String>,
+    pub project_type: ProjectType,
+    pub project_id: Option<String>,
+    pub version_id: Option<String>,
+    pub source_kind: ContentSourceKind,
+    pub server_requirement: ContentRequirement,
+    pub client_requirement: ContentRequirement,
+    pub enabled: bool,
+    pub added_at: DateTime<Utc>,
+    pub modified_at: DateTime<Utc>,
+}
diff --git a/packages/app-lib/src/state/instances/model/content_set.rs b/packages/app-lib/src/state/instances/model/content_set.rs
new file mode 100644
index 0000000000..7fb62ea099
--- /dev/null
+++ b/packages/app-lib/src/state/instances/model/content_set.rs
@@ -0,0 +1,87 @@
+use crate::state::ModLoader;
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+
+use super::unknown_value;
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum ContentSourceKind {
+    Local,
+    ModrinthModpack,
+    ServerProject,
+    ModrinthHosting,
+    ImportedModpack,
+    SharedInstance,
+}
+
+impl ContentSourceKind {
+    pub fn as_str(self) -> &'static str {
+        match self {
+            Self::Local => "local",
+            Self::ModrinthModpack => "modrinth_modpack",
+            Self::ServerProject => "server_project",
+            Self::ModrinthHosting => "modrinth_hosting",
+            Self::ImportedModpack => "imported_modpack",
+            Self::SharedInstance => "shared_instance",
+        }
+    }
+
+    pub fn from_str(value: &str) -> crate::Result<Self> {
+        match value {
+            "local" => Ok(Self::Local),
+            "modrinth_modpack" => Ok(Self::ModrinthModpack),
+            "server_project" => Ok(Self::ServerProject),
+            "modrinth_hosting" => Ok(Self::ModrinthHosting),
+            "imported_modpack" => Ok(Self::ImportedModpack),
+            "shared_instance" => Ok(Self::SharedInstance),
+            other => Err(unknown_value("content source kind", other)),
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum ContentSetStatus {
+    Available,
+    Installing,
+    Stale,
+    MissingFiles,
+}
+
+impl ContentSetStatus {
+    pub fn as_str(self) -> &'static str {
+        match self {
+            Self::Available => "available",
+            Self::Installing => "installing",
+            Self::Stale => "stale",
+            Self::MissingFiles => "missing_files",
+        }
+    }
+
+    pub fn from_str(value: &str) -> crate::Result<Self> {
+        match value {
+            "available" => Ok(Self::Available),
+            "installing" => Ok(Self::Installing),
+            "stale" => Ok(Self::Stale),
+            "missing_files" => Ok(Self::MissingFiles),
+            other => Err(unknown_value("content set status", other)),
+        }
+    }
+}
+
+/// Represents a playable setup slot for an instance.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ContentSet {
+    pub id: String,
+    pub instance_id: String,
+    pub name: String,
+    pub source_kind: ContentSourceKind,
+    pub status: ContentSetStatus,
+    pub game_version: String,
+    pub protocol_version: Option<u32>,
+    pub loader: ModLoader,
+    pub loader_version: Option<String>,
+    pub created: DateTime<Utc>,
+    pub modified: DateTime<Utc>,
+}
diff --git a/packages/app-lib/src/state/instances/model/content_set_remote_ref.rs b/packages/app-lib/src/state/instances/model/content_set_remote_ref.rs
new file mode 100644
index 0000000000..09e5d34a6a
--- /dev/null
+++ b/packages/app-lib/src/state/instances/model/content_set_remote_ref.rs
@@ -0,0 +1,34 @@
+use serde::{Deserialize, Serialize};
+
+use super::unknown_value;
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum ContentSetRemoteRefType {
+    SharedContentSet,
+    HostingInstance,
+}
+
+impl ContentSetRemoteRefType {
+    pub fn as_str(self) -> &'static str {
+        match self {
+            Self::SharedContentSet => "shared_content_set",
+            Self::HostingInstance => "hosting_instance",
+        }
+    }
+
+    pub fn from_str(value: &str) -> crate::Result<Self> {
+        match value {
+            "shared_content_set" => Ok(Self::SharedContentSet),
+            "hosting_instance" => Ok(Self::HostingInstance),
+            other => Err(unknown_value("content set remote ref type", other)),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ContentSetRemoteRef {
+    pub content_set_id: String,
+    pub ref_type: ContentSetRemoteRefType,
+    pub ref_id: String,
+}
diff --git a/packages/app-lib/src/state/instances/model/content_set_sync_state.rs b/packages/app-lib/src/state/instances/model/content_set_sync_state.rs
new file mode 100644
index 0000000000..9dcdbd91c3
--- /dev/null
+++ b/packages/app-lib/src/state/instances/model/content_set_sync_state.rs
@@ -0,0 +1,74 @@
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+
+use super::unknown_value;
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum ContentSetSyncProvider {
+    SharedInstance,
+}
+
+impl ContentSetSyncProvider {
+    pub fn as_str(self) -> &'static str {
+        match self {
+            Self::SharedInstance => "shared_instance",
+        }
+    }
+
+    pub fn from_str(value: &str) -> crate::Result<Self> {
+        match value {
+            "shared_instance" => Ok(Self::SharedInstance),
+            other => Err(unknown_value("content set sync provider", other)),
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum ContentSetSyncStatus {
+    Unknown,
+    UpToDate,
+    UpdateAvailable,
+    Applying,
+    Stale,
+    NotReady,
+    Error,
+}
+
+impl ContentSetSyncStatus {
+    pub fn as_str(self) -> &'static str {
+        match self {
+            Self::Unknown => "unknown",
+            Self::UpToDate => "up_to_date",
+            Self::UpdateAvailable => "update_available",
+            Self::Applying => "applying",
+            Self::Stale => "stale",
+            Self::NotReady => "not_ready",
+            Self::Error => "error",
+        }
+    }
+
+    pub fn from_str(value: &str) -> crate::Result<Self> {
+        match value {
+            "unknown" => Ok(Self::Unknown),
+            "up_to_date" => Ok(Self::UpToDate),
+            "update_available" => Ok(Self::UpdateAvailable),
+            "applying" => Ok(Self::Applying),
+            "stale" => Ok(Self::Stale),
+            "not_ready" => Ok(Self::NotReady),
+            "error" => Ok(Self::Error),
+            other => Err(unknown_value("content set sync status", other)),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ContentSetSyncState {
+    pub content_set_id: String,
+    pub provider: ContentSetSyncProvider,
+    pub applied_update_id: Option<String>,
+    pub latest_available_update_id: Option<String>,
+    pub checked_at: Option<DateTime<Utc>>,
+    pub status: ContentSetSyncStatus,
+}
diff --git a/packages/app-lib/src/state/instances/model/file.rs b/packages/app-lib/src/state/instances/model/file.rs
new file mode 100644
index 0000000000..8a45adcc34
--- /dev/null
+++ b/packages/app-lib/src/state/instances/model/file.rs
@@ -0,0 +1,16 @@
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct InstanceFile {
+    pub id: String,
+    pub instance_id: String,
+    pub relative_path: String,
+    pub file_name: String,
+    pub enabled: bool,
+    pub sha1: String,
+    pub size: u64,
+    pub missing: bool,
+    pub added_at: DateTime<Utc>,
+    pub modified_at: DateTime<Utc>,
+}
diff --git a/packages/app-lib/src/state/instances/model/instance.rs b/packages/app-lib/src/state/instances/model/instance.rs
new file mode 100644
index 0000000000..4bfda092f6
--- /dev/null
+++ b/packages/app-lib/src/state/instances/model/instance.rs
@@ -0,0 +1,22 @@
+use crate::state::{
+    InstanceInstallStage, LauncherFeatureVersion, ReleaseChannel,
+};
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct Instance {
+    pub id: String,
+    pub path: String,
+    pub applied_content_set_id: Option<String>,
+    pub install_stage: InstanceInstallStage,
+    pub launcher_feature_version: LauncherFeatureVersion,
+    pub update_channel: ReleaseChannel,
+    pub name: String,
+    pub icon_path: Option<String>,
+    pub created: DateTime<Utc>,
+    pub modified: DateTime<Utc>,
+    pub last_played: Option<DateTime<Utc>>,
+    pub submitted_time_played: u64,
+    pub recent_time_played: u64,
+}
diff --git a/packages/app-lib/src/state/instances/model/launch.rs b/packages/app-lib/src/state/instances/model/launch.rs
new file mode 100644
index 0000000000..2af757996a
--- /dev/null
+++ b/packages/app-lib/src/state/instances/model/launch.rs
@@ -0,0 +1,43 @@
+use crate::state::{
+    ContentSet, Hooks, Instance, InstanceLink, MemorySettings, WindowSize,
+};
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct InstanceLaunchOverrides {
+    pub instance_id: String,
+    pub java_path: Option<String>,
+    pub extra_launch_args: Option<Vec<String>>,
+    pub custom_env_vars: Option<Vec<(String, String)>>,
+    pub memory: Option<MemorySettings>,
+    pub force_fullscreen: Option<bool>,
+    pub game_resolution: Option<WindowSize>,
+    pub hooks: Hooks,
+}
+
+impl InstanceLaunchOverrides {
+    pub fn empty(instance_id: String) -> Self {
+        Self {
+            instance_id,
+            java_path: None,
+            extra_launch_args: None,
+            custom_env_vars: None,
+            memory: None,
+            force_fullscreen: None,
+            game_resolution: None,
+            hooks: Hooks {
+                pre_launch: None,
+                wrapper: None,
+                post_exit: None,
+            },
+        }
+    }
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct InstanceLaunchContext {
+    pub instance: Instance,
+    pub applied_content_set: ContentSet,
+    pub link: InstanceLink,
+    pub launch_overrides: InstanceLaunchOverrides,
+}
diff --git a/packages/app-lib/src/state/instances/model/link.rs b/packages/app-lib/src/state/instances/model/link.rs
new file mode 100644
index 0000000000..752147436a
--- /dev/null
+++ b/packages/app-lib/src/state/instances/model/link.rs
@@ -0,0 +1,35 @@
+use serde::{Deserialize, Serialize};
+use uuid::Uuid;
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum InstanceLink {
+    Unmanaged,
+    ModrinthModpack {
+        project_id: String,
+        version_id: String,
+    },
+    ServerProject {
+        project_id: String,
+    },
+    /// A server project that points at a separate content project/version.
+    ServerProjectModpack {
+        server_project_id: String,
+        content_project_id: String,
+        content_version_id: String,
+    },
+    /// Hosting sync still flows through the shared-instance service.
+    ModrinthHosting {
+        server_id: Uuid,
+        instance_ids: Vec<Uuid>,
+        active_instance_id: Option<Uuid>,
+    },
+    /// A custom modpack source without a Modrinth project/version link.
+    ImportedModpack {
+        project_id: Option<String>,
+        version_id: Option<String>,
+    },
+    SharedInstance {
+        shared_instance_id: Uuid,
+    },
+}
diff --git a/packages/app-lib/src/state/instances/model/manifest.rs b/packages/app-lib/src/state/instances/model/manifest.rs
new file mode 100644
index 0000000000..e44f71ade1
--- /dev/null
+++ b/packages/app-lib/src/state/instances/model/manifest.rs
@@ -0,0 +1,11 @@
+use serde::{Deserialize, Serialize};
+
+use super::{ContentEntry, InstanceFile};
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct InstanceContentManifest {
+    pub instance_id: String,
+    pub content_set_id: String,
+    pub entries: Vec<ContentEntry>,
+    pub files: Vec<InstanceFile>,
+}
diff --git a/packages/app-lib/src/state/instances/model/mod.rs b/packages/app-lib/src/state/instances/model/mod.rs
new file mode 100644
index 0000000000..cacd063aff
--- /dev/null
+++ b/packages/app-lib/src/state/instances/model/mod.rs
@@ -0,0 +1,34 @@
+#![allow(dead_code)]
+
+mod content_entry;
+pub use self::content_entry::*;
+
+mod content_set;
+pub use self::content_set::*;
+
+mod content_set_remote_ref;
+pub use self::content_set_remote_ref::*;
+
+mod content_set_sync_state;
+pub use self::content_set_sync_state::*;
+
+mod file;
+pub use self::file::*;
+
+mod instance;
+pub use self::instance::*;
+
+mod launch;
+pub use self::launch::*;
+
+mod link;
+pub use self::link::*;
+
+mod manifest;
+
+mod update_check;
+pub use self::update_check::*;
+
+fn unknown_value(kind: &str, value: &str) -> crate::Error {
+    crate::ErrorKind::InputError(format!("Unknown {kind} {value}")).into()
+}
diff --git a/packages/app-lib/src/state/instances/model/update_check.rs b/packages/app-lib/src/state/instances/model/update_check.rs
new file mode 100644
index 0000000000..142843c9d4
--- /dev/null
+++ b/packages/app-lib/src/state/instances/model/update_check.rs
@@ -0,0 +1,11 @@
+use crate::state::ReleaseChannel;
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct ContentUpdateCheck {
+    pub content_entry_id: String,
+    pub update_channel: ReleaseChannel,
+    pub update_version_id: Option<String>,
+    pub checked_at: DateTime<Utc>,
+}
diff --git a/packages/app-lib/src/state/instances/watcher.rs b/packages/app-lib/src/state/instances/watcher.rs
new file mode 100644
index 0000000000..fa324f5ed7
--- /dev/null
+++ b/packages/app-lib/src/state/instances/watcher.rs
@@ -0,0 +1,269 @@
+use crate::State;
+use crate::event::InstancePayloadType;
+use crate::event::emit::{emit_instance, emit_warning};
+use crate::state::{
+    DirectoryInfo, InstanceInstallStage, ProjectType, attached_world_data,
+};
+use crate::worlds::WorldType;
+use notify::{RecommendedWatcher, RecursiveMode};
+use notify_debouncer_mini::{DebounceEventResult, Debouncer, new_debouncer};
+use std::time::Duration;
+use tokio::sync::{RwLock, mpsc::channel};
+
+use super::adapters::sqlite::instance_rows;
+
+pub type FileWatcher = RwLock<Debouncer<RecommendedWatcher>>;
+
+pub async fn init_watcher() -> crate::Result<FileWatcher> {
+    let (tx, mut rx) = channel(1);
+
+    let file_watcher = new_debouncer(
+        Duration::from_secs_f32(1.0),
+        move |res: DebounceEventResult| {
+            tx.blocking_send(res).ok();
+        },
+    )?;
+
+    tokio::task::spawn(async move {
+        let span = tracing::span!(tracing::Level::INFO, "init_watcher");
+        tracing::info!(parent: &span, "Initing watcher");
+        while let Some(res) = rx.recv().await {
+            let _span = span.enter();
+
+            match res {
+                Ok(events) => {
+                    let mut visited_instances = Vec::new();
+
+                    events.iter().for_each(|e| {
+						let mut instance_path = None;
+
+						let mut found = false;
+						for component in e.path.components() {
+							if found {
+								instance_path = Some(component.as_os_str());
+								break;
+							}
+
+							if component.as_os_str()
+								== crate::state::dirs::INSTANCES_FOLDER_NAME
+							{
+								found = true;
+							}
+						}
+
+						if let Some(instance_path) = instance_path {
+							let instance_path_str =
+								instance_path.to_string_lossy().to_string();
+							let first_file_name = e
+								.path
+								.components()
+								.skip_while(|x| x.as_os_str() != instance_path)
+								.nth(1)
+								.map(|x| x.as_os_str());
+							if first_file_name
+								.as_ref()
+								.is_some_and(|x| *x == "crash-reports")
+								&& e.path
+									.extension()
+									.as_ref()
+									.is_some_and(|x| *x == "txt")
+							{
+								crash_task(instance_path_str);
+							} else if !visited_instances.contains(&instance_path)
+							{
+								let event = if first_file_name
+									.as_ref()
+									.is_some_and(|x| *x == "servers.dat")
+								{
+									Some(InstancePayloadType::ServersUpdated)
+								} else if first_file_name.as_ref().is_some_and(|x| {
+									*x == "saves"
+										&& e.path
+											.file_name()
+											.as_ref()
+											.is_some_and(|x| *x == "level.dat")
+								}) {
+									tracing::info!(
+										"World updated: {}",
+										e.path.display()
+									);
+									let world = e
+										.path
+										.parent()
+										.unwrap()
+										.file_name()
+										.unwrap()
+										.to_string_lossy()
+										.to_string();
+									if !e.path.is_file() {
+										let instance_path_str = instance_path_str.clone();
+										let world = world.clone();
+										tokio::spawn(async move {
+											if let Ok(state) = State::get().await {
+												let instance_id = sqlx::query_scalar::<_, String>(
+													"
+													SELECT id
+													FROM instances
+													WHERE path = ?
+													",
+												)
+												.bind(&instance_path_str)
+												.fetch_optional(&state.pool)
+												.await;
+												let Ok(Some(instance_id)) = instance_id else {
+													return;
+												};
+												if let Err(e) = attached_world_data::AttachedWorldData::remove_for_world(
+													&instance_id,
+													WorldType::Singleplayer,
+													&world,
+													&state.pool
+												).await {
+													tracing::warn!("Failed to remove AttachedWorldData for '{world}': {e}")
+												}
+											}
+										});
+									}
+									Some(InstancePayloadType::WorldUpdated { world })
+								} else if first_file_name
+									.as_ref()
+									.is_none_or(|x| *x != "saves")
+								{
+									Some(InstancePayloadType::Synced)
+								} else {
+									None
+								};
+								if let Some(event) = event {
+									tokio::spawn(async move {
+										let _ = emit_instance(
+											&instance_path_str,
+											event,
+										)
+										.await;
+									});
+									visited_instances.push(instance_path);
+								}
+							}
+						}
+					});
+                }
+                Err(error) => tracing::warn!("Unable to watch file: {error}"),
+            }
+        }
+    });
+
+    Ok(RwLock::new(file_watcher))
+}
+
+pub(crate) async fn watch_instances_init(
+    watcher: &FileWatcher,
+    dirs: &DirectoryInfo,
+) {
+    let Ok(mut instances_dir) = tokio::fs::read_dir(dirs.instances_dir()).await
+    else {
+        return;
+    };
+
+    while let Ok(Some(instance_dir)) = instances_dir.next_entry().await {
+        let file_name = instance_dir.file_name();
+        let file_name = file_name.to_string_lossy();
+        if file_name.starts_with(".DS_Store") {
+            continue;
+        }
+
+        watch_instance_folder(&file_name, watcher, dirs).await;
+    }
+}
+
+pub(crate) async fn watch_instance_folder(
+    instance_path: &str,
+    watcher: &FileWatcher,
+    dirs: &DirectoryInfo,
+) {
+    let instance_path = dirs.instances_dir().join(instance_path);
+
+    let Ok(metadata) = tokio::fs::metadata(&instance_path).await else {
+        return;
+    };
+
+    if !metadata.is_dir() {
+        return;
+    }
+
+    let mut to_watch = Vec::new();
+    for sub_path in ProjectType::iterator()
+        .map(|x| x.get_folder())
+        .chain(["crash-reports", "saves"])
+    {
+        let full_path = instance_path.join(sub_path);
+
+        let meta = tokio::fs::symlink_metadata(&full_path).await;
+        let exists = meta.is_ok();
+        let is_symlink = meta.ok().is_some_and(|m| m.file_type().is_symlink());
+
+        if !exists
+            && !is_symlink
+            && !sub_path.contains(".")
+            && let Err(e) = crate::util::io::create_dir_all(&full_path).await
+        {
+            tracing::error!(
+                "Failed to create directory for watcher {full_path:?}: {e}"
+            );
+            return;
+        }
+
+        to_watch.push(full_path);
+    }
+
+    let mut watcher = watcher.write().await;
+    for full_path in &to_watch {
+        if let Err(e) =
+            watcher.watcher().watch(full_path, RecursiveMode::Recursive)
+        {
+            tracing::error!(
+                "Failed to watch directory for watcher {full_path:?}: {e}"
+            );
+            return;
+        }
+    }
+
+    if let Err(e) = watcher
+        .watcher()
+        .watch(&instance_path, RecursiveMode::NonRecursive)
+    {
+        tracing::error!(
+            "Failed to watch root instance directory for watcher {instance_path:?}: {e}"
+        );
+    }
+}
+
+fn crash_task(path: String) {
+    tokio::task::spawn(async move {
+        let res = async {
+            let state = State::get().await?;
+            let Some(instance) =
+                instance_rows::get_instance_by_path(&path, &state.pool).await?
+            else {
+                return Ok(());
+            };
+
+            if instance.install_stage == InstanceInstallStage::Installed {
+                emit_warning(&format!(
+					"Instance {} has crashed! Visit the logs page to see a crash report.",
+					instance.name
+				))
+				.await?;
+            }
+
+            Ok::<(), crate::Error>(())
+        }
+        .await;
+
+        match res {
+            Ok(()) => {}
+            Err(err) => {
+                tracing::warn!("Unable to send crash report to frontend: {err}")
+            }
+        };
+    });
+}
diff --git a/packages/app-lib/src/state/legacy_converter.rs b/packages/app-lib/src/state/legacy_converter.rs
index 9404c6ae0f..954ebb4d0c 100644
--- a/packages/app-lib/src/state/legacy_converter.rs
+++ b/packages/app-lib/src/state/legacy_converter.rs
@@ -5,8 +5,8 @@ use crate::state;
 use crate::state::{
     CacheValue, CachedEntry, CachedFile, CachedFileHash, CachedFileUpdate,
     Credentials, DefaultPage, DependencyType, DeviceToken, DeviceTokenKey,
-    DeviceTokenPair, FileType, Hooks, LauncherFeatureVersion, LinkedData,
-    MemorySettings, ModrinthCredentials, Profile, ProfileInstallStage,
+    DeviceTokenPair, FileType, Hooks, InstanceInstallStage,
+    LauncherFeatureVersion, MemorySettings, ModrinthCredentials,
     ReleaseChannel, TeamMember, Theme, VersionFile, WindowSize,
 };
 use crate::util::fetch::{IoSemaphore, read_json};
@@ -161,23 +161,25 @@ where
 
         let mut cached_entries = vec![];
 
-        if let Ok(profiles_dir) = std::fs::read_dir(
+        if let Ok(legacy_instances_dir) = std::fs::read_dir(
             legacy_settings
                 .loaded_config_dir
                 .clone()
                 .unwrap_or_else(|| old_launcher_root.clone())
                 .join("profiles"),
         ) {
-            for entry in profiles_dir.flatten() {
+            for entry in legacy_instances_dir.flatten() {
                 if !entry.path().is_dir() {
                     continue;
                 }
 
-                let profile_path = entry.path().join("profile.json");
+                let legacy_config_path = entry.path().join("profile.json");
 
-                let Ok(profile) =
-                    read_json::<LegacyProfile>(&profile_path, &io_semaphore)
-                        .await
+                let Ok(profile) = read_json::<LegacyInstanceConfig>(
+                    &legacy_config_path,
+                    &io_semaphore,
+                )
+                .await
                 else {
                     continue;
                 };
@@ -299,85 +301,72 @@ where
                     }
                 }
 
-                Profile {
-                    path: profile.path,
-                    install_stage: match profile.install_stage {
-                        LegacyProfileInstallStage::Installed => {
-                            ProfileInstallStage::Installed
-                        }
-                        LegacyProfileInstallStage::Installing => {
-                            ProfileInstallStage::MinecraftInstalling
-                        }
-                        LegacyProfileInstallStage::PackInstalling => {
-                            ProfileInstallStage::PackInstalling
-                        }
-                        LegacyProfileInstallStage::NotInstalled => {
-                            ProfileInstallStage::NotInstalled
-                        }
-                    },
-                    launcher_feature_version: LauncherFeatureVersion::None,
-                    name: profile.metadata.name,
-                    icon_path: profile.metadata.icon,
-                    game_version: profile.metadata.game_version,
-                    protocol_version: None,
-                    loader: profile.metadata.loader.into(),
-                    loader_version: profile
-                        .metadata
-                        .loader_version
-                        .map(|x| x.id),
-                    groups: profile.metadata.groups,
-                    linked_data: profile.metadata.linked_data.and_then(|x| {
-                        if let Some(project_id) = x.project_id
-                            && let Some(version_id) = x.version_id
-                            && let Some(locked) = x.locked
-                        {
-                            return Some(LinkedData {
-                                project_id,
-                                version_id,
-                                locked,
-                            });
-                        }
-
-                        None
-                    }),
-                    preferred_update_channel: ReleaseChannel::Release,
-                    created: profile.metadata.date_created,
-                    modified: profile.metadata.date_modified,
-                    last_played: profile.metadata.last_played,
-                    submitted_time_played: profile
-                        .metadata
-                        .submitted_time_played,
-                    recent_time_played: profile.metadata.recent_time_played,
-                    java_path: profile.java.as_ref().and_then(|x| {
-                        x.override_version.clone().map(|x| x.path)
-                    }),
-                    extra_launch_args: profile
-                        .java
-                        .as_ref()
-                        .and_then(|x| x.extra_arguments.clone()),
-                    custom_env_vars: profile
-                        .java
-                        .and_then(|x| x.custom_env_args),
-                    memory: profile
-                        .memory
-                        .map(|x| MemorySettings { maximum: x.maximum }),
-                    force_fullscreen: profile.fullscreen,
-                    game_resolution: profile
-                        .resolution
-                        .map(|x| WindowSize(x.0, x.1)),
-                    hooks: Hooks {
-                        pre_launch: profile
-                            .hooks
-                            .as_ref()
-                            .and_then(|x| x.pre_launch.clone()),
-                        wrapper: profile
-                            .hooks
+                upsert_legacy_instance(
+                    exec,
+                    LegacyInstanceUpsert {
+                        path: profile.path,
+                        install_stage: match profile.install_stage {
+                            LegacyInstanceInstallStage::Installed => {
+                                InstanceInstallStage::Installed
+                            }
+                            LegacyInstanceInstallStage::Installing => {
+                                InstanceInstallStage::MinecraftInstalling
+                            }
+                            LegacyInstanceInstallStage::PackInstalling => {
+                                InstanceInstallStage::PackInstalling
+                            }
+                            LegacyInstanceInstallStage::NotInstalled => {
+                                InstanceInstallStage::NotInstalled
+                            }
+                        },
+                        launcher_feature_version: LauncherFeatureVersion::None,
+                        name: profile.metadata.name,
+                        icon_path: profile.metadata.icon,
+                        game_version: profile.metadata.game_version,
+                        loader: profile.metadata.loader.into(),
+                        loader_version: profile
+                            .metadata
+                            .loader_version
+                            .map(|x| x.id),
+                        groups: profile.metadata.groups,
+                        linked_data: profile.metadata.linked_data,
+                        created: profile.metadata.date_created,
+                        modified: profile.metadata.date_modified,
+                        last_played: profile.metadata.last_played,
+                        submitted_time_played: profile
+                            .metadata
+                            .submitted_time_played,
+                        recent_time_played: profile.metadata.recent_time_played,
+                        java_path: profile.java.as_ref().and_then(|x| {
+                            x.override_version.clone().map(|x| x.path)
+                        }),
+                        extra_launch_args: profile
+                            .java
                             .as_ref()
-                            .and_then(|x| x.wrapper.clone()),
-                        post_exit: profile.hooks.and_then(|x| x.post_exit),
+                            .and_then(|x| x.extra_arguments.clone()),
+                        custom_env_vars: profile
+                            .java
+                            .and_then(|x| x.custom_env_args),
+                        memory: profile
+                            .memory
+                            .map(|x| MemorySettings { maximum: x.maximum }),
+                        force_fullscreen: profile.fullscreen,
+                        game_resolution: profile
+                            .resolution
+                            .map(|x| WindowSize(x.0, x.1)),
+                        hooks: Hooks {
+                            pre_launch: profile
+                                .hooks
+                                .as_ref()
+                                .and_then(|x| x.pre_launch.clone()),
+                            wrapper: profile
+                                .hooks
+                                .as_ref()
+                                .and_then(|x| x.wrapper.clone()),
+                            post_exit: profile.hooks.and_then(|x| x.post_exit),
+                        },
                     },
-                }
-                .upsert(exec)
+                )
                 .await?;
             }
         }
@@ -403,6 +392,232 @@ where
     Ok(())
 }
 
+struct LegacyInstanceUpsert {
+    path: String,
+    install_stage: InstanceInstallStage,
+    launcher_feature_version: LauncherFeatureVersion,
+    name: String,
+    icon_path: Option<String>,
+    game_version: String,
+    loader: ModLoader,
+    loader_version: Option<String>,
+    groups: Vec<String>,
+    linked_data: Option<LegacyLinkedData>,
+    created: DateTime<Utc>,
+    modified: DateTime<Utc>,
+    last_played: Option<DateTime<Utc>>,
+    submitted_time_played: u64,
+    recent_time_played: u64,
+    java_path: Option<String>,
+    extra_launch_args: Option<Vec<String>>,
+    custom_env_vars: Option<Vec<(String, String)>>,
+    memory: Option<MemorySettings>,
+    force_fullscreen: Option<bool>,
+    game_resolution: Option<WindowSize>,
+    hooks: Hooks,
+}
+
+async fn upsert_legacy_instance<'a, E>(
+    exec: E,
+    input: LegacyInstanceUpsert,
+) -> crate::Result<()>
+where
+    E: sqlx::Executor<'a, Database = sqlx::Sqlite> + Copy,
+{
+    let instance_id = format!("local:{}", Uuid::new_v4());
+    let content_set_id = format!("content-set:{}", Uuid::new_v4());
+
+    sqlx::query(
+        "
+        INSERT OR REPLACE INTO instances (
+            id,
+            path,
+            applied_content_set_id,
+            install_stage,
+            launcher_feature_version,
+            update_channel,
+            name,
+            icon_path,
+            created,
+            modified,
+            last_played,
+            submitted_time_played,
+            recent_time_played
+        )
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        ",
+    )
+    .bind(&instance_id)
+    .bind(&input.path)
+    .bind(&content_set_id)
+    .bind(input.install_stage.as_str())
+    .bind(input.launcher_feature_version.as_str())
+    .bind(ReleaseChannel::Release.key())
+    .bind(&input.name)
+    .bind(input.icon_path.as_deref())
+    .bind(input.created.timestamp())
+    .bind(input.modified.timestamp())
+    .bind(input.last_played.map(|value| value.timestamp()))
+    .bind(input.submitted_time_played as i64)
+    .bind(input.recent_time_played as i64)
+    .execute(exec)
+    .await?;
+
+    let (
+        source_kind,
+        link_kind,
+        modrinth_project_id,
+        modrinth_version_id,
+        server_project_id,
+    ) = match input.linked_data {
+        Some(linked_data) => {
+            match (linked_data.project_id, linked_data.version_id) {
+                (Some(project_id), Some(version_id))
+                    if version_id.is_empty() =>
+                {
+                    (
+                        "server_project",
+                        "server_project",
+                        None,
+                        None,
+                        Some(project_id),
+                    )
+                }
+                (Some(project_id), Some(version_id)) => (
+                    "modrinth_modpack",
+                    "modrinth_modpack",
+                    Some(project_id),
+                    Some(version_id),
+                    None,
+                ),
+                _ => ("local", "unmanaged", None, None, None),
+            }
+        }
+        None => ("local", "unmanaged", None, None, None),
+    };
+
+    sqlx::query(
+        "
+        INSERT OR REPLACE INTO instance_content_sets (
+            id,
+            instance_id,
+            name,
+            source_kind,
+            status,
+            game_version,
+            protocol_version,
+            loader,
+            loader_version,
+            created,
+            modified
+        )
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        ",
+    )
+    .bind(&content_set_id)
+    .bind(&instance_id)
+    .bind("Default")
+    .bind(source_kind)
+    .bind("available")
+    .bind(&input.game_version)
+    .bind(None::<i64>)
+    .bind(input.loader.as_str())
+    .bind(input.loader_version.as_deref())
+    .bind(input.created.timestamp())
+    .bind(input.modified.timestamp())
+    .execute(exec)
+    .await?;
+
+    sqlx::query(
+        "
+        INSERT OR REPLACE INTO instance_links (
+            instance_id,
+            link_kind,
+            modrinth_project_id,
+            modrinth_version_id,
+            server_project_id,
+            content_project_id,
+            content_version_id,
+            hosting_server_id,
+            hosting_instance_ids,
+            hosting_active_instance_id,
+            shared_instance_id
+        )
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, jsonb(?), ?, ?)
+        ",
+    )
+    .bind(&instance_id)
+    .bind(link_kind)
+    .bind(modrinth_project_id.as_deref())
+    .bind(modrinth_version_id.as_deref())
+    .bind(server_project_id.as_deref())
+    .bind(None::<&str>)
+    .bind(None::<&str>)
+    .bind(None::<&str>)
+    .bind("[]")
+    .bind(None::<&str>)
+    .bind(None::<&str>)
+    .execute(exec)
+    .await?;
+
+    for group in input.groups {
+        sqlx::query(
+            "
+            INSERT OR IGNORE INTO instance_groups (instance_id, group_name)
+            VALUES (?, ?)
+            ",
+        )
+        .bind(&instance_id)
+        .bind(group)
+        .execute(exec)
+        .await?;
+    }
+
+    let extra_launch_args = input
+        .extra_launch_args
+        .as_ref()
+        .map(serde_json::to_string)
+        .transpose()?;
+    let custom_env_vars = input
+        .custom_env_vars
+        .as_ref()
+        .map(serde_json::to_string)
+        .transpose()?;
+    sqlx::query(
+        "
+        INSERT OR REPLACE INTO instance_launch_overrides (
+            instance_id,
+            java_path,
+            extra_launch_args,
+            custom_env_vars,
+            memory,
+            force_fullscreen,
+            game_resolution_x,
+            game_resolution_y,
+            hook_pre_launch,
+            hook_wrapper,
+            hook_post_exit
+        )
+        VALUES (?, ?, jsonb(?), jsonb(?), ?, ?, ?, ?, ?, ?, ?)
+        ",
+    )
+    .bind(&instance_id)
+    .bind(input.java_path.as_deref())
+    .bind(extra_launch_args)
+    .bind(custom_env_vars)
+    .bind(input.memory.map(|value| value.maximum as i64))
+    .bind(input.force_fullscreen.map(i64::from))
+    .bind(input.game_resolution.map(|value| value.0 as i64))
+    .bind(input.game_resolution.map(|value| value.1 as i64))
+    .bind(input.hooks.pre_launch.as_deref())
+    .bind(input.hooks.wrapper.as_deref())
+    .bind(input.hooks.post_exit.as_deref())
+    .execute(exec)
+    .await?;
+
+    Ok(())
+}
+
 #[derive(Deserialize, Debug, Clone)]
 struct LegacySettings {
     pub theme: LegacyTheme,
@@ -534,12 +749,12 @@ struct LegacyDeviceToken {
 }
 
 #[derive(Deserialize, Clone, Debug)]
-struct LegacyProfile {
+struct LegacyInstanceConfig {
     #[serde(default)]
-    pub install_stage: LegacyProfileInstallStage,
+    pub install_stage: LegacyInstanceInstallStage,
     #[serde(default)]
     pub path: String,
-    pub metadata: LegacyProfileMetadata,
+    pub metadata: LegacyInstanceMetadata,
     pub java: Option<LegacyJavaSettings>,
     pub memory: Option<LegacyMemorySettings>,
     pub resolution: Option<LegacyWindowSize>,
@@ -737,7 +952,7 @@ enum LegacyFileType {
 }
 
 #[derive(Deserialize, Clone, Debug)]
-struct LegacyProfileMetadata {
+struct LegacyInstanceMetadata {
     pub name: String,
     pub icon: Option<String>,
     #[serde(default)]
@@ -788,13 +1003,6 @@ impl From<LegacyModLoader> for ModLoader {
 struct LegacyLinkedData {
     pub project_id: Option<String>,
     pub version_id: Option<String>,
-
-    #[serde(default = "default_locked")]
-    pub locked: Option<bool>,
-}
-
-fn default_locked() -> Option<bool> {
-    Some(true)
 }
 
 #[derive(Deserialize, Clone, Debug)]
@@ -811,7 +1019,7 @@ struct LegacyLoaderVersion {
 
 #[derive(Deserialize, Clone, Copy, Debug, Default, Eq, PartialEq)]
 #[serde(rename_all = "snake_case")]
-enum LegacyProfileInstallStage {
+enum LegacyInstanceInstallStage {
     Installed,
     Installing,
     PackInstalling,
diff --git a/packages/app-lib/src/state/mod.rs b/packages/app-lib/src/state/mod.rs
index 2b8ddf73a6..4b66070222 100644
--- a/packages/app-lib/src/state/mod.rs
+++ b/packages/app-lib/src/state/mod.rs
@@ -4,17 +4,17 @@ use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
 use tokio::sync::{OnceCell, Semaphore};
 
-use crate::state::fs_watcher::FileWatcher;
+use crate::state::instances::watcher::FileWatcher;
 use sqlx::SqlitePool;
 
 // Submodules
 mod dirs;
 pub use self::dirs::*;
 
-mod profiles;
-pub use self::profiles::*;
+mod instance_types;
+pub use self::instance_types::*;
 
-mod instances;
+pub(crate) mod instances;
 pub use self::instances::*;
 
 mod settings;
@@ -44,7 +44,6 @@ mod tunnel;
 pub use self::tunnel::*;
 
 pub mod db;
-pub mod fs_watcher;
 mod mr_auth;
 
 pub use self::mr_auth::*;
@@ -98,7 +97,7 @@ impl State {
             .await?;
 
         tokio::task::spawn(async move {
-            fs_watcher::watch_profiles_init(
+            instances::watcher::watch_instances_init(
                 &state.file_watcher,
                 &state.directories,
             )
@@ -106,7 +105,7 @@ impl State {
 
             let res = tokio::try_join!(
                 state.discord_rpc.clear_to_default(true),
-                Profile::refresh_all(),
+                instances::refresh_all_instances(),
                 Settings::migrate(&state.pool),
                 ModrinthCredentials::refresh_all(),
             );
@@ -187,7 +186,7 @@ impl State {
         let discord_rpc = DiscordGuard::init()?;
 
         tracing::info!("Initializing file watcher");
-        let file_watcher = fs_watcher::init_watcher().await?;
+        let file_watcher = instances::watcher::init_watcher().await?;
 
         let process_manager = ProcessManager::new();
 
diff --git a/packages/app-lib/src/state/process.rs b/packages/app-lib/src/state/process.rs
index fb6f0da317..cc2aff0224 100644
--- a/packages/app-lib/src/state/process.rs
+++ b/packages/app-lib/src/state/process.rs
@@ -1,8 +1,7 @@
-use crate::event::emit::{emit_process, emit_profile};
+use crate::event::emit::{emit_instance, emit_process};
+use crate::event::{InstancePayloadType, ProcessPayloadType};
 #[cfg(feature = "tauri")]
 use crate::event::{LogEvent, LogPayload};
-use crate::event::{ProcessPayloadType, ProfilePayloadType};
-use crate::profile;
 use crate::util::io::IOError;
 use crate::util::rpc::RpcServer;
 use chrono::{DateTime, NaiveDateTime, TimeZone, Utc};
@@ -58,28 +57,28 @@ impl LogRingBuffer {
 static LOG_BUFFERS: LazyLock<DashMap<String, LogRingBuffer>> =
     LazyLock::new(DashMap::new);
 
-pub fn push_log_line(profile_path: &str, line: String) {
+pub fn push_log_line(instance_id: &str, line: String) {
     LOG_BUFFERS
-        .entry(profile_path.to_string())
+        .entry(instance_id.to_string())
         .or_insert_with(LogRingBuffer::new)
         .push(line);
 }
 
-pub fn get_log_buffer(profile_path: &str) -> Vec<String> {
+pub fn get_log_buffer(instance_id: &str) -> Vec<String> {
     LOG_BUFFERS
-        .get(profile_path)
+        .get(instance_id)
         .map(|buf| buf.get_all())
         .unwrap_or_default()
 }
 
-pub fn clear_log_buffer(profile_path: &str) {
-    if let Some(mut buf) = LOG_BUFFERS.get_mut(profile_path) {
+pub fn clear_log_buffer(instance_id: &str) {
+    if let Some(mut buf) = LOG_BUFFERS.get_mut(instance_id) {
         buf.clear();
     }
 }
 
-pub fn remove_log_buffer(profile_path: &str) {
-    LOG_BUFFERS.remove(profile_path);
+pub fn remove_log_buffer(instance_id: &str) {
+    LOG_BUFFERS.remove(instance_id);
 }
 
 pub struct ProcessManager {
@@ -102,7 +101,9 @@ impl ProcessManager {
     #[allow(clippy::too_many_arguments)]
     pub async fn insert_new_process(
         &self,
-        profile_path: &str,
+        instance_id: &str,
+        instance_path: &str,
+        instance_name: &str,
         mut mc_command: Command,
         post_exit_command: Option<String>,
         logs_folder: PathBuf,
@@ -127,7 +128,9 @@ impl ProcessManager {
             metadata: ProcessMetadata {
                 uuid: Uuid::new_v4(),
                 start_time: Utc::now(),
-                profile_path: profile_path.to_string(),
+                instance_id: instance_id.to_string(),
+                instance_path: instance_path.to_string(),
+                instance_name: instance_name.to_string(),
             },
             child: mc_proc,
             rpc_server,
@@ -152,7 +155,7 @@ impl ProcessManager {
 
         let log_path = logs_folder.join(LAUNCHER_LOG_PATH);
 
-        clear_log_buffer(profile_path);
+        clear_log_buffer(instance_id);
 
         {
             let mut log_file = OpenOptions::new()
@@ -170,7 +173,7 @@ impl ProcessManager {
                 now.format("%Y-%m-%d %H:%M:%S")
             )
             .map_err(|e| IOError::with_path(e, &log_path))?;
-            writeln!(log_file, "# Profile: {profile_path} \n")
+            writeln!(log_file, "# Instance: {instance_path} \n")
                 .map_err(|e| IOError::with_path(e, &log_path))?;
             writeln!(log_file).map_err(|e| IOError::with_path(e, &log_path))?;
         }
@@ -178,10 +181,12 @@ impl ProcessManager {
         if let Some(stdout) = stdout {
             let log_path_clone = log_path.clone();
 
-            let profile_path = metadata.profile_path.clone();
+            let instance_id = metadata.instance_id.clone();
+            let instance_path = metadata.instance_path.clone();
             tokio::spawn(async move {
                 Process::process_output(
-                    &profile_path,
+                    &instance_id,
+                    &instance_path,
                     stdout,
                     log_path_clone,
                     xml_logging,
@@ -193,10 +198,12 @@ impl ProcessManager {
         if let Some(stderr) = stderr {
             let log_path_clone = log_path.clone();
 
-            let profile_path = metadata.profile_path.clone();
+            let instance_id = metadata.instance_id.clone();
+            let instance_path = metadata.instance_path.clone();
             tokio::spawn(async move {
                 Process::process_output(
-                    &profile_path,
+                    &instance_id,
+                    &instance_path,
                     stderr,
                     log_path_clone,
                     xml_logging,
@@ -206,7 +213,8 @@ impl ProcessManager {
         }
 
         tokio::spawn(Process::sequential_process_manager(
-            profile_path.to_string(),
+            instance_id.to_string(),
+            instance_path.to_string(),
             post_exit_command,
             metadata.uuid,
         ));
@@ -214,7 +222,7 @@ impl ProcessManager {
         self.processes.insert(process.metadata.uuid, process);
 
         emit_process(
-            profile_path,
+            instance_id,
             metadata.uuid,
             ProcessPayloadType::Launched,
             "Launched Minecraft",
@@ -273,7 +281,9 @@ impl ProcessManager {
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct ProcessMetadata {
     pub uuid: Uuid,
-    pub profile_path: String,
+    pub instance_id: String,
+    pub instance_path: String,
+    pub instance_name: String,
     pub start_time: DateTime<Utc>,
 }
 
@@ -297,7 +307,8 @@ pub struct Log4jEvent {
 
 impl Process {
     async fn process_output<R>(
-        profile_path: &str,
+        instance_id: &str,
+        _instance_path: &str,
         reader: R,
         log_path: impl AsRef<Path>,
         xml_logging: bool,
@@ -423,7 +434,7 @@ impl Process {
                                 }
 
                                 Self::emit_log4j_event(
-                                    profile_path,
+                                    instance_id,
                                     &current_event,
                                 );
                             }
@@ -458,16 +469,16 @@ impl Process {
                                             .unwrap_or("")
                                             .trim();
                                         if let Err(e) = Self::maybe_handle_server_join_logging(
-                                            profile_path,
-                                            &timestamp,
-                                            message,
+											instance_id,
+											&timestamp,
+											message,
                                         ).await {
                                             tracing::error!("Failed to handle server join logging: {e}");
                                         }
                                     }
 
                                     Self::emit_log4j_event(
-                                        profile_path,
+                                        instance_id,
                                         &current_event,
                                     );
                                 }
@@ -494,7 +505,7 @@ impl Process {
                                     e
                                 );
                             }
-                            Self::emit_legacy_log(profile_path, &text);
+                            Self::emit_legacy_log(instance_id, &text);
                         }
                     }
                     Ok(Event::CData(e)) => {
@@ -521,9 +532,9 @@ impl Process {
                     if let Err(e) = Self::append_to_log_file(&log_path, &line) {
                         tracing::warn!("Failed to write to log file: {}", e);
                     }
-                    Self::emit_legacy_log(profile_path, line.trim_ascii_end());
+                    Self::emit_legacy_log(instance_id, line.trim_ascii_end());
                     if let Err(e) = Self::maybe_handle_old_server_join_logging(
-                        profile_path,
+                        instance_id,
                         line.trim_ascii_end(),
                     )
                     .await
@@ -580,13 +591,13 @@ impl Process {
         ))
     }
 
-    fn emit_log4j_event(profile_path: &str, event: &Log4jEvent) {
+    fn emit_log4j_event(instance_id: &str, event: &Log4jEvent) {
         if let Some(formatted) = Self::format_log4j_entry(event) {
-            push_log_line(profile_path, formatted.trim_end().to_string());
+            push_log_line(instance_id, formatted.trim_end().to_string());
         }
         if let Some(ref throwable) = event.throwable {
             for line in throwable.lines().filter(|l| !l.is_empty()) {
-                push_log_line(profile_path, line.to_string());
+                push_log_line(instance_id, line.to_string());
             }
         }
 
@@ -596,7 +607,7 @@ impl Process {
                 let _ = event_state.app.emit(
                     "log",
                     LogPayload {
-                        profile_path_id: profile_path.to_string(),
+                        instance_id: instance_id.to_string(),
                         event: LogEvent::Log4j(event.clone()),
                     },
                 );
@@ -604,12 +615,12 @@ impl Process {
         }
         #[cfg(not(feature = "tauri"))]
         {
-            let _ = (profile_path, event);
+            let _ = (instance_id, event);
         }
     }
 
-    fn emit_legacy_log(profile_path: &str, message: &str) {
-        push_log_line(profile_path, message.to_string());
+    fn emit_legacy_log(instance_id: &str, message: &str) {
+        push_log_line(instance_id, message.to_string());
 
         #[cfg(feature = "tauri")]
         {
@@ -617,7 +628,7 @@ impl Process {
                 let _ = event_state.app.emit(
                     "log",
                     LogPayload {
-                        profile_path_id: profile_path.to_string(),
+                        instance_id: instance_id.to_string(),
                         event: LogEvent::Legacy {
                             message: message.to_string(),
                         },
@@ -627,7 +638,7 @@ impl Process {
         }
         #[cfg(not(feature = "tauri"))]
         {
-            let _ = (profile_path, message);
+            let _ = (instance_id, message);
         }
     }
 
@@ -643,7 +654,7 @@ impl Process {
     }
 
     async fn maybe_handle_server_join_logging(
-        profile_path: &str,
+        instance_id: &str,
         timestamp: &str,
         message: &str,
     ) -> crate::Result<()> {
@@ -662,12 +673,12 @@ impl Process {
                     )
                 })
             })?;
-        Self::parse_and_insert_server_join(profile_path, message, timestamp)
+        Self::parse_and_insert_server_join(instance_id, message, timestamp)
             .await
     }
 
     async fn maybe_handle_old_server_join_logging(
-        profile_path: &str,
+        instance_id: &str,
         line: &str,
     ) -> crate::Result<()> {
         if let Some((timestamp, message)) = line.split_once(" [CLIENT] [INFO] ")
@@ -678,16 +689,16 @@ impl Process {
                     .map(|x| x.to_utc())
                     .single()
                     .unwrap_or_else(Utc::now);
-            Self::parse_and_insert_server_join(profile_path, message, timestamp)
+            Self::parse_and_insert_server_join(instance_id, message, timestamp)
                 .await
         } else {
-            Self::parse_and_insert_server_join(profile_path, line, Utc::now())
+            Self::parse_and_insert_server_join(instance_id, line, Utc::now())
                 .await
         }
     }
 
     async fn parse_and_insert_server_join(
-        profile_path: &str,
+        instance_id: &str,
         message: &str,
         timestamp: DateTime<Utc>,
     ) -> crate::Result<()> {
@@ -705,7 +716,7 @@ impl Process {
 
         let state = crate::State::get().await?;
         crate::state::server_join_log::JoinLogEntry {
-            profile_path: profile_path.to_owned(),
+            instance_id: instance_id.to_owned(),
             host: host.to_string(),
             port,
             join_time: timestamp,
@@ -713,12 +724,12 @@ impl Process {
         .upsert(&state.pool)
         .await?;
         {
-            let profile_path = profile_path.to_owned();
+            let instance_id = instance_id.to_owned();
             let host = host.to_owned();
             tokio::spawn(async move {
-                let _ = emit_profile(
-                    &profile_path,
-                    ProfilePayloadType::ServerJoined {
+                let _ = emit_instance(
+                    &instance_id,
+                    InstancePayloadType::ServerJoined {
                         host,
                         port,
                         timestamp,
@@ -735,28 +746,42 @@ impl Process {
     // Also, as the process ends, it spawns the follow-up process if it exists
     // By convention, ExitStatus is last command's exit status, and we exit on the first non-zero exit status
     async fn sequential_process_manager(
-        profile_path: String,
+        instance_id: String,
+        instance_path: String,
         post_exit_command: Option<String>,
         uuid: Uuid,
     ) -> crate::Result<()> {
         async fn update_playtime(
             last_updated_playtime: &mut DateTime<Utc>,
-            profile_path: &str,
+            instance_id: &str,
             force_update: bool,
         ) {
             let diff = Utc::now()
                 .signed_duration_since(*last_updated_playtime)
                 .num_seconds();
             if diff >= 60 || force_update {
-                if let Err(e) = profile::edit(profile_path, |prof| {
-                    prof.recent_time_played += diff as u64;
-                    async { Ok(()) }
-                })
-                .await
+                let state = match crate::State::get().await {
+                    Ok(state) => state,
+                    Err(e) => {
+                        tracing::warn!(
+                            "Failed to get state for playtime update on instance {}: {}",
+                            instance_id,
+                            e
+                        );
+                        return;
+                    }
+                };
+                if let Err(e) =
+					crate::state::instances::commands::add_instance_recent_playtime(
+                        instance_id,
+                        diff as u64,
+                        &state.pool,
+                    )
+                    .await
                 {
                     tracing::warn!(
-                        "Failed to update playtime for profile {}: {}",
-                        &profile_path,
+                        "Failed to update playtime for instance {}: {}",
+                        instance_id,
                         e
                     );
                 }
@@ -784,13 +809,13 @@ impl Process {
             tokio::time::sleep(tokio::time::Duration::from_millis(50)).await;
 
             // Auto-update playtime every minute
-            update_playtime(&mut last_updated_playtime, &profile_path, false)
+            update_playtime(&mut last_updated_playtime, &instance_id, false)
                 .await;
         }
 
         state.process_manager.remove(uuid);
         emit_process(
-            &profile_path,
+            &instance_id,
             uuid,
             ProcessPayloadType::Finished,
             "Exited process",
@@ -798,23 +823,28 @@ impl Process {
         .await?;
 
         // Now fully complete- update playtime one last time
-        update_playtime(&mut last_updated_playtime, &profile_path, true).await;
+        update_playtime(&mut last_updated_playtime, &instance_id, true).await;
 
         // Publish play time update
         // Allow failure, it will be stored locally and sent next time
         // Sent in another thread as first call may take a couple seconds and hold up process ending
-        let profile = profile_path.clone();
+        let playtime_instance_id = instance_id.clone();
         tokio::spawn(async move {
-            if let Err(e) = profile::try_update_playtime(&profile).await {
+            if let Err(e) =
+                crate::api::instance::try_update_playtime_by_instance_id(
+                    &playtime_instance_id,
+                )
+                .await
+            {
                 tracing::warn!(
-                    "Failed to update playtime for profile {}: {}",
-                    profile,
+                    "Failed to update playtime for instance {}: {}",
+                    playtime_instance_id,
                     e
                 );
             }
         });
 
-        let logs_folder = state.directories.profile_logs_dir(&profile_path);
+        let logs_folder = state.directories.instance_logs_dir(&instance_path);
         let log_path = logs_folder.join(LAUNCHER_LOG_PATH);
 
         if log_path.exists()
@@ -855,7 +885,7 @@ impl Process {
                 if let Some(command) = cmd.next() {
                     let mut command = Command::new(command);
                     command.args(cmd).current_dir(
-                        profile::get_full_path(&profile_path).await?,
+                        state.directories.instances_dir().join(&instance_path),
                     );
                     command.spawn().map_err(IOError::from)?;
                 }
diff --git a/packages/app-lib/src/state/profiles.rs b/packages/app-lib/src/state/profiles.rs
deleted file mode 100644
index c30412af22..0000000000
--- a/packages/app-lib/src/state/profiles.rs
+++ /dev/null
@@ -1,1734 +0,0 @@
-use super::settings::{Hooks, MemorySettings, WindowSize};
-use crate::profile::get_full_path;
-use crate::state::server_join_log::JoinLogEntry;
-use crate::state::{
-    CacheBehaviour, CachedEntry, CachedFile, CachedFileHash, KnownModrinthFile,
-    ReleaseChannel, Version, cache_file_hash,
-};
-use crate::util;
-use crate::util::fetch::{FetchSemaphore, IoSemaphore, write_cached_icon};
-use crate::util::io::{self};
-use chrono::{DateTime, TimeDelta, TimeZone, Utc};
-use dashmap::DashMap;
-use regex::Regex;
-use serde::{Deserialize, Serialize};
-use sqlx::SqlitePool;
-use std::collections::{HashMap, HashSet};
-use std::convert::TryFrom;
-use std::convert::TryInto;
-use std::path::Path;
-use std::sync::LazyLock;
-use tokio::fs::DirEntry;
-use tokio::io::{AsyncBufReadExt, AsyncRead};
-use tokio::task::JoinSet;
-
-// Represent a Minecraft instance.
-#[derive(Serialize, Deserialize, Clone, Debug)]
-pub struct Profile {
-    pub path: String,
-    pub install_stage: ProfileInstallStage,
-    pub launcher_feature_version: LauncherFeatureVersion,
-
-    pub name: String,
-    pub icon_path: Option<String>,
-
-    pub game_version: String,
-    pub protocol_version: Option<u32>,
-    pub loader: ModLoader,
-    pub loader_version: Option<String>,
-
-    pub groups: Vec<String>,
-
-    pub linked_data: Option<LinkedData>,
-    pub preferred_update_channel: ReleaseChannel,
-
-    pub created: DateTime<Utc>,
-    pub modified: DateTime<Utc>,
-    pub last_played: Option<DateTime<Utc>>,
-
-    pub submitted_time_played: u64,
-    pub recent_time_played: u64,
-
-    pub java_path: Option<String>,
-    pub extra_launch_args: Option<Vec<String>>,
-    pub custom_env_vars: Option<Vec<(String, String)>>,
-
-    pub memory: Option<MemorySettings>,
-    pub force_fullscreen: Option<bool>,
-    pub game_resolution: Option<WindowSize>,
-    pub hooks: Hooks,
-}
-
-#[derive(Serialize, Deserialize, Clone, Copy, Debug, Eq, PartialEq)]
-#[serde(rename_all = "snake_case")]
-pub enum ProfileInstallStage {
-    /// Profile is installed
-    Installed,
-    /// Profile's minecraft game is still installing
-    MinecraftInstalling,
-    /// Pack is installed, but Minecraft installation has not begun
-    PackInstalled,
-    /// Profile created for pack, but the pack hasn't been fully installed yet
-    PackInstalling,
-    /// Profile is not installed
-    NotInstalled,
-}
-
-impl ProfileInstallStage {
-    pub fn as_str(&self) -> &'static str {
-        match *self {
-            Self::Installed => "installed",
-            Self::MinecraftInstalling => "minecraft_installing",
-            Self::PackInstalled => "pack_installed",
-            Self::PackInstalling => "pack_installing",
-            Self::NotInstalled => "not_installed",
-        }
-    }
-
-    pub fn from_str(val: &str) -> Self {
-        match val {
-            "installed" => Self::Installed,
-            "minecraft_installing" => Self::MinecraftInstalling,
-            "installing" => Self::MinecraftInstalling, // Backwards compatibility
-            "pack_installed" => Self::PackInstalled,
-            "pack_installing" => Self::PackInstalling,
-            "not_installed" => Self::NotInstalled,
-            _ => Self::NotInstalled,
-        }
-    }
-}
-
-#[derive(
-    Serialize, Deserialize, Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum LauncherFeatureVersion {
-    None,
-    MigratedServerLastPlayTime,
-    MigratedLaunchHooks,
-}
-
-impl LauncherFeatureVersion {
-    pub const MOST_RECENT: Self = Self::MigratedLaunchHooks;
-
-    pub fn as_str(&self) -> &'static str {
-        match *self {
-            Self::None => "none",
-            Self::MigratedServerLastPlayTime => {
-                "migrated_server_last_play_time"
-            }
-            Self::MigratedLaunchHooks => "migrated_launch_hooks",
-        }
-    }
-
-    pub fn from_str(val: &str) -> Self {
-        match val {
-            "none" => Self::None,
-            "migrated_server_last_play_time" => {
-                Self::MigratedServerLastPlayTime
-            }
-            "migrated_launch_hooks" => Self::MigratedLaunchHooks,
-            _ => Self::None,
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug)]
-pub struct LinkedData {
-    pub project_id: String,
-    pub version_id: String,
-
-    pub locked: bool,
-}
-
-#[derive(Debug, Eq, PartialEq, Clone, Copy, Deserialize, Serialize)]
-#[serde(rename_all = "lowercase")]
-pub enum ModLoader {
-    Vanilla,
-    Forge,
-    Fabric,
-    Quilt,
-    NeoForge,
-}
-
-impl ModLoader {
-    pub fn as_str(&self) -> &'static str {
-        match *self {
-            Self::Vanilla => "vanilla",
-            Self::Forge => "forge",
-            Self::Fabric => "fabric",
-            Self::Quilt => "quilt",
-            Self::NeoForge => "neoforge",
-        }
-    }
-
-    pub fn as_meta_str(&self) -> &'static str {
-        match *self {
-            Self::Vanilla => "vanilla",
-            Self::Forge => "forge",
-            Self::Fabric => "fabric",
-            Self::Quilt => "quilt",
-            Self::NeoForge => "neo",
-        }
-    }
-
-    pub fn from_string(val: &str) -> Self {
-        match val {
-            "vanilla" => Self::Vanilla,
-            "forge" => Self::Forge,
-            "fabric" => Self::Fabric,
-            "quilt" => Self::Quilt,
-            "neoforge" => Self::NeoForge,
-            _ => Self::Vanilla,
-        }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct ProfileFile {
-    pub hash: String,
-    pub file_name: String,
-    pub size: u64,
-    pub metadata: Option<FileMetadata>,
-    pub update_version_id: Option<String>,
-    pub project_type: ProjectType,
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct FileMetadata {
-    pub project_id: String,
-    pub version_id: String,
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, Copy, PartialEq, Eq)]
-#[serde(rename_all = "lowercase")]
-pub enum ProjectType {
-    Mod,
-    DataPack,
-    ResourcePack,
-    ShaderPack,
-}
-
-impl ProjectType {
-    pub fn get_from_loaders(loaders: Vec<String>) -> Option<Self> {
-        if loaders
-            .iter()
-            .any(|x| ["fabric", "forge", "quilt", "neoforge"].contains(&&**x))
-        {
-            Some(ProjectType::Mod)
-        } else if loaders.iter().any(|x| x == "datapack") {
-            Some(ProjectType::DataPack)
-        } else if loaders.iter().any(|x| ["iris", "optifine"].contains(&&**x)) {
-            Some(ProjectType::ShaderPack)
-        } else if loaders
-            .iter()
-            .any(|x| ["vanilla", "canvas", "minecraft"].contains(&&**x))
-        {
-            Some(ProjectType::ResourcePack)
-        } else {
-            None
-        }
-    }
-
-    pub fn get_from_parent_folder(path: impl AsRef<Path>) -> Option<Self> {
-        match path
-            .as_ref()
-            .parent()?
-            .file_name()?
-            .to_str()
-            .unwrap_or_default()
-        {
-            "mods" => Some(ProjectType::Mod),
-            "datapacks" => Some(ProjectType::DataPack),
-            "resourcepacks" => Some(ProjectType::ResourcePack),
-            "shaderpacks" => Some(ProjectType::ShaderPack),
-            _ => None,
-        }
-    }
-
-    pub fn get_name(&self) -> &'static str {
-        match self {
-            ProjectType::Mod => "mod",
-            ProjectType::DataPack => "datapack",
-            ProjectType::ResourcePack => "resourcepack",
-            ProjectType::ShaderPack => "shader",
-        }
-    }
-
-    pub fn get_folder(&self) -> &'static str {
-        match self {
-            ProjectType::Mod => "mods",
-            ProjectType::DataPack => "datapacks",
-            ProjectType::ResourcePack => "resourcepacks",
-            ProjectType::ShaderPack => "shaderpacks",
-        }
-    }
-
-    pub fn get_loaders(&self) -> &'static [&'static str] {
-        match self {
-            ProjectType::Mod => &["fabric", "forge", "quilt", "neoforge"],
-            ProjectType::DataPack => &["datapack"],
-            ProjectType::ResourcePack => &["vanilla", "canvas", "minecraft"],
-            ProjectType::ShaderPack => &["iris", "optifine"],
-        }
-    }
-
-    pub fn iterator() -> impl Iterator<Item = ProjectType> {
-        [
-            ProjectType::Mod,
-            ProjectType::DataPack,
-            ProjectType::ResourcePack,
-            ProjectType::ShaderPack,
-        ]
-        .iter()
-        .copied()
-    }
-}
-
-struct ProfileQueryResult {
-    path: String,
-    install_stage: String,
-    name: String,
-    icon_path: Option<String>,
-    game_version: String,
-    mod_loader: String,
-    mod_loader_version: Option<String>,
-    groups: serde_json::Value,
-    linked_project_id: Option<String>,
-    linked_version_id: Option<String>,
-    locked: Option<i64>,
-    preferred_update_channel: String,
-    created: i64,
-    modified: i64,
-    last_played: Option<i64>,
-    submitted_time_played: i64,
-    recent_time_played: i64,
-    override_java_path: Option<String>,
-    override_extra_launch_args: serde_json::Value,
-    override_custom_env_vars: serde_json::Value,
-    override_mc_memory_max: Option<i64>,
-    override_mc_force_fullscreen: Option<i64>,
-    override_mc_game_resolution_x: Option<i64>,
-    override_mc_game_resolution_y: Option<i64>,
-    override_hook_pre_launch: Option<String>,
-    override_hook_wrapper: Option<String>,
-    override_hook_post_exit: Option<String>,
-    protocol_version: Option<i64>,
-    launcher_feature_version: String,
-}
-
-impl TryFrom<ProfileQueryResult> for Profile {
-    type Error = crate::Error;
-
-    fn try_from(x: ProfileQueryResult) -> Result<Self, Self::Error> {
-        Ok(Profile {
-            path: x.path,
-            install_stage: ProfileInstallStage::from_str(&x.install_stage),
-            launcher_feature_version: LauncherFeatureVersion::from_str(
-                &x.launcher_feature_version,
-            ),
-            name: x.name,
-            icon_path: x.icon_path,
-            game_version: x.game_version,
-            protocol_version: x.protocol_version.map(|x| x as u32),
-            loader: ModLoader::from_string(&x.mod_loader),
-            loader_version: x.mod_loader_version,
-            groups: serde_json::from_value(x.groups).unwrap_or_default(),
-            linked_data: if let Some(project_id) = x.linked_project_id {
-                if let Some(version_id) = x.linked_version_id {
-                    x.locked.map(|locked| LinkedData {
-                        project_id,
-                        version_id,
-                        locked: locked == 1,
-                    })
-                } else {
-                    None
-                }
-            } else {
-                None
-            },
-            preferred_update_channel: ReleaseChannel::from_key(
-                &x.preferred_update_channel,
-            ),
-            created: Utc
-                .timestamp_opt(x.created, 0)
-                .single()
-                .unwrap_or_else(Utc::now),
-            modified: Utc
-                .timestamp_opt(x.modified, 0)
-                .single()
-                .unwrap_or_else(Utc::now),
-            last_played: x
-                .last_played
-                .and_then(|x| Utc.timestamp_opt(x, 0).single()),
-            submitted_time_played: x.submitted_time_played as u64,
-            recent_time_played: x.recent_time_played as u64,
-            java_path: x.override_java_path,
-            extra_launch_args: serde_json::from_value(
-                x.override_extra_launch_args,
-            )
-            .ok(),
-            custom_env_vars: serde_json::from_value(x.override_custom_env_vars)
-                .ok(),
-            memory: x
-                .override_mc_memory_max
-                .map(|x| MemorySettings { maximum: x as u32 }),
-            force_fullscreen: x.override_mc_force_fullscreen.map(|x| x == 1),
-            game_resolution: if let Some(x_res) =
-                x.override_mc_game_resolution_x
-            {
-                x.override_mc_game_resolution_y
-                    .map(|y_res| WindowSize(x_res as u16, y_res as u16))
-            } else {
-                None
-            },
-            hooks: Hooks {
-                pre_launch: x.override_hook_pre_launch,
-                wrapper: x.override_hook_wrapper,
-                post_exit: x.override_hook_post_exit,
-            },
-        })
-    }
-}
-
-macro_rules! select_profiles_with_predicate {
-    ($predicate:tt, $param:ident) => {
-        sqlx::query_as!(
-            ProfileQueryResult,
-            r#"
-            SELECT
-                path, install_stage, launcher_feature_version, name, icon_path,
-                game_version, protocol_version, mod_loader, mod_loader_version,
-                json(groups) as "groups!: serde_json::Value",
-                linked_project_id, linked_version_id, locked, preferred_update_channel,
-                created, modified, last_played,
-                submitted_time_played, recent_time_played,
-                override_java_path,
-                json(override_extra_launch_args) as "override_extra_launch_args!: serde_json::Value", json(override_custom_env_vars) as "override_custom_env_vars!: serde_json::Value",
-                override_mc_memory_max, override_mc_force_fullscreen, override_mc_game_resolution_x, override_mc_game_resolution_y,
-                override_hook_pre_launch, override_hook_wrapper, override_hook_post_exit
-            FROM profiles
-            "#
-                + $predicate,
-            $param
-        )
-    };
-}
-
-struct InitialScanFile {
-    path: String,
-    file_name: String,
-    project_type: ProjectType,
-    size: u64,
-    cache_key: String,
-}
-
-fn is_scannable_project_file(
-    project_type: ProjectType,
-    file_name: &str,
-) -> bool {
-    let Some(extension) = Path::new(file_name.trim_end_matches(".disabled"))
-        .extension()
-        .and_then(|ext| ext.to_str())
-    else {
-        return false;
-    };
-
-    match project_type {
-        ProjectType::Mod => extension.eq_ignore_ascii_case("jar"),
-        ProjectType::DataPack
-        | ProjectType::ResourcePack
-        | ProjectType::ShaderPack => extension.eq_ignore_ascii_case("zip"),
-    }
-}
-
-impl Profile {
-    pub async fn get(
-        path: &str,
-        exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
-    ) -> crate::Result<Option<Self>> {
-        Ok(Self::get_many(&[path], exec).await?.into_iter().next())
-    }
-
-    pub async fn get_many(
-        paths: &[&str],
-        exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
-    ) -> crate::Result<Vec<Self>> {
-        let ids = serde_json::to_string(&paths)?;
-        let results = select_profiles_with_predicate!(
-            "WHERE path IN (SELECT value FROM json_each($1))",
-            ids
-        )
-        .fetch_all(exec)
-        .await?;
-
-        results
-            .into_iter()
-            .map(|r| r.try_into())
-            .collect::<crate::Result<Vec<_>>>()
-    }
-
-    pub async fn get_all(
-        exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
-    ) -> crate::Result<Vec<Self>> {
-        let true_val = 1;
-        let results = select_profiles_with_predicate!("WHERE 1=$1", true_val)
-            .fetch_all(exec)
-            .await?;
-
-        results
-            .into_iter()
-            .map(|r| r.try_into())
-            .collect::<crate::Result<Vec<_>>>()
-    }
-
-    pub async fn upsert(
-        &self,
-        exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
-    ) -> crate::Result<()> {
-        let install_stage = self.install_stage.as_str();
-        let launcher_feature_version = self.launcher_feature_version.as_str();
-
-        let mod_loader = self.loader.as_str();
-
-        let groups = serde_json::to_string(&self.groups)?;
-
-        let linked_data_project_id =
-            self.linked_data.as_ref().map(|x| x.project_id.clone());
-        let linked_data_version_id =
-            self.linked_data.as_ref().map(|x| x.version_id.clone());
-        let linked_data_locked = self.linked_data.as_ref().map(|x| x.locked);
-        let preferred_update_channel = self.preferred_update_channel.key();
-
-        let created = self.created.timestamp();
-        let modified = self.modified.timestamp();
-        let last_played = self.last_played.map(|x| x.timestamp());
-
-        let submitted_time_played = self.submitted_time_played as i64;
-        let recent_time_played = self.recent_time_played as i64;
-
-        let memory_max = self.memory.map(|x| x.maximum);
-
-        let game_resolution_x = self.game_resolution.map(|x| x.0);
-        let game_resolution_y = self.game_resolution.map(|x| x.1);
-
-        let extra_launch_args = serde_json::to_string(&self.extra_launch_args)?;
-        let custom_env_vars = serde_json::to_string(&self.custom_env_vars)?;
-
-        sqlx::query!(
-            "
-            INSERT INTO profiles (
-                path, install_stage, name, icon_path,
-                game_version, mod_loader, mod_loader_version,
-                groups,
-                linked_project_id, linked_version_id, locked, preferred_update_channel,
-                created, modified, last_played,
-                submitted_time_played, recent_time_played,
-                override_java_path, override_extra_launch_args, override_custom_env_vars,
-                override_mc_memory_max, override_mc_force_fullscreen, override_mc_game_resolution_x, override_mc_game_resolution_y,
-                override_hook_pre_launch, override_hook_wrapper, override_hook_post_exit,
-                protocol_version, launcher_feature_version
-            )
-            VALUES (
-                $1, $2, $3, $4,
-                $5, $6, $7,
-                jsonb($8),
-                $9, $10, $11, $12,
-                $13, $14, $15,
-                $16, $17,
-                $18, jsonb($19), jsonb($20),
-                $21, $22, $23, $24,
-                $25, $26, $27,
-                $28, $29
-            )
-            ON CONFLICT (path) DO UPDATE SET
-                install_stage = $2,
-                name = $3,
-                icon_path = $4,
-
-                game_version = $5,
-                mod_loader = $6,
-                mod_loader_version = $7,
-
-                groups = jsonb($8),
-
-                linked_project_id = $9,
-                linked_version_id = $10,
-                locked = $11,
-                preferred_update_channel = $12,
-
-                created = $13,
-                modified = $14,
-                last_played = $15,
-
-                submitted_time_played = $16,
-                recent_time_played = $17,
-
-                override_java_path = $18,
-                override_extra_launch_args = jsonb($19),
-                override_custom_env_vars = jsonb($20),
-                override_mc_memory_max = $21,
-                override_mc_force_fullscreen = $22,
-                override_mc_game_resolution_x = $23,
-                override_mc_game_resolution_y = $24,
-
-                override_hook_pre_launch = $25,
-                override_hook_wrapper = $26,
-                override_hook_post_exit = $27,
-
-                protocol_version = $28,
-                launcher_feature_version = $29
-            ",
-            self.path,
-            install_stage,
-            self.name,
-            self.icon_path,
-            self.game_version,
-            mod_loader,
-            self.loader_version,
-            groups,
-            linked_data_project_id,
-            linked_data_version_id,
-            linked_data_locked,
-            preferred_update_channel,
-            created,
-            modified,
-            last_played,
-            submitted_time_played,
-            recent_time_played,
-            self.java_path,
-            extra_launch_args,
-            custom_env_vars,
-            memory_max,
-            self.force_fullscreen,
-            game_resolution_x,
-            game_resolution_y,
-            self.hooks.pre_launch,
-            self.hooks.wrapper,
-            self.hooks.post_exit,
-            self.protocol_version,
-            launcher_feature_version
-        )
-            .execute(exec)
-            .await?;
-
-        Ok(())
-    }
-
-    pub async fn remove(
-        profile_path: &str,
-        pool: &SqlitePool,
-    ) -> crate::Result<()> {
-        sqlx::query!(
-            "
-            DELETE FROM profiles
-            WHERE path = $1
-            ",
-            profile_path
-        )
-        .execute(pool)
-        .await?;
-
-        if let Ok(path) = crate::api::profile::get_full_path(profile_path).await
-        {
-            io::remove_dir_all(&path).await?;
-        }
-
-        Ok(())
-    }
-
-    #[tracing::instrument(skip(self, semaphore, icon))]
-    pub async fn set_icon(
-        &mut self,
-        cache_dir: &Path,
-        semaphore: &IoSemaphore,
-        icon: bytes::Bytes,
-        file_name: &str,
-    ) -> crate::Result<()> {
-        let file =
-            write_cached_icon(file_name, cache_dir, icon, semaphore).await?;
-        self.icon_path = Some(file.to_string_lossy().to_string());
-        self.modified = Utc::now();
-        Ok(())
-    }
-
-    pub(crate) async fn refresh_all() -> crate::Result<()> {
-        let state = crate::State::get().await?;
-        let mut all = Self::get_all(&state.pool).await?;
-
-        let mut keys = vec![];
-        let mut migrations = JoinSet::new();
-
-        for profile in &mut all {
-            let path = get_full_path(&profile.path).await?;
-
-            for project_type in ProjectType::iterator() {
-                let folder = project_type.get_folder();
-                let path = path.join(folder);
-
-                if path.exists() {
-                    for subdirectory in std::fs::read_dir(&path)
-                        .map_err(|e| io::IOError::with_path(e, &path))?
-                    {
-                        let subdirectory =
-                            subdirectory.map_err(io::IOError::from)?.path();
-                        if subdirectory.is_file()
-                            && let Some(file_name) = subdirectory
-                                .file_name()
-                                .and_then(|x| x.to_str())
-                            && is_scannable_project_file(
-                                project_type,
-                                file_name,
-                            )
-                        {
-                            let file_size = subdirectory
-                                .metadata()
-                                .map_err(io::IOError::from)?
-                                .len();
-
-                            keys.push(format!(
-                                "{file_size}-{}/{folder}/{file_name}",
-                                profile.path
-                            ));
-                        }
-                    }
-                }
-            }
-
-            if profile.install_stage == ProfileInstallStage::MinecraftInstalling
-            {
-                profile.install_stage = ProfileInstallStage::PackInstalled;
-                profile.upsert(&state.pool).await?;
-            } else if profile.install_stage
-                == ProfileInstallStage::PackInstalling
-            {
-                profile.install_stage = ProfileInstallStage::NotInstalled;
-                profile.upsert(&state.pool).await?;
-            }
-
-            if profile.launcher_feature_version
-                < LauncherFeatureVersion::MOST_RECENT
-            {
-                let state = state.clone();
-                let profile_path = profile.path.clone();
-                migrations.spawn(async move {
-                    let Ok(Some(mut profile)) = Self::get(&profile_path, &state.pool).await else {
-                        tracing::error!("Failed to find instance '{}' for migration", profile_path);
-                        return;
-                    };
-                    drop(profile_path);
-
-                    tracing::info!(
-                        "Migrating profile '{}' from launcher feature version {:?} to {:?}",
-                        profile.path, profile.launcher_feature_version, LauncherFeatureVersion::MOST_RECENT
-                    );
-                    loop {
-                        let result = profile.perform_launcher_feature_migration(&state).await;
-                        if result.is_err() || profile.launcher_feature_version == LauncherFeatureVersion::MOST_RECENT {
-                            if let Err(err) = result {
-                                tracing::error!("Failed to migrate instance '{}': {}", profile.path, err);
-                                return;
-                            }
-                            if let Err(err) = profile.upsert(&state.pool).await {
-                                tracing::error!("Failed to update instance '{}' migration state: {}", profile.path, err);
-                                return;
-                            }
-                            break;
-                        }
-                    }
-                    tracing::info!("Finished migration for profile '{}'", profile.path);
-                });
-            }
-        }
-        migrations.join_all().await;
-
-        let file_hashes = CachedEntry::get_file_hash_many(
-            &keys.iter().map(|s| &**s).collect::<Vec<_>>(),
-            None,
-            &state.pool,
-            &state.fetch_semaphore,
-        )
-        .await?;
-
-        let file_updates = file_hashes
-            .iter()
-            .filter_map(|file| {
-                all.iter().find(|prof| file.path.contains(&prof.path)).map(
-                    |profile| {
-                        Self::get_cache_key(
-                            file,
-                            profile,
-                            profile.preferred_update_channel,
-                        )
-                    },
-                )
-            })
-            .collect::<Vec<_>>();
-
-        let file_hashes_ref =
-            file_hashes.iter().map(|x| &*x.hash).collect::<Vec<_>>();
-        let file_updates_ref =
-            file_updates.iter().map(|x| &**x).collect::<Vec<_>>();
-        tokio::try_join!(
-            CachedEntry::get_file_many(
-                &file_hashes_ref,
-                Some(CacheBehaviour::MustRevalidate),
-                &state.pool,
-                &state.fetch_semaphore,
-            ),
-            CachedEntry::get_file_update_many(
-                &file_updates_ref,
-                Some(CacheBehaviour::MustRevalidate),
-                &state.pool,
-                &state.fetch_semaphore,
-            )
-        )?;
-
-        Ok(())
-    }
-
-    async fn perform_launcher_feature_migration(
-        &mut self,
-        state: &crate::State,
-    ) -> crate::Result<()> {
-        match self.launcher_feature_version {
-            LauncherFeatureVersion::None => {
-                if self.last_played.is_none() {
-                    self.launcher_feature_version =
-                        LauncherFeatureVersion::MigratedServerLastPlayTime;
-                    return Ok(());
-                }
-                let mut join_log_entry = JoinLogEntry {
-                    profile_path: self.path.clone(),
-                    ..Default::default()
-                };
-                let logs_path = state.directories.profile_logs_dir(&self.path);
-                let Ok(mut directory) = io::read_dir(&logs_path).await else {
-                    self.launcher_feature_version =
-                        LauncherFeatureVersion::MigratedServerLastPlayTime;
-                    return Ok(());
-                };
-                let existing_joins_map =
-                    super::server_join_log::get_joins(&self.path, &state.pool)
-                        .await?;
-                let existing_joins = existing_joins_map
-                    .keys()
-                    .map(|x| (&x.0 as &str, x.1))
-                    .collect::<HashSet<_>>();
-                while let Some(log_file) = directory.next_entry().await? {
-                    if let Err(err) = Self::parse_log_file(
-                        &log_file,
-                        |host, port| existing_joins.contains(&(host, port)),
-                        state,
-                        &mut join_log_entry,
-                    )
-                    .await
-                    {
-                        tracing::error!(
-                            "Failed to parse log file '{}': {}",
-                            log_file.path().display(),
-                            err
-                        );
-                    }
-                }
-                self.launcher_feature_version =
-                    LauncherFeatureVersion::MigratedServerLastPlayTime;
-            }
-            LauncherFeatureVersion::MigratedServerLastPlayTime => {
-                let quoter = shlex::Quoter::new().allow_nul(true);
-
-                // Previously split by spaces
-                if let Some(pre_launch) = self.hooks.pre_launch.as_ref() {
-                    self.hooks.pre_launch =
-                        Some(quoter.join(pre_launch.split(' ')).unwrap())
-                }
-
-                // Previously treated as complete path to command
-                if let Some(wrapper) = self.hooks.wrapper.as_ref() {
-                    self.hooks.wrapper =
-                        Some(quoter.quote(wrapper).unwrap().to_string())
-                }
-
-                // Previously split by spaces
-                if let Some(post_exit) = self.hooks.post_exit.as_ref() {
-                    self.hooks.post_exit =
-                        Some(quoter.join(post_exit.split(' ')).unwrap())
-                }
-
-                self.launcher_feature_version =
-                    LauncherFeatureVersion::MigratedLaunchHooks;
-            }
-            LauncherFeatureVersion::MOST_RECENT => unreachable!(
-                "LauncherFeatureVersion::MOST_RECENT was not updated"
-            ),
-        }
-        Ok(())
-    }
-
-    // Parses a log file on a best-effort basis, using the log's creation time, rather than the
-    // actual times mentioned in the log file, which are missing date information.
-    async fn parse_log_file(
-        log_file: &DirEntry,
-        should_skip: impl Fn(&str, u16) -> bool,
-        state: &crate::State,
-        join_entry: &mut JoinLogEntry,
-    ) -> crate::Result<()> {
-        let file_name = log_file.file_name();
-        let Some(file_name) = file_name.to_str() else {
-            return Ok(());
-        };
-        let log_time = io::metadata(&log_file.path()).await?.created()?.into();
-        if file_name == "latest.log" {
-            let file = io::open_file(&log_file.path()).await?;
-            Self::parse_open_log_file(
-                file,
-                should_skip,
-                log_time,
-                state,
-                join_entry,
-            )
-            .await
-        } else if file_name.ends_with(".log.gz") {
-            let file = io::open_file(&log_file.path()).await?;
-            let file = tokio::io::BufReader::new(file);
-            let file =
-                async_compression::tokio::bufread::GzipDecoder::new(file);
-            Self::parse_open_log_file(
-                file,
-                should_skip,
-                log_time,
-                state,
-                join_entry,
-            )
-            .await
-        } else {
-            Ok(())
-        }
-    }
-
-    async fn parse_open_log_file(
-        reader: impl AsyncRead + Unpin,
-        should_skip: impl Fn(&str, u16) -> bool,
-        mut log_time: DateTime<Utc>,
-        state: &crate::State,
-        join_entry: &mut JoinLogEntry,
-    ) -> crate::Result<()> {
-        static LOG_LINE_REGEX: LazyLock<Regex> = LazyLock::new(|| {
-            Regex::new(r"^\[[0-9]{2}(?::[0-9]{2}){2}] \[.+?/[A-Z]+?]: Connecting to (.+?), ([1-9][0-9]{0,4})$").unwrap()
-        });
-        let reader = tokio::io::BufReader::new(reader);
-        let mut lines = reader.lines();
-        while let Some(log_line) = lines.next_line().await? {
-            let Some(log_line) = LOG_LINE_REGEX.captures(&log_line) else {
-                continue;
-            };
-
-            let Some(host) = log_line.get(1) else {
-                continue;
-            };
-            let host = host.as_str();
-
-            let Some(port) = log_line.get(2) else {
-                continue;
-            };
-            let Ok(port) = port.as_str().parse::<u16>() else {
-                continue;
-            };
-
-            if should_skip(host, port) {
-                continue;
-            }
-
-            join_entry.host = host.to_string();
-            join_entry.port = port;
-            join_entry.join_time = log_time;
-            join_entry.upsert(&state.pool).await?;
-
-            log_time += TimeDelta::seconds(1);
-        }
-        Ok(())
-    }
-
-    pub async fn get_projects(
-        &self,
-        cache_behaviour: Option<CacheBehaviour>,
-        pool: &SqlitePool,
-        fetch_semaphore: &FetchSemaphore,
-    ) -> crate::Result<DashMap<String, ProfileFile>> {
-        self.get_projects_inner(
-            cache_behaviour,
-            pool,
-            fetch_semaphore,
-            None,
-            None,
-        )
-        .await
-    }
-
-    pub async fn get_projects_excluding_modpack_files(
-        &self,
-        excluded_hashes: &HashSet<String>,
-        excluded_project_ids: &HashSet<String>,
-        cache_behaviour: Option<CacheBehaviour>,
-        pool: &SqlitePool,
-        fetch_semaphore: &FetchSemaphore,
-    ) -> crate::Result<DashMap<String, ProfileFile>> {
-        self.get_projects_inner(
-            cache_behaviour,
-            pool,
-            fetch_semaphore,
-            Some(excluded_hashes),
-            Some(excluded_project_ids),
-        )
-        .await
-    }
-
-    async fn get_projects_inner(
-        &self,
-        cache_behaviour: Option<CacheBehaviour>,
-        pool: &SqlitePool,
-        fetch_semaphore: &FetchSemaphore,
-        excluded_hashes: Option<&HashSet<String>>,
-        excluded_project_ids: Option<&HashSet<String>>,
-    ) -> crate::Result<DashMap<String, ProfileFile>> {
-        let (keys, file_hashes) =
-            self.scan_and_hash(pool, fetch_semaphore).await?;
-
-        let excluded_hashes = excluded_hashes.filter(|ids| !ids.is_empty());
-        let excluded_project_ids =
-            excluded_project_ids.filter(|ids| !ids.is_empty());
-
-        let file_hashes = file_hashes
-            .into_iter()
-            .filter(|hash| {
-                excluded_hashes
-                    .is_none_or(|excluded| !excluded.contains(&hash.hash))
-            })
-            .collect::<Vec<_>>();
-
-        let (file_hashes, file_info_by_hash, file_updates) =
-            if let Some(excluded_project_ids) = excluded_project_ids {
-                let file_hashes_ref =
-                    file_hashes.iter().map(|x| &*x.hash).collect::<Vec<_>>();
-                let file_info = CachedEntry::get_file_many(
-                    &file_hashes_ref,
-                    cache_behaviour,
-                    pool,
-                    fetch_semaphore,
-                )
-                .await?;
-
-                let file_info_by_hash: HashMap<String, CachedFile> = file_info
-                    .into_iter()
-                    .map(|f| (f.hash.clone(), f))
-                    .collect();
-                let file_info_by_hash = Self::resolve_installed_file_metadata(
-                    &file_hashes,
-                    &keys,
-                    file_info_by_hash,
-                    self,
-                    cache_behaviour,
-                    pool,
-                    fetch_semaphore,
-                )
-                .await?;
-
-                let file_hashes = file_hashes
-                    .into_iter()
-                    .filter(|hash| {
-                        file_info_by_hash.get(&hash.hash).is_none_or(|file| {
-                            !excluded_project_ids.contains(&file.project_id)
-                        })
-                    })
-                    .collect::<Vec<_>>();
-
-                let installed_channels = Self::get_installed_update_channels(
-                    &file_info_by_hash,
-                    cache_behaviour,
-                    pool,
-                    fetch_semaphore,
-                )
-                .await?;
-
-                let file_updates = file_hashes
-                    .iter()
-                    .filter(|x| file_info_by_hash.contains_key(&x.hash))
-                    .map(|x| {
-                        Self::get_cache_key(
-                            x,
-                            self,
-                            self.effective_update_channel(
-                                installed_channels.get(&x.hash).copied(),
-                            ),
-                        )
-                    })
-                    .collect::<Vec<_>>();
-
-                let file_updates_ref =
-                    file_updates.iter().map(|x| &**x).collect::<Vec<_>>();
-                let file_updates = CachedEntry::get_file_update_many(
-                    &file_updates_ref,
-                    cache_behaviour,
-                    pool,
-                    fetch_semaphore,
-                )
-                .await?;
-
-                (file_hashes, file_info_by_hash, file_updates)
-            } else {
-                let file_hashes_ref =
-                    file_hashes.iter().map(|x| &*x.hash).collect::<Vec<_>>();
-                let file_info = CachedEntry::get_file_many(
-                    &file_hashes_ref,
-                    cache_behaviour,
-                    pool,
-                    fetch_semaphore,
-                )
-                .await?;
-
-                let file_info_by_hash: HashMap<String, CachedFile> = file_info
-                    .into_iter()
-                    .map(|f| (f.hash.clone(), f))
-                    .collect();
-                let file_info_by_hash = Self::resolve_installed_file_metadata(
-                    &file_hashes,
-                    &keys,
-                    file_info_by_hash,
-                    self,
-                    cache_behaviour,
-                    pool,
-                    fetch_semaphore,
-                )
-                .await?;
-
-                let installed_channels = Self::get_installed_update_channels(
-                    &file_info_by_hash,
-                    cache_behaviour,
-                    pool,
-                    fetch_semaphore,
-                )
-                .await?;
-
-                let file_updates = file_hashes
-                    .iter()
-                    .filter(|x| file_info_by_hash.contains_key(&x.hash))
-                    .map(|x| {
-                        Self::get_cache_key(
-                            x,
-                            self,
-                            self.effective_update_channel(
-                                installed_channels.get(&x.hash).copied(),
-                            ),
-                        )
-                    })
-                    .collect::<Vec<_>>();
-
-                let file_updates_ref =
-                    file_updates.iter().map(|x| &**x).collect::<Vec<_>>();
-                let file_updates = CachedEntry::get_file_update_many(
-                    &file_updates_ref,
-                    cache_behaviour,
-                    pool,
-                    fetch_semaphore,
-                )
-                .await?;
-
-                (file_hashes, file_info_by_hash, file_updates)
-            };
-
-        let mut keys_by_path: HashMap<String, InitialScanFile> =
-            keys.into_iter().map(|k| (k.path.clone(), k)).collect();
-
-        let mut updates_by_hash: HashMap<String, Vec<String>> = HashMap::new();
-        for update in file_updates {
-            updates_by_hash
-                .entry(update.hash)
-                .or_default()
-                .push(update.update_version_id);
-        }
-
-        let files = DashMap::new();
-
-        for hash in file_hashes {
-            let file = file_info_by_hash.get(&hash.hash).cloned();
-            let trimmed = hash.path.trim_end_matches(".disabled");
-
-            if let Some(initial_file) = keys_by_path.remove(trimmed) {
-                let path = format!(
-                    "{}/{}",
-                    initial_file.project_type.get_folder(),
-                    initial_file.file_name
-                );
-
-                let update_version_id = if let Some(metadata) = &file {
-                    let update_ids =
-                        updates_by_hash.remove(&hash.hash).unwrap_or_default();
-
-                    if !update_ids.contains(&metadata.version_id) {
-                        update_ids.into_iter().next()
-                    } else {
-                        None
-                    }
-                } else {
-                    None
-                };
-
-                let file = ProfileFile {
-                    update_version_id,
-                    hash: hash.hash,
-                    file_name: initial_file.file_name,
-                    size: initial_file.size,
-                    metadata: file.map(|x| FileMetadata {
-                        project_id: x.project_id,
-                        version_id: x.version_id,
-                    }),
-                    project_type: initial_file.project_type,
-                };
-                files.insert(path, file);
-            }
-        }
-
-        Ok(files)
-    }
-
-    async fn get_installed_update_channels(
-        file_info_by_hash: &HashMap<String, CachedFile>,
-        cache_behaviour: Option<CacheBehaviour>,
-        pool: &SqlitePool,
-        fetch_semaphore: &FetchSemaphore,
-    ) -> crate::Result<HashMap<String, ReleaseChannel>> {
-        let version_ids = file_info_by_hash
-            .values()
-            .map(|file| file.version_id.as_str())
-            .collect::<HashSet<_>>();
-
-        if version_ids.is_empty() {
-            return Ok(HashMap::new());
-        }
-
-        let version_ids_ref = version_ids.iter().copied().collect::<Vec<_>>();
-        let versions = CachedEntry::get_version_many(
-            &version_ids_ref,
-            cache_behaviour,
-            pool,
-            fetch_semaphore,
-        )
-        .await?;
-        let channels_by_version_id = versions
-            .into_iter()
-            .map(|version| {
-                (
-                    version.id,
-                    ReleaseChannel::from_version_type(&version.version_type),
-                )
-            })
-            .collect::<HashMap<_, _>>();
-
-        Ok(file_info_by_hash
-            .iter()
-            .filter_map(|(hash, file)| {
-                channels_by_version_id
-                    .get(&file.version_id)
-                    .copied()
-                    .map(|channel| (hash.clone(), channel))
-            })
-            .collect())
-    }
-
-    fn effective_update_channel(
-        &self,
-        installed_channel: Option<ReleaseChannel>,
-    ) -> ReleaseChannel {
-        installed_channel.map_or(self.preferred_update_channel, |channel| {
-            self.preferred_update_channel.least_stable(channel)
-        })
-    }
-
-    pub async fn get_installed_project_ids(
-        &self,
-        pool: &SqlitePool,
-        fetch_semaphore: &FetchSemaphore,
-    ) -> crate::Result<Vec<String>> {
-        let (_keys, file_hashes) =
-            self.scan_and_hash(pool, fetch_semaphore).await?;
-
-        let file_hashes_ref =
-            file_hashes.iter().map(|x| &*x.hash).collect::<Vec<_>>();
-
-        let file_info = CachedEntry::get_file_many(
-            &file_hashes_ref,
-            None,
-            pool,
-            fetch_semaphore,
-        )
-        .await?;
-
-        let project_ids: Vec<String> = file_info
-            .into_iter()
-            .map(|f| f.project_id)
-            .collect::<std::collections::HashSet<_>>()
-            .into_iter()
-            .collect();
-
-        Ok(project_ids)
-    }
-
-    async fn scan_and_hash(
-        &self,
-        pool: &SqlitePool,
-        fetch_semaphore: &FetchSemaphore,
-    ) -> crate::Result<(Vec<InitialScanFile>, Vec<CachedFileHash>)> {
-        let path = crate::api::profile::get_full_path(&self.path).await?;
-
-        let mut keys = vec![];
-
-        for project_type in ProjectType::iterator() {
-            let folder = project_type.get_folder();
-            let path = path.join(folder);
-
-            if path.exists() {
-                for subdirectory in std::fs::read_dir(&path)
-                    .map_err(|e| io::IOError::with_path(e, &path))?
-                {
-                    let subdirectory =
-                        subdirectory.map_err(io::IOError::from)?.path();
-                    if subdirectory.is_file()
-                        && let Some(file_name) =
-                            subdirectory.file_name().and_then(|x| x.to_str())
-                        && is_scannable_project_file(project_type, file_name)
-                    {
-                        let file_size = subdirectory
-                            .metadata()
-                            .map_err(io::IOError::from)?
-                            .len();
-
-                        keys.push(InitialScanFile {
-                            path: format!(
-                                "{}/{folder}/{}",
-                                self.path,
-                                file_name.trim_end_matches(".disabled")
-                            ),
-                            file_name: file_name.to_string(),
-                            project_type,
-                            size: file_size,
-                            cache_key: format!(
-                                "{file_size}-{}/{folder}/{file_name}",
-                                self.path
-                            ),
-                        });
-                    }
-                }
-            }
-        }
-
-        let file_hashes = CachedEntry::get_file_hash_many(
-            &keys.iter().map(|s| &*s.cache_key).collect::<Vec<_>>(),
-            None,
-            pool,
-            fetch_semaphore,
-        )
-        .await?;
-
-        Ok((keys, file_hashes))
-    }
-
-    fn get_cache_key(
-        file: &CachedFileHash,
-        profile: &Profile,
-        channel: ReleaseChannel,
-    ) -> String {
-        format!(
-            "{}-{}-{}-{}",
-            file.hash,
-            file.project_type
-                .filter(|x| *x != ProjectType::Mod)
-                .map_or_else(
-                    || profile.loader.as_str().to_string(),
-                    |x| x.get_loaders().join("+")
-                ),
-            channel.key(),
-            profile.game_version
-        )
-    }
-
-    async fn resolve_installed_file_metadata(
-        file_hashes: &[CachedFileHash],
-        scan_files: &[InitialScanFile],
-        mut file_info_by_hash: HashMap<String, CachedFile>,
-        profile: &Profile,
-        cache_behaviour: Option<CacheBehaviour>,
-        pool: &SqlitePool,
-        fetch_semaphore: &FetchSemaphore,
-    ) -> crate::Result<HashMap<String, CachedFile>> {
-        let scan_files_by_path: HashMap<&str, &InitialScanFile> = scan_files
-            .iter()
-            .map(|file| (file.path.as_str(), file))
-            .collect();
-        struct MetadataCandidate {
-            hash: String,
-            project_id: String,
-            version_id: String,
-            file_name: String,
-            project_type: ProjectType,
-        }
-
-        let mut candidates = Vec::new();
-        let mut version_ids = HashSet::new();
-
-        for file_hash in file_hashes {
-            if let (Some(project_id), Some(version_id)) =
-                (&file_hash.project_id, &file_hash.version_id)
-            {
-                file_info_by_hash.insert(
-                    file_hash.hash.clone(),
-                    CachedFile {
-                        hash: file_hash.hash.clone(),
-                        project_id: project_id.clone(),
-                        version_id: version_id.clone(),
-                    },
-                );
-                continue;
-            }
-
-            let Some(file_info) = file_info_by_hash.get(&file_hash.hash) else {
-                continue;
-            };
-
-            let Some(scan_file) = scan_files_by_path
-                .get(file_hash.path.trim_end_matches(".disabled"))
-            else {
-                continue;
-            };
-
-            version_ids.insert(file_info.version_id.clone());
-            candidates.push(MetadataCandidate {
-                hash: file_hash.hash.clone(),
-                project_id: file_info.project_id.clone(),
-                version_id: file_info.version_id.clone(),
-                file_name: scan_file.file_name.clone(),
-                project_type: scan_file.project_type,
-            });
-        }
-
-        let version_ids_ref =
-            version_ids.iter().map(|id| id.as_str()).collect::<Vec<_>>();
-        let versions_by_id: HashMap<String, Version> =
-            CachedEntry::get_version_many(
-                &version_ids_ref,
-                None,
-                pool,
-                fetch_semaphore,
-            )
-            .await?
-            .into_iter()
-            .map(|version| (version.id.clone(), version))
-            .collect();
-
-        let mut project_versions_by_id: HashMap<String, Option<Vec<Version>>> =
-            HashMap::new();
-
-        for candidate in candidates {
-            if versions_by_id.get(&candidate.version_id).is_some_and(
-                |version| {
-                    Self::version_matches_file(
-                        version,
-                        &candidate.hash,
-                        &candidate.file_name,
-                        candidate.project_type,
-                        profile,
-                    )
-                },
-            ) {
-                continue;
-            }
-
-            if !project_versions_by_id.contains_key(&candidate.project_id) {
-                let versions = CachedEntry::get_project_versions(
-                    &candidate.project_id,
-                    cache_behaviour,
-                    pool,
-                    fetch_semaphore,
-                )
-                .await?;
-                project_versions_by_id
-                    .insert(candidate.project_id.clone(), versions);
-            }
-
-            let Some(Some(versions)) =
-                project_versions_by_id.get(&candidate.project_id)
-            else {
-                continue;
-            };
-
-            if let Some(version) = Self::find_matching_file_version(
-                versions,
-                &candidate.hash,
-                &candidate.file_name,
-                candidate.project_type,
-                profile,
-            ) {
-                file_info_by_hash.insert(
-                    candidate.hash.clone(),
-                    CachedFile {
-                        hash: candidate.hash,
-                        project_id: version.project_id.clone(),
-                        version_id: version.id.clone(),
-                    },
-                );
-            }
-        }
-
-        Ok(file_info_by_hash)
-    }
-
-    fn find_matching_file_version<'a>(
-        versions: &'a [Version],
-        hash: &str,
-        file_name: &str,
-        project_type: ProjectType,
-        profile: &Profile,
-    ) -> Option<&'a Version> {
-        versions.iter().find(|version| {
-            Self::version_matches_file(
-                version,
-                hash,
-                file_name,
-                project_type,
-                profile,
-            )
-        })
-    }
-
-    fn version_matches_file(
-        version: &Version,
-        hash: &str,
-        file_name: &str,
-        project_type: ProjectType,
-        profile: &Profile,
-    ) -> bool {
-        version.game_versions.contains(&profile.game_version)
-            && Self::version_loaders_match_profile(
-                version,
-                project_type,
-                profile,
-            )
-            && version.files.iter().any(|file| {
-                file.hashes.get("sha1").is_some_and(|sha1| sha1 == hash)
-                    && (file.primary
-                        || file.filename
-                            == file_name.trim_end_matches(".disabled"))
-            })
-    }
-
-    fn version_loaders_match_profile(
-        version: &Version,
-        project_type: ProjectType,
-        profile: &Profile,
-    ) -> bool {
-        if project_type == ProjectType::Mod {
-            version
-                .loaders
-                .iter()
-                .any(|loader| loader == profile.loader.as_str())
-        } else {
-            version.loaders.iter().any(|loader| {
-                project_type.get_loaders().contains(&loader.as_str())
-            })
-        }
-    }
-
-    #[tracing::instrument(skip(pool))]
-    pub async fn add_project_version(
-        profile_path: &str,
-        version_id: &str,
-        reason: util::fetch::DownloadReason,
-        dependent_on_version_id: Option<String>,
-        pool: &SqlitePool,
-        fetch_semaphore: &FetchSemaphore,
-        io_semaphore: &IoSemaphore,
-    ) -> crate::Result<String> {
-        let profile =
-            Self::get(profile_path, pool).await?.ok_or_else(|| {
-                crate::ErrorKind::UnmanagedProfileError(
-                    profile_path.to_string(),
-                )
-                .as_error()
-            })?;
-
-        let download_meta = util::fetch::DownloadMeta {
-            reason,
-            game_version: profile.game_version.clone(),
-            loader: profile.loader.as_str().to_string(),
-            dependent_on: dependent_on_version_id,
-        };
-
-        let version =
-            CachedEntry::get_version(version_id, None, pool, fetch_semaphore)
-                .await?
-                .ok_or_else(|| {
-                    crate::ErrorKind::InputError(format!(
-                        "Unable to install version id {version_id}. Not found."
-                    ))
-                    .as_error()
-                })?;
-
-        let file = if let Some(file) = version.files.iter().find(|x| x.primary)
-        {
-            file
-        } else if let Some(file) = version.files.first() {
-            file
-        } else {
-            return Err(crate::ErrorKind::InputError(
-                "No files for input version present!".to_string(),
-            )
-            .into());
-        };
-
-        let bytes = util::fetch::fetch(
-            &file.url,
-            file.hashes.get("sha1").map(|x| &**x),
-            Some(&download_meta),
-            None,
-            fetch_semaphore,
-            pool,
-        )
-        .await?;
-
-        let path = Self::add_project_bytes(
-            profile_path,
-            &file.filename,
-            bytes,
-            file.hashes.get("sha1").map(|x| &**x),
-            ProjectType::get_from_loaders(version.loaders.clone()),
-            Some(KnownModrinthFile {
-                project_id: &version.project_id,
-                version_id: &version.id,
-            }),
-            io_semaphore,
-            pool,
-        )
-        .await?;
-        Ok(path)
-    }
-
-    #[tracing::instrument(skip(bytes))]
-
-    pub async fn add_project_bytes(
-        profile_path: &str,
-        file_name: &str,
-        bytes: bytes::Bytes,
-        hash: Option<&str>,
-        project_type: Option<ProjectType>,
-        known_modrinth_file: Option<KnownModrinthFile<'_>>,
-        io_semaphore: &IoSemaphore,
-        exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
-    ) -> crate::Result<String> {
-        let project_type = if let Some(project_type) = project_type {
-            project_type
-        } else {
-            let cursor = std::io::Cursor::new(&*bytes);
-
-            let mut archive = zip::ZipArchive::new(cursor).map_err(|_| {
-                crate::ErrorKind::InputError(
-                    "Unable to infer project type for input file".to_string(),
-                )
-            })?;
-
-            if archive.by_name("fabric.mod.json").is_ok()
-                || archive.by_name("quilt.mod.json").is_ok()
-                || archive.by_name("META-INF/neoforge.mods.toml").is_ok()
-                || archive.by_name("META-INF/mods.toml").is_ok()
-                || archive.by_name("mcmod.info").is_ok()
-            {
-                ProjectType::Mod
-            } else if archive.by_name("pack.mcmeta").is_ok() {
-                if archive.file_names().any(|x| x.starts_with("data/")) {
-                    ProjectType::DataPack
-                } else {
-                    ProjectType::ResourcePack
-                }
-            } else if archive.file_names().any(|x| x.starts_with("shaders/")) {
-                ProjectType::ShaderPack
-            } else {
-                return Err(crate::ErrorKind::InputError(
-                    "Unable to infer project type for input file".to_string(),
-                )
-                .into());
-            }
-        };
-
-        let path = crate::api::profile::get_full_path(profile_path).await?;
-        let project_path =
-            format!("{}/{}", project_type.get_folder(), file_name);
-
-        cache_file_hash(
-            bytes.clone(),
-            profile_path,
-            &project_path,
-            hash,
-            Some(project_type),
-            known_modrinth_file,
-            exec,
-        )
-        .await?;
-
-        util::fetch::write(&path.join(&project_path), &bytes, io_semaphore)
-            .await?;
-
-        Ok(project_path)
-    }
-
-    /// Toggle a project's disabled state.
-    ///
-    /// Accepts either a bare file name (e.g. `mymod.jar`) or a relative
-    /// path (`mods/mymod.jar`). The function resolves the current on-disk
-    /// path (enabled or disabled) before renaming, so callers don't need
-    /// to track the `.disabled` suffix.
-    #[tracing::instrument]
-    pub async fn toggle_disable_project(
-        profile_path: &str,
-        project_path: &str,
-    ) -> crate::Result<String> {
-        let base = crate::api::profile::get_full_path(profile_path).await?;
-
-        let trimmed = project_path.trim_end_matches(".disabled");
-
-        // Resolve the actual current path on disk
-        let current_path = if base.join(project_path).exists() {
-            project_path.to_string()
-        } else if base.join(format!("{trimmed}.disabled")).exists() {
-            format!("{trimmed}.disabled")
-        } else if base.join(trimmed).exists() {
-            trimmed.to_string()
-        } else {
-            return Err(crate::ErrorKind::FSError(format!(
-                "Could not find project file for '{project_path}' in profile"
-            ))
-            .into());
-        };
-
-        let new_path = if current_path.ends_with(".disabled") {
-            current_path.trim_end_matches(".disabled").to_string()
-        } else {
-            format!("{current_path}.disabled")
-        };
-
-        io::rename_or_move(&base.join(&current_path), &base.join(&new_path))
-            .await?;
-
-        Ok(new_path)
-    }
-
-    #[tracing::instrument]
-    pub async fn remove_project(
-        profile_path: &str,
-        project_path: &str,
-    ) -> crate::Result<()> {
-        if let Ok(path) = crate::api::profile::get_full_path(profile_path).await
-        {
-            io::remove_file(path.join(project_path)).await?;
-        }
-
-        Ok(())
-    }
-}
diff --git a/packages/app-lib/src/state/server_join_log.rs b/packages/app-lib/src/state/server_join_log.rs
index 63580d4941..a73c453b22 100644
--- a/packages/app-lib/src/state/server_join_log.rs
+++ b/packages/app-lib/src/state/server_join_log.rs
@@ -4,7 +4,7 @@ use chrono::{DateTime, TimeZone, Utc};
 
 #[derive(Default)]
 pub struct JoinLogEntry {
-    pub profile_path: String,
+    pub instance_id: String,
     pub host: String,
     pub port: u16,
     pub join_time: DateTime<Utc>,
@@ -17,18 +17,18 @@ impl JoinLogEntry {
     ) -> crate::Result<()> {
         let join_time = self.join_time.timestamp();
 
-        sqlx::query!(
+        sqlx::query(
             "
-            INSERT INTO join_log (profile_path, host, port, join_time)
-            VALUES ($1, $2, $3, $4)
-            ON CONFLICT (profile_path, host, port) DO UPDATE SET
-                join_time = $4
-            ",
-            self.profile_path,
-            self.host,
-            self.port,
-            join_time
+			INSERT INTO join_log (instance_id, host, port, join_time)
+			VALUES (?, ?, ?, ?)
+			ON CONFLICT (instance_id, host, port) DO UPDATE SET
+				join_time = excluded.join_time
+			",
         )
+        .bind(&self.instance_id)
+        .bind(&self.host)
+        .bind(i64::from(self.port))
+        .bind(join_time)
         .execute(exec)
         .await?;
 
@@ -37,26 +37,26 @@ impl JoinLogEntry {
 }
 
 pub async fn get_joins(
-    instance: &str,
+    instance_id: &str,
     exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
 ) -> crate::Result<HashMap<(String, u16), DateTime<Utc>>> {
-    let joins = sqlx::query!(
+    let joins = sqlx::query_as::<_, (String, i64, i64)>(
         "
-        SELECT profile_path, host, port, join_time
-        FROM join_log
-        WHERE profile_path = $1
-        ",
-        instance
+		SELECT host, port, join_time
+		FROM join_log
+		WHERE instance_id = ?
+		",
     )
+    .bind(instance_id)
     .fetch_all(exec)
     .await?;
 
     Ok(joins
         .into_iter()
-        .map(|x| {
+        .map(|(host, port, join_time)| {
             (
-                (x.host, x.port as u16),
-                Utc.timestamp_opt(x.join_time, 0)
+                (host, port as u16),
+                Utc.timestamp_opt(join_time, 0)
                     .single()
                     .unwrap_or_else(Utc::now),
             )
diff --git a/packages/app-lib/src/util/io.rs b/packages/app-lib/src/util/io.rs
index ea40bd9f79..f55fa252e1 100644
--- a/packages/app-lib/src/util/io.rs
+++ b/packages/app-lib/src/util/io.rs
@@ -314,18 +314,6 @@ pub async fn remove_file(
         })
 }
 
-pub async fn open_file(
-    path: impl AsRef<std::path::Path>,
-) -> Result<tokio::fs::File, IOError> {
-    let path = path.as_ref();
-    tokio::fs::File::open(path)
-        .await
-        .map_err(|e| IOError::IOPathError {
-            source: e,
-            path: path.to_string_lossy().to_string(),
-        })
-}
-
 pub async fn remove_dir(
     path: impl AsRef<std::path::Path>,
 ) -> Result<(), IOError> {