diff --git a/.github/workflows/root.yml b/.github/workflows/root.yml
index fb27755..4a3111c 100644
--- a/.github/workflows/root.yml
+++ b/.github/workflows/root.yml
@@ -103,7 +103,7 @@ jobs:
 
       - name: Create ROOT example plot using C++
         run: |
-          export ROOT_INCLUDE_PATH=$GITHUB_WORKSPACE/src/root/cpp/include:${ROOT_INCLUDE_PATH}
+          export ROOT_INCLUDE_PATH=$GITHUB_WORKSPACE/src/dunestyle/data:${ROOT_INCLUDE_PATH}
           cd $GITHUB_WORKSPACE/examples/root/cpp
           root -b -q example.C
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7469bd5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,15 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# Ignoring plot results
+*.pdf
+*.png
+!examples/images/*.png
+
+# Distribution / packaging
+build/
+*.egg-info/
+
+
diff --git a/setup.cfg b/setup.cfg
index c40e729..ee5d560 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,15 +17,9 @@ operating system :: OS Independent
 python_requires = >=3.9
 install_requires =
 package_dir=
-    dunestyle = src
-    dunestyle.matplotlib = src/matplotlib/python
-    dunestyle.root = src/root/python
-    dunestyle.data = src/root/cpp/include
-    dunestyle.stylelib = src/matplotlib/stylelib
+    = src
 packages =
     dunestyle
-    dunestyle.matplotlib
-    dunestyle.root
     dunestyle.data
     dunestyle.stylelib
 
diff --git a/src/__init__.py b/src/__init__.py
deleted file mode 100644
index 2970f18..0000000
--- a/src/__init__.py
+++ /dev/null
@@ -1,9 +0,0 @@
-"""
-DUNE plot style tools: provides tools for making plots adhere to DUNE style.
-
-Contains two independent implementations: one for PyROOT (dunestyle.root) and one for matplotlib (dunestyle.matplotlib).
-We suggest importing the one you prefer like:
-  from dunestyle import matplotlib as dunestyle
-
-Then all of the relevant functions will be exposed as `dunestyle.____`.
-"""
diff --git a/src/matplotlib/python/__init__.py b/src/dunestyle/__init__.py
similarity index 96%
rename from src/matplotlib/python/__init__.py
rename to src/dunestyle/__init__.py
index 48a472c..d471272 100644
--- a/src/matplotlib/python/__init__.py
+++ b/src/dunestyle/__init__.py
@@ -15,4 +15,3 @@
 except:
     pass
 
-from .dunestyle import *
diff --git a/src/root/cpp/include/DUNEStyle.h b/src/dunestyle/data/DUNEStyle.h
similarity index 100%
rename from src/root/cpp/include/DUNEStyle.h
rename to src/dunestyle/data/DUNEStyle.h
diff --git a/src/matplotlib/__init__.py b/src/dunestyle/data/__init__.py
similarity index 100%
rename from src/matplotlib/__init__.py
rename to src/dunestyle/data/__init__.py
diff --git a/src/matplotlib/python/dunestyle.py b/src/dunestyle/matplotlib.py
similarity index 100%
rename from src/matplotlib/python/dunestyle.py
rename to src/dunestyle/matplotlib.py
diff --git a/src/root/python/dunestyle.py b/src/dunestyle/root.py
similarity index 100%
rename from src/root/python/dunestyle.py
rename to src/dunestyle/root.py
diff --git a/src/dunestyle/stylelib/__init__.py b/src/dunestyle/stylelib/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/matplotlib/stylelib/dune.mplstyle b/src/dunestyle/stylelib/dune.mplstyle
similarity index 100%
rename from src/matplotlib/stylelib/dune.mplstyle
rename to src/dunestyle/stylelib/dune.mplstyle
diff --git a/src/root/__init__.py b/src/root/__init__.py
deleted file mode 100644
index 5de8af2..0000000
--- a/src/root/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .python import *
diff --git a/src/root/python/__init__.py b/src/root/python/__init__.py
deleted file mode 100644
index 1ad6d0e..0000000
--- a/src/root/python/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .dunestyle import *