diff --git a/mod.ts b/mod.ts
index 1184ab3..a1ca67a 100644
--- a/mod.ts
+++ b/mod.ts
@@ -1,9 +1 @@
-export * from "./setup.ts";
-
-export * from "./mixins/browsing.ts";
-export * from "./mixins/explore.ts";
-export * from "./mixins/library.ts";
-export * from "./mixins/playlist.ts";
-export * from "./mixins/queue.ts";
-export * from "./mixins/search.ts";
-export * from "./mixins/uploads.ts";
+export * from "./src/mod.ts";
diff --git a/auth.ts b/src/auth.ts
similarity index 98%
rename from auth.ts
rename to src/auth.ts
index 488902b..066219d 100644
--- a/auth.ts
+++ b/src/auth.ts
@@ -1,4 +1,4 @@
-import CONSTANTS from "./constants-ng.json" assert { type: "json" };
+import CONSTANTS from "../constants-ng.json" assert { type: "json" };
 import { RequestClient } from "./request.ts";
 import { use_proxy, wait } from "./util.ts";
 import { Store } from "./store.ts";
diff --git a/client.ts b/src/client.ts
similarity index 93%
rename from client.ts
rename to src/client.ts
index e9229a0..57cb99e 100644
--- a/client.ts
+++ b/src/client.ts
@@ -1,5 +1,5 @@
 import { RequiresLoginEvent } from "./auth.ts";
-import { get_album, get_album_browse_id, get_option, setup } from "./mod.ts";
+import { get_artist, get_option, setup } from "./mod.ts";
 import { FetchClient, RequestInit } from "./request.ts";
 import { DenoFileStore } from "./store.ts";
 import { debug } from "./util.ts";
