diff --git a/docs/notebooks/adler_phasecurve_example.ipynb b/docs/notebooks/adler_phasecurve_example.ipynb
index 6e64763..4197f1b 100644
--- a/docs/notebooks/adler_phasecurve_example.ipynb
+++ b/docs/notebooks/adler_phasecurve_example.ipynb
@@ -16,7 +16,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from adler.dataclasses.AdlerPlanetoid import AdlerPlanetoid\n",
+    "from adler.objectdata.AdlerPlanetoid import AdlerPlanetoid\n",
     "from adler.science.PhaseCurve import PhaseCurve\n",
     "\n",
     "import numpy as np\n",
@@ -351,7 +351,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.14"
+   "version": "3.10.13"
   }
  },
  "nbformat": 4,
diff --git a/docs/notebooks/colour_functions_example.ipynb b/docs/notebooks/colour_functions_example.ipynb
index ec57c97..549354d 100644
--- a/docs/notebooks/colour_functions_example.ipynb
+++ b/docs/notebooks/colour_functions_example.ipynb
@@ -17,8 +17,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from adler.dataclasses.AdlerPlanetoid import AdlerPlanetoid\n",
-    "from adler.dataclasses.AdlerData import AdlerData\n",
+    "from adler.objectdata.AdlerPlanetoid import AdlerPlanetoid\n",
+    "from adler.objectdata.AdlerData import AdlerData\n",
     "from adler.science.PhaseCurve import PhaseCurve\n",
     "from adler.science.Colour import col_obs_ref\n",
     "from adler.utilities.plotting_utilities import plot_errorbar\n",
@@ -383,7 +383,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.19"
+   "version": "3.10.13"
   }
  },
  "nbformat": 4,
diff --git a/docs/notebooks/outlier_detection_example.ipynb b/docs/notebooks/outlier_detection_example.ipynb
index 984375d..f3af189 100644
--- a/docs/notebooks/outlier_detection_example.ipynb
+++ b/docs/notebooks/outlier_detection_example.ipynb
@@ -16,9 +16,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from adler.dataclasses.AdlerPlanetoid import AdlerPlanetoid\n",
+    "from adler.objectdata.AdlerPlanetoid import AdlerPlanetoid\n",
     "from adler.science.PhaseCurve import PhaseCurve\n",
-    "from adler.dataclasses.AdlerData import AdlerData\n",
+    "from adler.objectdata.AdlerData import AdlerData\n",
     "import adler.utilities.science_utilities as utils\n",
     "\n",
     "import numpy as np\n",
@@ -296,7 +296,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.19"
+   "version": "3.10.13"
   }
  },
  "nbformat": 4,
diff --git a/docs/notebooks/plotting_utilities_example.ipynb b/docs/notebooks/plotting_utilities_example.ipynb
index c18cccd..68536c8 100644
--- a/docs/notebooks/plotting_utilities_example.ipynb
+++ b/docs/notebooks/plotting_utilities_example.ipynb
@@ -16,7 +16,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from adler.dataclasses.AdlerPlanetoid import AdlerPlanetoid\n",
+    "from adler.objectdata.AdlerPlanetoid import AdlerPlanetoid\n",
     "from adler.science.PhaseCurve import PhaseCurve\n",
     "from adler.utilities.plotting_utilities import plot_errorbar\n",
     "\n",
@@ -251,7 +251,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.19"
+   "version": "3.10.13"
   }
  },
  "nbformat": 4,
diff --git a/notebooks/adler_demo/adler_demo.ipynb b/notebooks/adler_demo/adler_demo.ipynb
index 5694d63..f8fed9c 100644
--- a/notebooks/adler_demo/adler_demo.ipynb
+++ b/notebooks/adler_demo/adler_demo.ipynb
@@ -15,7 +15,7 @@
    },
    "outputs": [],
    "source": [
-    "from adler.dataclasses.AdlerPlanetoid import AdlerPlanetoid\n",
+    "from adler.objectdata.AdlerPlanetoid import AdlerPlanetoid\n",
     "from adler.science.PhaseCurve import PhaseCurve\n",
     "from adler.utilities.plotting_utilities import plot_errorbar\n",
     "import adler.utilities.science_utilities as sci_utils\n",
@@ -568,9 +568,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "adler-dev",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
-   "name": "adler-dev"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
@@ -582,7 +582,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.14"
+   "version": "3.10.13"
   }
  },
  "nbformat": 4,
diff --git a/notebooks/adler_examples.ipynb b/notebooks/adler_examples.ipynb
index 6c4d4f1..d29d232 100644
--- a/notebooks/adler_examples.ipynb
+++ b/notebooks/adler_examples.ipynb
@@ -7,7 +7,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from adler.dataclasses.AdlerPlanetoid import AdlerPlanetoid\n",
+    "from adler.objectdata.AdlerPlanetoid import AdlerPlanetoid\n",
     "from adler.science.PhaseCurve import PhaseCurve\n",
     "\n",
     "import numpy as np\n",
