diff --git a/scrobblers/maloja-scrobbler.zip b/auxiliary/chromium_scrobbler/maloja-scrobbler.zip
similarity index 100%
rename from scrobblers/maloja-scrobbler.zip
rename to auxiliary/chromium_scrobbler/maloja-scrobbler.zip
diff --git a/scrobblers/chromium/background.js b/auxiliary/chromium_scrobbler/maloja-scrobbler/background.js
similarity index 100%
rename from scrobblers/chromium/background.js
rename to auxiliary/chromium_scrobbler/maloja-scrobbler/background.js
diff --git a/scrobblers/chromium/icon128.png b/auxiliary/chromium_scrobbler/maloja-scrobbler/icon128.png
similarity index 100%
rename from scrobblers/chromium/icon128.png
rename to auxiliary/chromium_scrobbler/maloja-scrobbler/icon128.png
diff --git a/scrobblers/chromium/icon256.png b/auxiliary/chromium_scrobbler/maloja-scrobbler/icon256.png
similarity index 100%
rename from scrobblers/chromium/icon256.png
rename to auxiliary/chromium_scrobbler/maloja-scrobbler/icon256.png
diff --git a/scrobblers/chromium/icon48.png b/auxiliary/chromium_scrobbler/maloja-scrobbler/icon48.png
similarity index 100%
rename from scrobblers/chromium/icon48.png
rename to auxiliary/chromium_scrobbler/maloja-scrobbler/icon48.png
diff --git a/scrobblers/chromium/manifest.json b/auxiliary/chromium_scrobbler/maloja-scrobbler/manifest.json
similarity index 100%
rename from scrobblers/chromium/manifest.json
rename to auxiliary/chromium_scrobbler/maloja-scrobbler/manifest.json
diff --git a/scrobblers/chromium/settings.html b/auxiliary/chromium_scrobbler/maloja-scrobbler/settings.html
similarity index 100%
rename from scrobblers/chromium/settings.html
rename to auxiliary/chromium_scrobbler/maloja-scrobbler/settings.html
diff --git a/scrobblers/chromium/settings.js b/auxiliary/chromium_scrobbler/maloja-scrobbler/settings.js
similarity index 100%
rename from scrobblers/chromium/settings.js
rename to auxiliary/chromium_scrobbler/maloja-scrobbler/settings.js
diff --git a/scrobblers/chromium/sites/bandcamp.js b/auxiliary/chromium_scrobbler/maloja-scrobbler/sites/bandcamp.js
similarity index 100%
rename from scrobblers/chromium/sites/bandcamp.js
rename to auxiliary/chromium_scrobbler/maloja-scrobbler/sites/bandcamp.js
diff --git a/scrobblers/chromium/sites/plex.js b/auxiliary/chromium_scrobbler/maloja-scrobbler/sites/plex.js
similarity index 100%
rename from scrobblers/chromium/sites/plex.js
rename to auxiliary/chromium_scrobbler/maloja-scrobbler/sites/plex.js
diff --git a/scrobblers/chromium/sites/soundcloud.js b/auxiliary/chromium_scrobbler/maloja-scrobbler/sites/soundcloud.js
similarity index 100%
rename from scrobblers/chromium/sites/soundcloud.js
rename to auxiliary/chromium_scrobbler/maloja-scrobbler/sites/soundcloud.js
diff --git a/scrobblers/chromium/sites/spotify.js b/auxiliary/chromium_scrobbler/maloja-scrobbler/sites/spotify.js
similarity index 100%
rename from scrobblers/chromium/sites/spotify.js
rename to auxiliary/chromium_scrobbler/maloja-scrobbler/sites/spotify.js
diff --git a/scrobblers/chromium/sites/ytmusic.js b/auxiliary/chromium_scrobbler/maloja-scrobbler/sites/ytmusic.js
similarity index 100%
rename from scrobblers/chromium/sites/ytmusic.js
rename to auxiliary/chromium_scrobbler/maloja-scrobbler/sites/ytmusic.js
diff --git a/scrobblers/chromium/sitescript.js b/auxiliary/chromium_scrobbler/maloja-scrobbler/sitescript.js
similarity index 100%
rename from scrobblers/chromium/sitescript.js
rename to auxiliary/chromium_scrobbler/maloja-scrobbler/sitescript.js
diff --git a/scrobblers/chromium/update_scrobbler.sh b/auxiliary/chromium_scrobbler/maloja-scrobbler/update_scrobbler.sh
similarity index 100%
rename from scrobblers/chromium/update_scrobbler.sh
rename to auxiliary/chromium_scrobbler/maloja-scrobbler/update_scrobbler.sh
diff --git a/malojalib/README.md b/auxiliary/malojalib/README.md
similarity index 100%
rename from malojalib/README.md
rename to auxiliary/malojalib/README.md
diff --git a/malojalib/__init__.py b/auxiliary/malojalib/malojalib/__init__.py
similarity index 100%
rename from malojalib/__init__.py
rename to auxiliary/malojalib/malojalib/__init__.py
diff --git a/auxiliary/malojalib/pyproject.toml b/auxiliary/malojalib/pyproject.toml
new file mode 100644
index 0000000..0b2eb1a
--- /dev/null
+++ b/auxiliary/malojalib/pyproject.toml
@@ -0,0 +1,28 @@
+[project]
+name = "maloja-lib"
+version = "1.0.0"
+description = "Utilities to interact with Maloja servers"
+readme = "./README.md"
+requires-python = ">=3.6"
+license = { file="../../LICENSE" }
+authors = [ { name="Johannes Krattenmacher", email="maloja@dev.krateng.ch" } ]
+
+urls.repository = "https://github.com/krateng/maloja"
+urls.documentation = "https://github.com/krateng/maloja"
+
+keywords = ["scrobbling", "music", "library", "api"]
+classifiers = [
+	"Programming Language :: Python :: 3",
+	"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+	"Operating System :: OS Independent"
+]
+
+dependencies = [
+	"requests"
+]
+
+[project.scripts]
+
+[build-system]
+requires = ["flit_core >=3.2,<4"]
+build-backend = "flit_core.buildapi"
diff --git a/malojalib/__pkginfo__.py b/malojalib/__pkginfo__.py
deleted file mode 100644
index 5a69fc4..0000000
--- a/malojalib/__pkginfo__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-name = "maloja-lib"
-desc = "Utilities to interact with Maloja servers"
-author = {
-	"name":"Johannes Krattenmacher",
-	"email":"maloja@dev.krateng.ch",
-	"github": "krateng"
-}
-version = 1,0,0
-versionstr = ".".join(str(n) for n in version)
-links = {
-	"pypi":"maloja-lib",
-	"github":"maloja"
-}
-python_version = ">=3.6"
-requires = [
-	"requests"
-]
-resources = [
-]
-
-commands = {
-}