@@ -118,13 +118,7 @@ auth.addEventListener("requires-login", (event) => {
 //     console.log(await data.text());
 //   });
 
-const id = await get_album_browse_id(
-  "OLAK5uy_nF6-ijLz9eO-DMZzhzneNclNBj74Jvjgo",
-);
-
-console.log("album browse id", id);
-
-get_album(id!)
+get_artist("UCzARU-Ev3-yyu3LovaxxaaA")
   // get_playlist("PLCwfwQhurMOukOqbFmYRidZ81ng_2iSUE")
   // .then((data) => {
   //   return get_queue(null, data.playlistId, { autoplay: true });
diff --git a/continuations.ts b/src/continuations.ts
similarity index 100%
rename from continuations.ts
rename to src/continuations.ts
diff --git a/deps.ts b/src/deps.ts
similarity index 100%
rename from deps.ts
rename to src/deps.ts
diff --git a/errors.ts b/src/errors.ts
similarity index 100%
rename from errors.ts
rename to src/errors.ts
diff --git a/locales/README.md b/src/locales/README.md
similarity index 100%
rename from locales/README.md
rename to src/locales/README.md
diff --git a/locales/get.ts b/src/locales/get.ts
similarity index 100%
rename from locales/get.ts
rename to src/locales/get.ts
diff --git a/locales/strings.ts b/src/locales/strings.ts
similarity index 100%
rename from locales/strings.ts
rename to src/locales/strings.ts
diff --git a/mixins/_request.ts b/src/mixins/_request.ts
similarity index 100%
rename from mixins/_request.ts
rename to src/mixins/_request.ts
diff --git a/mixins/browsing.ts b/src/mixins/browsing.ts
similarity index 100%
rename from mixins/browsing.ts
rename to src/mixins/browsing.ts
diff --git a/mixins/explore.ts b/src/mixins/explore.ts
similarity index 100%
rename from mixins/explore.ts
rename to src/mixins/explore.ts
diff --git a/mixins/library.ts b/src/mixins/library.ts
similarity index 100%
rename from mixins/library.ts
rename to src/mixins/library.ts
diff --git a/mixins/playlist.ts b/src/mixins/playlist.ts
similarity index 100%
rename from mixins/playlist.ts
rename to src/mixins/playlist.ts
diff --git a/mixins/queue.ts b/src/mixins/queue.ts
similarity index 100%
rename from mixins/queue.ts
rename to src/mixins/queue.ts
diff --git a/mixins/search.ts b/src/mixins/search.ts
similarity index 100%
rename from mixins/search.ts
rename to src/mixins/search.ts
diff --git a/mixins/uploads.ts b/src/mixins/uploads.ts
similarity index 100%
rename from mixins/uploads.ts
rename to src/mixins/uploads.ts
diff --git a/mixins/utils.ts b/src/mixins/utils.ts
similarity index 100%
rename from mixins/utils.ts
rename to src/mixins/utils.ts
diff --git a/src/mod.ts b/src/mod.ts
new file mode 100644
index 0000000..1184ab3
--- /dev/null
+++ b/src/mod.ts
@@ -0,0 +1,9 @@
+export * from "./setup.ts";
+
+export * from "./mixins/browsing.ts";
+export * from "./mixins/explore.ts";
+export * from "./mixins/library.ts";
+export * from "./mixins/playlist.ts";
+export * from "./mixins/queue.ts";
+export * from "./mixins/search.ts";
+export * from "./mixins/uploads.ts";
diff --git a/nav.ts b/src/nav.ts
similarity index 100%
rename from nav.ts
rename to src/nav.ts
diff --git a/parsers/albums.ts b/src/parsers/albums.ts
similarity index 100%
rename from parsers/albums.ts
rename to src/parsers/albums.ts
diff --git a/parsers/browsing.ts b/src/parsers/browsing.ts
similarity index 99%
rename from parsers/browsing.ts
rename to src/parsers/browsing.ts
index e0c78ac..f131fab 100644
--- a/parsers/browsing.ts
+++ b/src/parsers/browsing.ts
@@ -1,4 +1,4 @@
-import STRINGS from "../locales/strings.json" assert { type: "json" };
+import STRINGS from "../../locales/strings.json" assert { type: "json" };
 
 import {
   BADGE_LABEL,
diff --git a/parsers/explore.ts b/src/parsers/explore.ts
similarity index 100%
rename from parsers/explore.ts
rename to src/parsers/explore.ts
diff --git a/parsers/library.ts b/src/parsers/library.ts
similarity index 100%
rename from parsers/library.ts
rename to src/parsers/library.ts
diff --git a/parsers/playlists.ts b/src/parsers/playlists.ts
similarity index 100%
rename from parsers/playlists.ts
rename to src/parsers/playlists.ts
diff --git a/parsers/queue.ts b/src/parsers/queue.ts
similarity index 100%
rename from parsers/queue.ts
rename to src/parsers/queue.ts
diff --git a/parsers/search.ts b/src/parsers/search.ts
similarity index 100%
rename from parsers/search.ts
rename to src/parsers/search.ts
diff --git a/parsers/songs.ts b/src/parsers/songs.ts
similarity index 100%
rename from parsers/songs.ts
rename to src/parsers/songs.ts
diff --git a/parsers/types.d.ts b/src/parsers/types.d.ts
similarity index 100%
rename from parsers/types.d.ts
rename to src/parsers/types.d.ts
diff --git a/parsers/uploads.ts b/src/parsers/uploads.ts
similarity index 100%
rename from parsers/uploads.ts
rename to src/parsers/uploads.ts
diff --git a/parsers/util.ts b/src/parsers/util.ts
similarity index 100%
rename from parsers/util.ts
rename to src/parsers/util.ts
diff --git a/request.ts b/src/request.ts
similarity index 100%
rename from request.ts
rename to src/request.ts
diff --git a/setup.ts b/src/setup.ts
similarity index 100%
rename from setup.ts
rename to src/setup.ts
diff --git a/store.ts b/src/store.ts
similarity index 100%
rename from store.ts
rename to src/store.ts
diff --git a/util.ts b/src/util.ts
similarity index 100%
rename from util.ts
rename to src/util.ts
diff --git a/tests/util.ts b/tests/util.ts
index 6b34d23..b582754 100644
--- a/tests/util.ts
+++ b/tests/util.ts
@@ -1,11 +1,13 @@
-import { auth, init } from "../mod.ts";
-import { DenoFileStore } from "../store.ts";
+import { get_option, setup } from "../mod.ts";
+import { DenoFileStore } from "../src/store.ts";
 
 export * from "./asserts.ts";
 export * from "./deps.ts";
 export * from "../mod.ts";
 
-export const setup = async () => {
+const auth = get_option("auth");
+
+export const auth_flow = async () => {
   const css = {
     normal: "font-weight: normal",
     bold: "font-weight: bold",
@@ -38,11 +40,11 @@ export const setup = async () => {
 };
 
 export const init_client = () => {
-  const client = init({
+  const client = setup({
     store: new DenoFileStore("store/muse-store.json"),
   });
 
-  setup();
+  auth_flow();
 
   return client;
 };