diff --git a/.changeset/strong-foxes-know.md b/.changeset/strong-foxes-know.md
new file mode 100644
index 0000000..31c10ac
--- /dev/null
+++ b/.changeset/strong-foxes-know.md
@@ -0,0 +1,7 @@
+---
+'svelte-podcast': minor
+---
+
+- Restructures lib to make dist cleaner and dev easier to grock
+- Refactors <audio /> bindings to make it easier to change values when loading a different source
+- Moves more values to micro-stores
diff --git a/.prettierignore b/.prettierignore
index 3897265..9813cfa 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -3,6 +3,7 @@ node_modules
 /build
 /.svelte-kit
 /package
+/dist
 .env
 .env.*
 !.env.example
@@ -10,4 +11,4 @@ node_modules
 # Ignore files for PNPM, NPM and YARN
 pnpm-lock.yaml
 package-lock.json
-yarn.lock
+yarn.lock
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1fd719..d532d73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte-podcast
 
+## 0.1.1
+
+### Patch Changes
+
+- 549d858: Fixes release build
+
 ## 0.1.0
 
 ### Minor Changes
diff --git a/package.json b/package.json
index 0802d86..d2e618a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "svelte-podcast",
-	"version": "0.1.0",
+	"version": "0.1.1",
 	"license": "MIT",
 	"author": "Ollie Taylor",
 	"homepage": "https://github.com/OllieJT/svelte-podcast/blob/main/README.md",
@@ -36,6 +36,9 @@
 	"peerDependencies": {
 		"svelte": "^3.54.0"
 	},
+	"dependencies": {
+		"just-clamp": "^4.2.0"
+	},
 	"devDependencies": {
 		"@changesets/cli": "^2.26.0",
 		"@playwright/test": "^1.28.1",
@@ -47,7 +50,6 @@
 		"eslint-config-prettier": "^8.5.0",
 		"eslint-plugin-svelte3": "^4.0.0",
 		"eslint": "^8.28.0",
-		"just-clamp": "^4.2.0",
 		"prettier-plugin-svelte": "^2.8.1",
 		"prettier": "^2.8.0",
 		"publint": "^0.1.9",
@@ -59,6 +61,5 @@
 	},
 	"svelte": "./dist/index.js",
 	"types": "./dist/index.d.ts",
-	"type": "module",
-	"dependencies": {}
+	"type": "module"
 }