@@ -324,9 +324,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "adler-dev",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
-   "name": "adler-dev"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
diff --git a/notebooks/adlerdata_in_and_out.ipynb b/notebooks/adlerdata_in_and_out.ipynb
index 22b68c5..344ac69 100644
--- a/notebooks/adlerdata_in_and_out.ipynb
+++ b/notebooks/adlerdata_in_and_out.ipynb
@@ -10,8 +10,8 @@
     "import pandas as pd\n",
     "import sqlite3\n",
     "\n",
-    "from adler.dataclasses.AdlerData import AdlerData\n",
-    "from adler.dataclasses.AdlerPlanetoid import AdlerPlanetoid\n",
+    "from adler.objectdata.AdlerData import AdlerData\n",
+    "from adler.objectdata.AdlerPlanetoid import AdlerPlanetoid\n",
     "from adler.utilities.tests_utilities import get_test_data_filepath"
    ]
   },
diff --git a/notebooks/colour_functions_demo.ipynb b/notebooks/colour_functions_demo.ipynb
index 902f481..48d43d0 100644
--- a/notebooks/colour_functions_demo.ipynb
+++ b/notebooks/colour_functions_demo.ipynb
@@ -27,8 +27,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from adler.dataclasses.AdlerPlanetoid import AdlerPlanetoid\n",
-    "from adler.dataclasses.AdlerData import AdlerData\n",
+    "from adler.objectdata.AdlerPlanetoid import AdlerPlanetoid\n",
+    "from adler.objectdata.AdlerData import AdlerData\n",
     "from adler.science.PhaseCurve import PhaseCurve\n",
     "from adler.science.Colour import col_obs_ref\n",
     "from adler.utilities.plotting_utilities import plot_errorbar\n",
@@ -369,9 +369,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "adler-dev",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
-   "name": "adler-dev"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
@@ -383,7 +383,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.14"
+   "version": "3.10.13"
   }
  },
  "nbformat": 4,
diff --git a/notebooks/colour_functions_testing.ipynb b/notebooks/colour_functions_testing.ipynb
index b1a2947..212fa97 100644
--- a/notebooks/colour_functions_testing.ipynb
+++ b/notebooks/colour_functions_testing.ipynb
@@ -27,8 +27,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from adler.dataclasses.AdlerPlanetoid import AdlerPlanetoid\n",
-    "from adler.dataclasses.AdlerData import AdlerData\n",
+    "from adler.objectdata.AdlerPlanetoid import AdlerPlanetoid\n",
+    "from adler.objectdata.AdlerData import AdlerData\n",
     "from adler.science.PhaseCurve import PhaseCurve\n",
     "from adler.science.Colour import col_obs_ref\n",
     "from adler.utilities.plotting_utilities import plot_errorbar\n",
@@ -2035,9 +2035,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "adler-dev",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
-   "name": "adler-dev"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
@@ -2049,7 +2049,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.14"
+   "version": "3.10.13"
   }
  },
  "nbformat": 4,
diff --git a/notebooks/outlier_detection.ipynb b/notebooks/outlier_detection.ipynb
index 3d38b6b..2234d64 100644
--- a/notebooks/outlier_detection.ipynb
+++ b/notebooks/outlier_detection.ipynb
@@ -7,9 +7,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from adler.dataclasses.AdlerPlanetoid import AdlerPlanetoid\n",
+    "from adler.objectdata.AdlerPlanetoid import AdlerPlanetoid\n",
     "from adler.science.PhaseCurve import PhaseCurve\n",
-    "from adler.dataclasses.AdlerData import AdlerData\n",
+    "from adler.objectdata.AdlerData import AdlerData\n",
     "import adler.utilities.science_utilities as utils\n",
     "\n",
     "import numpy as np\n",
@@ -275,9 +275,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "adler-dev",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
-   "name": "adler-dev"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
diff --git a/notebooks/plotting_utilities.ipynb b/notebooks/plotting_utilities.ipynb
index 3b1071c..b371cf4 100644
--- a/notebooks/plotting_utilities.ipynb
+++ b/notebooks/plotting_utilities.ipynb
@@ -27,7 +27,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from adler.dataclasses.AdlerPlanetoid import AdlerPlanetoid\n",
+    "from adler.objectdata.AdlerPlanetoid import AdlerPlanetoid\n",
     "from adler.science.PhaseCurve import PhaseCurve\n",
     "from adler.utilities.plotting_utilities import plot_errorbar\n",
     "\n",
@@ -246,9 +246,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "adler-dev",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
-   "name": "adler-dev"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {