diff --git a/src/db/loaders.c b/src/db/loaders.c
new file mode 100644
index 0000000..3b44bfe
--- /dev/null
+++ b/src/db/loaders.c
@@ -0,0 +1,234 @@
+/* loaders.c
+ *
+ * Copyright 2021 Joshua Strobl
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * 	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "cartographer.h"
+#include "db.h"
+#include "loaders.h"
+#include "../indexer/structs.h"
+#include "../koto-utils.h"
+
+extern KotoCartographer * koto_maps;
+extern sqlite3 * koto_db;
+
+int process_artists(
+	void * data,
+	int num_columns,
+	char ** fields,
+	char ** column_names
+) {
+	(void) data;
+	(void) num_columns;
+	(void) column_names; // Don't need any of the params
+
+	gchar * artist_uuid = g_strdup(koto_utils_unquote_string(fields[0])); // First column is UUID
+	gchar * artist_path = g_strdup(koto_utils_unquote_string(fields[1])); // Second column is path
+	gchar * artist_name = g_strdup(koto_utils_unquote_string(fields[3])); // Fourth column is artist name
+
+	KotoArtist * artist = koto_artist_new_with_uuid(artist_uuid); // Create our artist with the UUID
+
+	g_object_set(
+		artist,
+		"path",
+		artist_path,         // Set path
+		"name",
+		artist_name,          // Set name
+		NULL);
+
+	koto_cartographer_add_artist(koto_maps, artist); // Add the artist to our global cartographer
+
+	int albums_rc = sqlite3_exec(koto_db, g_strdup_printf("SELECT * FROM albums WHERE artist_id=\"%s\"", artist_uuid), process_albums, artist, NULL); // Process our albums
+
+	if (albums_rc != SQLITE_OK) { // Failed to get our albums
+		g_critical("Failed to read our albums: %s", sqlite3_errmsg(koto_db));
+		return 1;
+	}
+
+	g_free(artist_uuid);
+	g_free(artist_path);
+	g_free(artist_name);
+
+	return 0;
+}
+
+int process_albums(
+	void * data,
+	int num_columns,
+	char ** fields,
+	char ** column_names
+) {
+	(void) num_columns;
+	(void) column_names; // Don't need these
+
+	KotoArtist * artist = (KotoArtist*) data;
+
+	gchar * album_uuid = g_strdup(koto_utils_unquote_string(fields[0]));
+	gchar * path = g_strdup(koto_utils_unquote_string(fields[1]));
+	gchar * artist_uuid = g_strdup(koto_utils_unquote_string(fields[2]));
+	gchar * album_name = g_strdup(koto_utils_unquote_string(fields[3]));
+	gchar * album_art = (fields[4] != NULL) ? g_strdup(koto_utils_unquote_string(fields[4])) : NULL;
+
+	KotoAlbum * album = koto_album_new_with_uuid(artist, album_uuid); // Create our album
+
+	g_object_set(
+		album,
+		"path",
+		path,         // Set the path
+		"name",
+		album_name,         // Set name
+		"art-path",
+		album_art,             // Set art path if any
+		NULL);
+
+	koto_cartographer_add_album(koto_maps, album); // Add the album to our global cartographer
+	koto_artist_add_album(artist, album_uuid); // Add the album
+
+	int tracks_rc = sqlite3_exec(koto_db, g_strdup_printf("SELECT * FROM tracks WHERE album_id=\"%s\"", album_uuid), process_tracks, album, NULL); // Process our tracks
+
+	if (tracks_rc != SQLITE_OK) { // Failed to get our tracks
+		g_critical("Failed to read our tracks: %s", sqlite3_errmsg(koto_db));
+		return 1;
+	}
+
+	g_free(album_uuid);
+	g_free(path);
+	g_free(artist_uuid);
+	g_free(album_name);
+
+	if (album_art != NULL) {
+		g_free(album_art);
+	}
+
+	return 0;
+}
+
+int process_playlists(
+	void * data,
+	int num_columns,
+	char ** fields,
+	char ** column_names
+) {
+	(void) data;
+	(void) num_columns;
+	(void) column_names; // Don't need any of the params
+
+	gchar * playlist_uuid = g_strdup(koto_utils_unquote_string(fields[0])); // First column is UUID
+	gchar * playlist_name = g_strdup(koto_utils_unquote_string(fields[1])); // Second column is playlist name
+	gchar * playlist_art_path = g_strdup(koto_utils_unquote_string(fields[2])); // Third column is any art path
+
+	KotoPlaylist * playlist = koto_playlist_new_with_uuid(playlist_uuid); // Create a playlist using the existing UUID
+
+	koto_playlist_set_name(playlist, playlist_name); // Add the playlist name
+	koto_playlist_set_artwork(playlist, playlist_art_path); // Add the playlist art path
+
+	koto_cartographer_add_playlist(koto_maps, playlist); // Add to cartographer
+
+	int playlist_tracks_rc = sqlite3_exec(koto_db, g_strdup_printf("SELECT * FROM playlist_tracks WHERE playlist_id=\"%s\" ORDER BY position ASC", playlist_uuid), process_playlists_tracks, playlist, NULL); // Process our playlist tracks
+
+	if (playlist_tracks_rc != SQLITE_OK) { // Failed to get our playlist tracks
+		g_critical("Failed to read our playlist tracks: %s", sqlite3_errmsg(koto_db));
+		return 1;
+	}
+
+	koto_playlist_mark_as_finalized(playlist); // Mark as finalized since loading should be complete
+
+	g_free(playlist_uuid);
+	g_free(playlist_name);
+	g_free(playlist_art_path);
+
+	return 0;
+}
+
+int process_playlists_tracks(
+	void * data,
+	int num_columns,
+	char ** fields,
+	char ** column_names
+) {
+	(void) data;
+	(void) num_columns;
+	(void) column_names; // Don't need these
+
+	gchar * playlist_uuid = g_strdup(koto_utils_unquote_string(fields[1]));
+	gchar * track_uuid = g_strdup(koto_utils_unquote_string(fields[2]));
+	gboolean current = g_strcmp0(koto_utils_unquote_string(fields[3]), "0");
+
+	KotoPlaylist * playlist = koto_cartographer_get_playlist_by_uuid(koto_maps, playlist_uuid); // Get the playlist
+	KotoTrack * track = koto_cartographer_get_track_by_uuid(koto_maps, track_uuid); // Get the track
+
+	if (!KOTO_IS_PLAYLIST(playlist)) {
+		goto freeforret;
+	}
+
+	koto_playlist_add_track(playlist, track, current, FALSE); // Add the track to the playlist but don't re-commit to the table
+
+freeforret:
+	g_free(playlist_uuid);
+	g_free(track_uuid);
+
+	return 0;
+}
+
+int process_tracks(
+	void * data,
+	int num_columns,
+	char ** fields,
+	char ** column_names
+) {
+	(void) num_columns;
+	(void) column_names; // Don't need these
+
+	KotoAlbum * album = (KotoAlbum*) data;
+	gchar * track_uuid = g_strdup(koto_utils_unquote_string(fields[0]));
+	gchar * path = g_strdup(koto_utils_unquote_string(fields[1]));
+	gchar * artist_uuid = g_strdup(koto_utils_unquote_string(fields[3]));
+	gchar * album_uuid = g_strdup(koto_utils_unquote_string(fields[4]));
+	gchar * file_name = g_strdup(koto_utils_unquote_string(fields[5]));
+	gchar * name = g_strdup(koto_utils_unquote_string(fields[6]));
+	guint * disc_num = (guint*) g_ascii_strtoull(fields[7], NULL, 10);
+	guint * position = (guint*) g_ascii_strtoull(fields[8], NULL, 10);
+
+	KotoTrack * track = koto_track_new_with_uuid(track_uuid); // Create our file
+
+	g_object_set(track, "artist-uuid", artist_uuid, "album-uuid", album_uuid, "path", path, "file-name", file_name, "parsed-name", name, "cd", disc_num, "position", position, NULL);
+
+	koto_album_add_track(album, track); // Add the track
+
+	g_free(track_uuid);
+	g_free(path);
+	g_free(artist_uuid);
+	g_free(album_uuid);
+	g_free(file_name);
+	g_free(name);
+
+	return 0;
+}
+
+void read_from_db() {
+	int artists_rc = sqlite3_exec(koto_db, "SELECT * FROM artists", process_artists, NULL, NULL); // Process our artists
+
+	if (artists_rc != SQLITE_OK) { // Failed to get our artists
+		g_critical("Failed to read our artists: %s", sqlite3_errmsg(koto_db));
+		return;
+	}
+
+	int playlist_rc = sqlite3_exec(koto_db, "SELECT * FROM playlist_meta", process_playlists, NULL, NULL); // Process our playlists
+
+	if (playlist_rc != SQLITE_OK) { // Failed to get our playlists
+		g_critical("Failed to read our playlists: %s", sqlite3_errmsg(koto_db));
+		return;
+	}
+}
\ No newline at end of file
diff --git a/src/db/loaders.h b/src/db/loaders.h
new file mode 100644
index 0000000..7f6b04e
--- /dev/null
+++ b/src/db/loaders.h
@@ -0,0 +1,53 @@
+/* loaders.h
+ *
+ * Copyright 2021 Joshua Strobl
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * 	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+int process_artists(
+	void * data,
+	int num_columns,
+	char ** fields,
+	char ** column_names
+);
+
+int process_albums(
+	void * data,
+	int num_columns,
+	char ** fields,
+	char ** column_names
+);
+
+int process_playlists(
+	void * data,
+	int num_columns,
+	char ** fields,
+	char ** column_names
+);
+
+int process_playlists_tracks(
+	void * data,
+	int num_columns,
+	char ** fields,
+	char ** column_names
+);
+
+int process_tracks(
+	void * data,
+	int num_columns,
+	char ** fields,
+	char ** column_names
+);
+
+void read_from_db();
\ No newline at end of file
diff --git a/src/indexer/file-indexer.c b/src/indexer/file-indexer.c
index e3e6356..d5c69a2 100644
--- a/src/indexer/file-indexer.c
+++ b/src/indexer/file-indexer.c
@@ -22,8 +22,8 @@
 #include <taglib/tag_c.h>
 #include "../db/cartographer.h"
 #include "../db/db.h"
+#include "../db/loaders.h"
 #include "../playlist/playlist.h"
-#include "../koto-utils.h"
 #include "structs.h"
 
 extern KotoCartographer * koto_maps;
@@ -146,216 +146,7 @@ void koto_library_set_path(
 	if (created_new_db) { // Created new database
 		start_indexing(self); // Start index operation
 	} else { // Have existing database
-		read_from_db(self); // Read from the database
-	}
-}
-
-int process_artists(
-	void * data,
-	int num_columns,
-	char ** fields,
-	char ** column_names
-) {
-	(void) data;
-	(void) num_columns;
-	(void) column_names; // Don't need any of the params
-
-	gchar * artist_uuid = g_strdup(koto_utils_unquote_string(fields[0])); // First column is UUID
-	gchar * artist_path = g_strdup(koto_utils_unquote_string(fields[1])); // Second column is path
-	gchar * artist_name = g_strdup(koto_utils_unquote_string(fields[3])); // Fourth column is artist name
-
-	KotoArtist * artist = koto_artist_new_with_uuid(artist_uuid); // Create our artist with the UUID
-
-	g_object_set(
-		artist,
-		"path",
-		artist_path,         // Set path
-		"name",
-		artist_name,          // Set name
-		NULL);
-
-	koto_cartographer_add_artist(koto_maps, artist); // Add the artist to our global cartographer
-
-	int albums_rc = sqlite3_exec(koto_db, g_strdup_printf("SELECT * FROM albums WHERE artist_id=\"%s\"", artist_uuid), process_albums, artist, NULL); // Process our albums
-
-	if (albums_rc != SQLITE_OK) { // Failed to get our albums
-		g_critical("Failed to read our albums: %s", sqlite3_errmsg(koto_db));
-		return 1;
-	}
-
-	g_free(artist_uuid);
-	g_free(artist_path);
-	g_free(artist_name);
-
-	return 0;
-}
-
-int process_albums(
-	void * data,
-	int num_columns,
-	char ** fields,
-	char ** column_names
-) {
-	(void) num_columns;
-	(void) column_names; // Don't need these
-
-	KotoArtist * artist = (KotoArtist*) data;
-
-	gchar * album_uuid = g_strdup(koto_utils_unquote_string(fields[0]));
-	gchar * path = g_strdup(koto_utils_unquote_string(fields[1]));
-	gchar * artist_uuid = g_strdup(koto_utils_unquote_string(fields[2]));
-	gchar * album_name = g_strdup(koto_utils_unquote_string(fields[3]));
-	gchar * album_art = (fields[4] != NULL) ? g_strdup(koto_utils_unquote_string(fields[4])) : NULL;
-
-	KotoAlbum * album = koto_album_new_with_uuid(artist, album_uuid); // Create our album
-
-	g_object_set(
-		album,
-		"path",
-		path,         // Set the path
-		"name",
-		album_name,         // Set name
-		"art-path",
-		album_art,             // Set art path if any
-		NULL);
-
-	koto_cartographer_add_album(koto_maps, album); // Add the album to our global cartographer
-	koto_artist_add_album(artist, album_uuid); // Add the album
-
-	int tracks_rc = sqlite3_exec(koto_db, g_strdup_printf("SELECT * FROM tracks WHERE album_id=\"%s\"", album_uuid), process_tracks, album, NULL); // Process our tracks
-
-	if (tracks_rc != SQLITE_OK) { // Failed to get our tracks
-		g_critical("Failed to read our tracks: %s", sqlite3_errmsg(koto_db));
-		return 1;
-	}
-
-	g_free(album_uuid);
-	g_free(path);
-	g_free(artist_uuid);
-	g_free(album_name);
-
-	if (album_art != NULL) {
-		g_free(album_art);
-	}
-
-	return 0;
-}
-
-int process_playlists(
-	void * data,
-	int num_columns,
-	char ** fields,
-	char ** column_names
-) {
-	(void) data;
-	(void) num_columns;
-	(void) column_names; // Don't need any of the params
-
-	gchar * playlist_uuid = g_strdup(koto_utils_unquote_string(fields[0])); // First column is UUID
-	gchar * playlist_name = g_strdup(koto_utils_unquote_string(fields[1])); // Second column is playlist name
-	gchar * playlist_art_path = g_strdup(koto_utils_unquote_string(fields[2])); // Third column is any art path
-
-	KotoPlaylist * playlist = koto_playlist_new_with_uuid(playlist_uuid); // Create a playlist using the existing UUID
-
-	koto_playlist_set_name(playlist, playlist_name); // Add the playlist name
-	koto_playlist_set_artwork(playlist, playlist_art_path); // Add the playlist art path
-
-	koto_cartographer_add_playlist(koto_maps, playlist); // Add to cartographer
-
-	int playlist_tracks_rc = sqlite3_exec(koto_db, g_strdup_printf("SELECT * FROM playlist_tracks WHERE playlist_id=\"%s\" ORDER BY position ASC", playlist_uuid), process_playlists_tracks, playlist, NULL); // Process our playlist tracks
-
-	if (playlist_tracks_rc != SQLITE_OK) { // Failed to get our playlist tracks
-		g_critical("Failed to read our playlist tracks: %s", sqlite3_errmsg(koto_db));
-		return 1;
-	}
-
-	koto_playlist_mark_as_finalized(playlist); // Mark as finalized since loading should be complete
-
-	g_free(playlist_uuid);
-	g_free(playlist_name);
-	g_free(playlist_art_path);
-
-	return 0;
-}
-
-int process_playlists_tracks(
-	void * data,
-	int num_columns,
-	char ** fields,
-	char ** column_names
-) {
-	(void) data;
-	(void) num_columns;
-	(void) column_names; // Don't need these
-
-	gchar * playlist_uuid = g_strdup(koto_utils_unquote_string(fields[1]));
-	gchar * track_uuid = g_strdup(koto_utils_unquote_string(fields[2]));
-	gboolean current = g_strcmp0(koto_utils_unquote_string(fields[3]), "0");
-
-	KotoPlaylist * playlist = koto_cartographer_get_playlist_by_uuid(koto_maps, playlist_uuid); // Get the playlist
-	KotoTrack * track = koto_cartographer_get_track_by_uuid(koto_maps, track_uuid); // Get the track
-
-	if (!KOTO_IS_PLAYLIST(playlist)) {
-		goto freeforret;
-	}
-
-	koto_playlist_add_track(playlist, track, current, FALSE); // Add the track to the playlist but don't re-commit to the table
-
-freeforret:
-	g_free(playlist_uuid);
-	g_free(track_uuid);
-
-	return 0;
-}
-
-int process_tracks(
-	void * data,
-	int num_columns,
-	char ** fields,
-	char ** column_names
-) {
-	(void) num_columns;
-	(void) column_names; // Don't need these
-
-	KotoAlbum * album = (KotoAlbum*) data;
-	gchar * track_uuid = g_strdup(koto_utils_unquote_string(fields[0]));
-	gchar * path = g_strdup(koto_utils_unquote_string(fields[1]));
-	gchar * artist_uuid = g_strdup(koto_utils_unquote_string(fields[3]));
-	gchar * album_uuid = g_strdup(koto_utils_unquote_string(fields[4]));
-	gchar * file_name = g_strdup(koto_utils_unquote_string(fields[5]));
-	gchar * name = g_strdup(koto_utils_unquote_string(fields[6]));
-	guint * disc_num = (guint*) g_ascii_strtoull(fields[7], NULL, 10);
-	guint * position = (guint*) g_ascii_strtoull(fields[8], NULL, 10);
-
-	KotoTrack * track = koto_track_new_with_uuid(track_uuid); // Create our file
-
-	g_object_set(track, "artist-uuid", artist_uuid, "album-uuid", album_uuid, "path", path, "file-name", file_name, "parsed-name", name, "cd", disc_num, "position", position, NULL);
-
-	koto_album_add_track(album, track); // Add the track
-
-	g_free(track_uuid);
-	g_free(path);
-	g_free(artist_uuid);
-	g_free(album_uuid);
-	g_free(file_name);
-	g_free(name);
-
-	return 0;
-}
-
-void read_from_db(KotoLibrary * self) {
-	int artists_rc = sqlite3_exec(koto_db, "SELECT * FROM artists", process_artists, self, NULL); // Process our artists
-
-	if (artists_rc != SQLITE_OK) { // Failed to get our artists
-		g_critical("Failed to read our artists: %s", sqlite3_errmsg(koto_db));
-		return;
-	}
-
-	int playlist_rc = sqlite3_exec(koto_db, "SELECT * FROM playlist_meta", process_playlists, self, NULL); // Process our playlists
-
-	if (playlist_rc != SQLITE_OK) { // Failed to get our playlists
-		g_critical("Failed to read our playlists: %s", sqlite3_errmsg(koto_db));
-		return;
+		read_from_db(NULL); // Read from the database
 	}
 }
 
diff --git a/src/indexer/structs.h b/src/indexer/structs.h
index f293ad7..1753df2 100644
--- a/src/indexer/structs.h
+++ b/src/indexer/structs.h
@@ -58,43 +58,6 @@ void koto_library_set_path(
 	gchar * path
 );
 
-int process_artists(
-	void * data,
-	int num_columns,
-	char ** fields,
-	char ** column_names
-);
-
-int process_albums(
-	void * data,
-	int num_columns,
-	char ** fields,
-	char ** column_names
-);
-
-int process_playlists(
-	void * data,
-	int num_columns,
-	char ** fields,
-	char ** column_names
-);
-
-int process_playlists_tracks(
-	void * data,
-	int num_columns,
-	char ** fields,
-	char ** column_names
-);
-
-int process_tracks(
-	void * data,
-	int num_columns,
-	char ** fields,
-	char ** column_names
-);
-
-void read_from_db(KotoLibrary * self);
-
 void start_indexing(KotoLibrary * self);
 
 void index_folder(
diff --git a/src/meson.build b/src/meson.build
index 4011c07..5a030de 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -10,6 +10,7 @@ koto_sources = [
 	'config/config.c',
 	'db/cartographer.c',
 	'db/db.c',
+	'db/loaders.c',
 	'indexer/album.c',
 	'indexer/artist.c',
 	'indexer/file-indexer.c',