diff --git a/src/lib/components/audio-loader.svelte b/src/lib/components/audio-loader.svelte
new file mode 100644
index 0000000..7da7037
--- /dev/null
+++ b/src/lib/components/audio-loader.svelte
@@ -0,0 +1,95 @@
+<script lang="ts">
+	import {
+		audio_autoplay,
+		audio_current_time,
+		audio_element,
+		audio_metadata,
+		audio_muted,
+		audio_playback_rate,
+		audio_src,
+		audio_start_at,
+		audio_volume,
+	} from '$lib/context/audio-internals';
+	import type { PlayerElement } from '$lib/types/types';
+	import { isBoolean, isNumber } from '$pkg/type-guards';
+
+	let element: PlayerElement;
+	let currentTime = $audio_start_at;
+	let volume = $audio_volume;
+
+	let duration = 0;
+	let ended = true;
+	let muted = false;
+	let paused = false;
+	let playbackRate = 1;
+
+	// Update stores based on bindings
+	$: audio_element.set(element);
+	$: audio_current_time.set(currentTime);
+	$: audio_metadata.update((x) => ({ ...x, duration, ended, paused }));
+
+	// Update bindings based on stores
+	$: volume = $audio_volume;
+	$: muted = $audio_muted;
+	$: playbackRate = $audio_playback_rate;
+	$: currentTime = $audio_start_at;
+</script>
+
+<audio
+	bind:this={element}
+	src={$audio_src}
+	autoplay={$audio_autoplay}
+	bind:currentTime
+	bind:muted
+	bind:duration
+	bind:paused
+	bind:playbackRate
+	bind:volume
+	bind:ended
+	preload="metadata"
+	controls={false}
+	on:canplay={(e) => false && console.log('canplay', e)}
+	on:canplaythrough={(e) => false && console.log('canplaythrough', e)}
+	on:timeupdate={(e) => false && console.log('progress', e)}
+	on:loadedmetadata={(e) => false && console.log('loadedmetadata', e)}
+	on:suspend={(e) => false && console.log('suspend', e)}
+	on:seeked={(e) => false && console.log('seeked', e)}
+	on:play={(e) => false && console.log('play', e)}
+	on:waiting={(e) => console.log('waiting', e)}
+	on:stalled={(e) => console.log('stalled', e)}
+	on:load={(e) => console.log('load', e)}
+	on:emptied={() => {
+		// TODO: reset player state
+		// console.log('emptied', e);
+	}}
+	on:loadeddata={() => {
+		audio_metadata.update((m) => ({ ...m, loading: false }));
+	}}
+	on:loadstart={() => {
+		audio_metadata.update((m) => ({ ...m, loading: true }));
+	}}
+	on:playing={(e) => {
+		// @ts-expect-error event is not fully typed
+		const is_paused = e.target.paused;
+		if (!isBoolean(is_paused)) return;
+		audio_metadata.update((m) => ({ ...m, paused: is_paused }));
+	}}
+	on:pause={(e) => {
+		// @ts-expect-error event is not fully typed
+		const is_paused = e.target.paused;
+		if (!isBoolean(is_paused)) return;
+		audio_metadata.update((m) => ({ ...m, paused: is_paused }));
+	}}
+	on:ratechange={(e) => {
+		// @ts-expect-error event is not fully typed
+		const playbackRate = e.target.playbackRate;
+		if (!isNumber(playbackRate)) return;
+		audio_metadata.update((m) => ({ ...m, playbackRate }));
+	}}
+	on:durationchange={(e) => {
+		// @ts-expect-error event is not fully typed
+		const duration = e.target?.duration;
+		if (!isNumber(duration)) return;
+		audio_metadata.update((m) => ({ ...m, duration }));
+	}}
+/>
diff --git a/src/lib/components/audio/audio-progress.svelte b/src/lib/components/audio-progress.svelte
similarity index 100%
rename from src/lib/components/audio/audio-progress.svelte
rename to src/lib/components/audio-progress.svelte
diff --git a/src/lib/components/audio/audio.svelte b/src/lib/components/audio/audio.svelte
deleted file mode 100644
index 663061e..0000000
--- a/src/lib/components/audio/audio.svelte
+++ /dev/null
@@ -1,76 +0,0 @@
-<script lang="ts">
-	import {
-		__internal_audio_current_time,
-		__internal_audio_element,
-		__internal_audio_metadata,
-		__internal_audio_src,
-	} from '$lib/components/audio/store';
-	import type { PlayerElement } from '$lib/components/audio/types';
-	import { isBoolean, isNumber } from '$lib/helper/check';
-
-	let element: PlayerElement;
-	let currentTime = 0;
-	let muted = false;
-
-	$: src = $__internal_audio_src;
-	$: __internal_audio_element.set(element);
-	$: __internal_audio_current_time.set(currentTime);
-	$: __internal_audio_metadata.update((x) => ({ ...x, muted }));
-</script>
-
-{#key src}
-	<audio
-		bind:this={element}
-		{src}
-		autoplay={false}
-		bind:currentTime
-		bind:muted
-		preload="metadata"
-		controls={false}
-		on:canplay={(e) => false && console.log('canplay', e)}
-		on:canplaythrough={(e) => false && console.log('canplaythrough', e)}
-		on:timeupdate={(e) => false && console.log('progress', e)}
-		on:loadedmetadata={(e) => false && console.log('loadedmetadata', e)}
-		on:suspend={(e) => false && console.log('suspend', e)}
-		on:seeked={(e) => false && console.log('seeked', e)}
-		on:play={(e) => false && console.log('play', e)}
-		on:waiting={(e) => console.log('waiting', e)}
-		on:stalled={(e) => console.log('stalled', e)}
-		on:load={(e) => console.log('load', e)}
-		on:emptied={() => {
-			// TODO: reset player state
-			// console.log('emptied', e);
-		}}
-		on:loadeddata={() => {
-			__internal_audio_metadata.update((m) => ({ ...m, loading: false }));
-		}}
-		on:loadstart={() => {
-			__internal_audio_metadata.update((m) => ({ ...m, loading: true }));
-		}}
-		on:playing={(e) => {
-			// @ts-expect-error event is not fully typed
-			const is_paused = e.target.paused;
-			if (!isBoolean(is_paused)) return;
-			__internal_audio_metadata.update((m) => ({ ...m, paused: is_paused }));
-		}}
-		on:pause={(e) => {
-			// @ts-expect-error event is not fully typed
-			const is_paused = e.target.paused;
-			if (!isBoolean(is_paused)) return;
-			__internal_audio_metadata.update((m) => ({ ...m, paused: is_paused }));
-		}}
-		on:ratechange={(e) => {
-			// @ts-expect-error event is not fully typed
-			const playbackRate = e.target.playbackRate;
-			if (!isNumber(playbackRate)) return;
-			__internal_audio_metadata.update((m) => ({ ...m, playbackRate }));
-		}}
-		on:durationchange={(e) => {
-			// @ts-expect-error event is not fully typed
-			const duration = e.target?.duration;
-			if (!isNumber(duration)) return;
-			__internal_audio_metadata.update((m) => ({ ...m, duration }));
-		}}
-	/>
-	<!-- <AudioA11yProgress {currentTime} {paused} {duration} /> -->
-{/key}
diff --git a/src/lib/components/audio/index.ts b/src/lib/components/audio/index.ts
deleted file mode 100644
index d4a0c36..0000000
--- a/src/lib/components/audio/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as AudioManager } from './audio.svelte';
-export { audio } from './store';
diff --git a/src/lib/components/audio/store.ts b/src/lib/components/audio/store.ts
deleted file mode 100644
index 70f6c6d..0000000
--- a/src/lib/components/audio/store.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import { dev } from '$app/environment';
-import type { PlayerElement, PlayerMetadata } from '$lib/components/audio/types';
-import { secondsToTimestamp } from '$lib/helper/seconds-to-timestamp';
-import clamp from 'just-clamp';
-import { derived, writable } from 'svelte/store';
-
-function log(...val: (string | number | boolean)[]) {
-	if (!dev) return;
-	console.info('🎶 ', ...val);
-}
-function warn(...val: (string | number | boolean)[]) {
-	if (!dev) return;
-	console.warn('🎶 ', ...val);
-}
-
-export const __internal_audio_current_time = writable<number>(0);
-export const __internal_audio_src = writable<string | null>(null);
-export const __internal_audio_element = writable<PlayerElement>();
-export const __internal_audio_metadata = writable<PlayerMetadata>({
-	duration: 0,
-	muted: false,
-	paused: true,
-	playbackRate: 1,
-	loading: false,
-});
-
-const state = derived(
-	[__internal_audio_metadata, __internal_audio_current_time],
-	([$metadata, $current_time]) => {
-		return {
-			current_time: $current_time,
-			timestamp: secondsToTimestamp($current_time),
-			...$metadata,
-		};
-	},
-);
-
-type HandleType = 'toggle' | 'set';
-
-function play(type: HandleType = 'set') {
-	log('play: ', type);
-	return __internal_audio_element.subscribe((el) => {
-		if (!el) return warn('no audio element');
-		if (type === 'toggle') {
-			el.paused ? el.play() : el.pause();
-		} else {
-			el.play();
-		}
-	})();
-}
-function pause(type: HandleType = 'set') {
-	log('pause: ', type);
-	return __internal_audio_element.subscribe((el) => {
-		if (!el) return warn('no audio element');
-		if (type === 'toggle') {
-			el.paused ? el.play() : el.pause();
-		} else {
-			el.pause();
-		}
-	})();
-}
-
-function mute(type: HandleType = 'set') {
-	log('mute: ', type);
-	return __internal_audio_element.subscribe((el) => {
-		if (!el) return warn('no audio element');
-		if (type === 'toggle') {
-			el.muted = !el.muted;
-		} else {
-			el.muted = true;
-		}
-	})();
-}
-function unmute(type: HandleType = 'set') {
-	log('unmute: ', type);
-	return __internal_audio_element.subscribe((el) => {
-		if (!el) return warn('no audio element');
-		if (type === 'toggle') {
-			el.muted = !el.muted;
-		} else {
-			el.muted = false;
-		}
-	})();
-}
-
-function load(src: string) {
-	log('load: ', src);
-	__internal_audio_src.set(src);
-	return __internal_audio_element.subscribe((el) => {
-		if (!el) return warn('no audio element');
-		el.volume = 1;
-		el.pause();
-	})();
-}
-function unload() {
-	log('unload: ');
-	__internal_audio_src.set(null);
-}
-
-function setPlaybackRate(rate: number) {
-	log('setPlaybackRate: ', rate);
-	return __internal_audio_element.subscribe((el) => {
-		if (!el) return warn('no audio element');
-		el.playbackRate = clamp(0, 10, rate);
-	})();
-}
-
-function seek(seconds: number, from: 'from-start' | 'from-end' = 'from-start') {
-	log('seek: ', seconds, from);
-	return __internal_audio_element.subscribe((el) => {
-		if (!el) return warn('no audio element');
-		if (from === 'from-end') {
-			el.currentTime = clamp(0, el.duration, el.duration - seconds);
-		} else {
-			el.currentTime = clamp(0, el.duration, seconds);
-		}
-	})();
-}
-
-function skip(seconds: number, type: 'forward' | 'backward' = 'forward') {
-	log('skip: ', seconds, type);
-	return __internal_audio_element.subscribe((el) => {
-		if (!el) return warn('no audio element');
-		if (type === 'backward') {
-			el.currentTime = clamp(0, el.duration, el.currentTime - seconds);
-		} else {
-			el.currentTime = clamp(0, el.duration, el.currentTime + seconds);
-		}
-	})();
-}
-
-export const audio = {
-	subscribe: state.subscribe,
-	play,
-	pause,
-	mute,
-	unmute,
-	load,
-	unload,
-	setPlaybackRate,
-	seek,
-	skip,
-};
diff --git a/src/lib/components/audio/types.ts b/src/lib/components/audio/types.ts
deleted file mode 100644
index 6e5c9a3..0000000
--- a/src/lib/components/audio/types.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export type PlayerElement = HTMLAudioElement | undefined;
-
-export type PlayerMetadata = {
-	duration: number;
-	muted: boolean;
-	paused: boolean;
-	playbackRate: number;
-	loading: boolean;
-};
diff --git a/src/lib/context/audio-internals.ts b/src/lib/context/audio-internals.ts
new file mode 100644
index 0000000..7ea9f00
--- /dev/null
+++ b/src/lib/context/audio-internals.ts
@@ -0,0 +1,30 @@
+import type { PlayerElement } from '$lib/types/types';
+import { writable } from 'svelte/store';
+
+export const audio_element = writable<PlayerElement>();
+export const audio_start_at = writable<number>(0);
+
+export const audio_autoplay = writable<boolean>(false);
+export const audio_current_time = writable<number>(0);
+export const audio_muted = writable<boolean>(false);
+export const audio_playback_rate = writable<number>(1);
+export const audio_src = writable<string>('');
+export const audio_volume = writable<number>(1);
+
+export type PlayerMetadata = {
+	duration: number;
+	// muted: boolean;
+	paused: boolean;
+	// playbackRate: number;
+	loading: boolean;
+	ended: boolean;
+};
+
+export const audio_metadata = writable<PlayerMetadata>({
+	duration: 0,
+	ended: false,
+	loading: false,
+	paused: true,
+	// muted: false,
+	// playbackRate: 1,
+});
diff --git a/src/lib/context/audio.ts b/src/lib/context/audio.ts
new file mode 100644
index 0000000..f513ab4
--- /dev/null
+++ b/src/lib/context/audio.ts
@@ -0,0 +1,146 @@
+import {
+	audio_autoplay,
+	audio_current_time,
+	audio_element,
+	audio_metadata,
+	audio_muted,
+	audio_playback_rate,
+	audio_src,
+	audio_start_at,
+	audio_volume,
+} from '$lib/context/audio-internals';
+import { secondsToTimestamp } from '$lib/utility/seconds-to-timestamp';
+import { info, warn } from '$pkg/log';
+import clamp from 'just-clamp';
+import { derived } from 'svelte/store';
+
+const audio_state = derived(
+	[
+		audio_metadata,
+		audio_autoplay,
+		audio_current_time,
+		audio_muted,
+		audio_playback_rate,
+		audio_src,
+		audio_volume,
+	],
+	([$metadata, $autoplay, $current_time, $muted, $playback_rate, $src, $volume]) => {
+		return {
+			...$metadata,
+			autoplay: $autoplay,
+			current_time: $current_time,
+			timestamp: secondsToTimestamp($current_time),
+			muted: $muted,
+			playback_rate: $playback_rate,
+			src: $src,
+			volume: $volume,
+		};
+	},
+);
+
+type HandleType = 'toggle' | 'set';
+
+function play(type: HandleType = 'set') {
+	info('play: ', type);
+	return audio_element.subscribe((el) => {
+		if (!el) return warn('no audio element');
+		if (type === 'toggle') {
+			el.paused ? el.play() : el.pause();
+		} else {
+			el.play();
+		}
+	})();
+}
+function pause(type: HandleType = 'set') {
+	info('pause: ', type);
+	return audio_element.subscribe((el) => {
+		if (!el) return warn('no audio element');
+		if (type === 'toggle') {
+			el.paused ? el.play() : el.pause();
+		} else {
+			el.pause();
+		}
+	})();
+}
+
+function mute(type: HandleType = 'set') {
+	info('mute: ', type);
+	if (type === 'toggle') {
+		audio_muted.update((muted) => !muted);
+	} else {
+		audio_muted.set(true);
+	}
+}
+function unmute(type: HandleType = 'set') {
+	info('unmute: ', type);
+	if (type === 'toggle') {
+		audio_muted.update((muted) => !muted);
+	} else {
+		audio_muted.set(false);
+	}
+}
+
+type LoadOptions = {
+	autoplay: boolean;
+	start_at?: number;
+};
+
+function load(src: string, opts: LoadOptions) {
+	info('load: ', src);
+	audio_autoplay.set(opts.autoplay);
+	audio_volume.set(1);
+	audio_src.set(src);
+	audio_start_at.set(opts.start_at || 0);
+	// opts.current_time ? seek(opts.current_time) : null;
+	//opts.autoplay && play();
+}
+function unload() {
+	info('unload: ');
+	pause();
+	audio_autoplay.set(false);
+	audio_volume.set(1);
+	audio_src.set('');
+	audio_start_at.set(0);
+}
+
+function setPlaybackRate(rate: number) {
+	info('setPlaybackRate: ', rate);
+	audio_playback_rate.set(clamp(0, 10, rate));
+}
+
+function seek(seconds: number, from: 'from-start' | 'from-end' = 'from-start') {
+	info('seek: ', seconds, from);
+	return audio_element.subscribe((el) => {
+		if (!el) return warn('no audio element');
+		if (from === 'from-end') {
+			el.currentTime = clamp(0, el.duration, el.duration - seconds);
+		} else {
+			el.currentTime = clamp(0, el.duration, seconds);
+		}
+	})();
+}
+
+function skip(seconds: number, type: 'forward' | 'backward' = 'forward') {
+	info('skip: ', seconds, type);
+	return audio_element.subscribe((el) => {
+		if (!el) return warn('no audio element');
+		if (type === 'backward') {
+			el.currentTime = clamp(0, el.duration, el.currentTime - seconds);
+		} else {
+			el.currentTime = clamp(0, el.duration, el.currentTime + seconds);
+		}
+	})();
+}
+
+export const audio = {
+	subscribe: audio_state.subscribe,
+	play,
+	pause,
+	mute,
+	unmute,
+	load,
+	unload,
+	setPlaybackRate,
+	seek,
+	skip,
+};
diff --git a/src/lib/index.ts b/src/lib/index.ts
index 47d3c46..a927e69 100644
--- a/src/lib/index.ts
+++ b/src/lib/index.ts
@@ -1 +1,2 @@
-// Reexport your entry components here
+export { default as AudioLoader } from '$lib/components/audio-loader.svelte';
+export { audio } from '$lib/context/audio';
diff --git a/src/lib/types/types.ts b/src/lib/types/types.ts
new file mode 100644
index 0000000..d8ee92f
--- /dev/null
+++ b/src/lib/types/types.ts
@@ -0,0 +1 @@
+export type PlayerElement = HTMLAudioElement | undefined;
diff --git a/src/lib/utility/package/log.ts b/src/lib/utility/package/log.ts
new file mode 100644
index 0000000..072eae4
--- /dev/null
+++ b/src/lib/utility/package/log.ts
@@ -0,0 +1,21 @@
+import { dev } from '$app/environment';
+
+const useLogger = {
+	error: console.error,
+	info: console.info,
+	warn: console.warn,
+};
+
+export type Logger = keyof typeof useLogger;
+
+export function log(type: Logger, ...content: unknown[]) {
+	const logger = useLogger[type];
+
+	if (type === 'info' && !dev) return;
+
+	logger('🔊 svelte-podcast: ', content);
+}
+
+export const info = (...content: unknown[]) => log('info', ...content);
+export const warn = (...content: unknown[]) => log('warn', content);
+export const error = (...content: unknown[]) => log('error', content);
diff --git a/src/lib/helper/check.ts b/src/lib/utility/package/type-guards.ts
similarity index 100%
rename from src/lib/helper/check.ts
rename to src/lib/utility/package/type-guards.ts
diff --git a/src/lib/helper/seconds-to-timestamp.ts b/src/lib/utility/seconds-to-timestamp.ts
similarity index 100%
rename from src/lib/helper/seconds-to-timestamp.ts
rename to src/lib/utility/seconds-to-timestamp.ts
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 83ffe02..eeacb62 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-	import { AudioManager } from '$lib/components/audio';
+	import { AudioLoader } from '$lib';
 </script>
 
