diff --git a/km3io/definitions/fitparameters.py b/km3io/definitions/fitparameters.py
new file mode 100644
index 0000000000000000000000000000000000000000..87c234c29992d2d976bc42e110822531f70b3684
--- /dev/null
+++ b/km3io/definitions/fitparameters.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+"""
+KM3NeT Data Definitions v1.1.1
+https://git.km3net.de/common/km3net-dataformat
+"""
+
+# fitparameters
+data = {
+    "JGANDALF_BETA0_RAD": 0
+    "JGANDALF_BETA1_RAD": 1
+    "JGANDALF_CHI2": 2
+    "JGANDALF_NUMBER_OF_HITS": 3
+    "JENERGY_ENERGY": 4
+    "JENERGY_CHI2": 5
+    "JGANDALF_LAMBDA": 6
+    "JGANDALF_NUMBER_OF_ITERATIONS": 7
+    "JSTART_NPE_MIP": 8
+    "JSTART_NPE_MIP_TOTAL": 9
+    "JSTART_LENGTH_METRES": 10
+    "JVETO_NPE": 11
+    "JVETO_NUMBER_OF_HITS": 12
+    "JENERGY_MUON_RANGE_METRES": 13
+    "JENERGY_NOISE_LIKELIHOOD": 14
+    "JENERGY_NDF": 15
+    "JENERGY_NUMBER_OF_HITS": 16
+    "JCOPY_Z_M": 17
+}
diff --git a/km3io/definitions/reconstruction.py b/km3io/definitions/reconstruction.py
new file mode 100644
index 0000000000000000000000000000000000000000..179b54331391016a6904917e66df897626257d47
--- /dev/null
+++ b/km3io/definitions/reconstruction.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+"""
+KM3NeT Data Definitions v1.1.1
+https://git.km3net.de/common/km3net-dataformat
+"""
+
+# reconstruction
+data = {
+    "JPP_RECONSTRUCTION_TYPE": 4000
+    "JMUONFIT": 0
+    "JMUONBEGIN": 0
+    "JMUONPREFIT": 1
+    "JMUONSIMPLEX": 2
+    "JMUONGANDALF": 3
+    "JMUONENERGY": 4
+    "JMUONSTART": 5
+    "JLINEFIT": 6
+    "JMUONEND": 99
+    "JSHOWERFIT": 100
+    "JSHOWERBEGIN": 100
+    "JSHOWERPREFIT": 101
+    "JSHOWERPOSITIONFIT": 102
+    "JSHOWERCOMPLETEFIT": 103
+    "JSHOWER_BJORKEN_Y": 104
+    "JSHOWEREND": 199
+    "DUSJSHOWERFIT": 200
+    "DUSJBEGIN": 200
+    "DUSJPREFIT": 201
+    "DUSJPOSITIONFIT": 202
+    "JDUSJCOMPLETEFIT": 203
+    "DUSJEND": 299
+    "AASHOWERFIT": 300
+    "AASHOWERBEGIN": 300
+    "AASHOWERCOMPLETEFIT": 301
+    "AASHOWEREND": 399
+    "JUSERBEGIN": 1000
+    "JMUONVETO": 1001
+    "JMUONPATH": 1003
+    "JMCEVT": 1004
+    "JUSEREND": 1099
+    "RECTYPE_UNKNOWN": -1
+    "RECSTAGE_UNKNOWN": -1
+}
diff --git a/km3io/definitions/trigger.py b/km3io/definitions/trigger.py
new file mode 100644
index 0000000000000000000000000000000000000000..f52353f6ae9df0eb2f1f8d4ec7b75d5419543bb1
--- /dev/null
+++ b/km3io/definitions/trigger.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+"""
+KM3NeT Data Definitions v1.1.1
+https://git.km3net.de/common/km3net-dataformat
+"""
+
+# trigger
+data = {
+    "JTRIGGER3DSHOWER": 1
+    "JTRIGGERMXSHOWER": 2
+    "JTRIGGER3DMUON": 4
+    "JTRIGGERNB": 5
+}
diff --git a/km3io/fitparameters.py b/km3io/fitparameters.py
deleted file mode 100644
index 72447652965f230f621253a67eef52652ba9747c..0000000000000000000000000000000000000000
--- a/km3io/fitparameters.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-KM3NeT Data Definitions v1.0.1
-https://git.km3net.de/common/data-format
-"""
-
-# fitparameters
-JGANDALF_BETA0_RAD = 0
-JGANDALF_BETA1_RAD = 1
-JGANDALF_CHI2 = 2
-JGANDALF_NUMBER_OF_HITS = 3
-JENERGY_ENERGY = 4
-JENERGY_CHI2 = 5
-JGANDALF_LAMBDA = 6
-JGANDALF_NUMBER_OF_ITERATIONS = 7
-JSTART_NPE_MIP = 8
-JSTART_NPE_MIP_TOTAL = 9
-JSTART_LENGTH_METRES = 10
-JVETO_NPE = 11
-JVETO_NUMBER_OF_HITS = 12
-JENERGY_MUON_RANGE_METRES = 13
-JENERGY_NOISE_LIKELIHOOD = 14
-JENERGY_NDF = 15
-JENERGY_NUMBER_OF_HITS = 16
-JCOPY_Z_M = 17
diff --git a/km3io/reconstruction.py b/km3io/reconstruction.py
deleted file mode 100644
index e981c9b792f5dcff6a59e72c246bddf3110a4612..0000000000000000000000000000000000000000
--- a/km3io/reconstruction.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-KM3NeT Data Definitions v1.0.1
-https://git.km3net.de/common/data-format
-"""
-
-# reconstruction
-JMUONFIT = 0
-JMUONBEGIN = 0
-JMUONPREFIT = 1
-JMUONSIMPLEX = 2
-JMUONGANDALF = 3
-JMUONENERGY = 4
-JMUONSTART = 5
-JLINEFIT = 6
-JMUONEND = 99
-JSHOWERFIT = 100
-JSHOWERBEGIN = 100
-JSHOWERPREFIT = 101
-JSHOWERPOSITIONFIT = 102
-JSHOWERCOMPLETEFIT = 103
-JSHOWER_BJORKEN_Y = 104
-JSHOWEREND = 199
-DUSJSHOWERFIT = 200
-DUSJBEGIN = 200
-DUSJPREFIT = 201
-DUSJPOSITIONFIT = 202
-JDUSJCOMPLETEFIT = 203
-DUSJEND = 299
-AASHOWERFIT = 300
-AASHOWERBEGIN = 300
-AASHOWERCOMPLETEFIT = 301
-AASHOWEREND = 399
-JUSERBEGIN = 1000
-JMUONVETO = 1001
-JMUONPATH = 1003
-JMCEVT = 1004
-JUSEREND = 1099
-RECTYPE_UNKNOWN = -1
-RECSTAGE_UNKNOWN = -1
diff --git a/km3io/trigger.py b/km3io/trigger.py
deleted file mode 100644
index 6198b4262362c94e48d193f9708396092d888088..0000000000000000000000000000000000000000
--- a/km3io/trigger.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-KM3NeT Data Definitions v1.0.1
-https://git.km3net.de/common/data-format
-"""
-
-# trigger
-JTRIGGER3DSHOWER = 1
-JTRIGGERMXSHOWER = 2
-JTRIGGER3DMUON = 4
-JTRIGGERNB = 5