-<AudioManager />
+<AudioLoader />
 
 <slot />
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 12786bf..ea813e6 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { audio } from '$lib/components/audio';
+	import { audio } from '$lib';
 
 	const sources = {
 		syntax: '/example-syntax.mp3',
@@ -16,8 +16,13 @@
 <a href="/another-page">Another Page</a>
 
 <h5>Load Audio</h5>
-<button type="button" on:click={() => audio.load(sources['syntax'])}>Syntax</button>
-<button type="button" on:click={() => audio.load(sources['knomii'])}>Knomii</button>
+<button
+	type="button"
+	on:click={() => audio.load(sources['syntax'], { autoplay: true, start_at: 45 })}>Syntax</button
+>
+<button type="button" on:click={() => audio.load(sources['knomii'], { autoplay: false })}
+	>Knomii</button
+>
 <button type="button" on:click={() => audio.unload()}>None</button>
 
 <h5>Custom audio controls</h5>
diff --git a/src/routes/another-page/+page.svelte b/src/routes/another-page/+page.svelte
index f0d9805..1cad0d5 100644
--- a/src/routes/another-page/+page.svelte
+++ b/src/routes/another-page/+page.svelte
@@ -1,10 +1,5 @@
 <script lang="ts">
-	import { audio } from '$lib/components/audio';
-
-	const sources = {
-		syntax: '/example-syntax.mp3',
-		knomii: '/example-knomii.mp3',
-	} as const;
+	import { audio } from '$lib';
 
 	let current_time = 0;
 	$: current_time = $audio.current_time;
diff --git a/svelte.config.js b/svelte.config.js
index c160d6e..b91762c 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -9,6 +9,10 @@ const config = {
 
 	kit: {
 		adapter: adapter(),
+		alias: {
+			$lib: 'src/lib',
+			$pkg: 'src/lib/utility/package/',
+		},
 	},
 };