diff --git a/archeryutils/__init__.py b/archeryutils/__init__.py
index c022cb1..5e4f2a3 100644
--- a/archeryutils/__init__.py
+++ b/archeryutils/__init__.py
@@ -1,12 +1,15 @@
 """Package providing code for various archery utilities."""
 
-from archeryutils import load_rounds, rounds, targets
+from archeryutils.targets import Target
+from archeryutils.rounds import Pass, Round
 from archeryutils.handicaps import handicap_equations, handicap_functions
 from archeryutils import classifications
 
+
 __all__ = [
-    "rounds",
-    "targets",
+    "Target",
+    "Pass",
+    "Round",
     "handicap_equations",
     "handicap_functions",
     "classifications",
diff --git a/examples.ipynb b/examples.ipynb
index 05750bf..5f6f5c0 100644
--- a/examples.ipynb
+++ b/examples.ipynb
@@ -34,7 +34,7 @@
    "metadata": {},
    "source": [
     "## 1. Basic Building Blocks\n",
-    "The basic building blocks of the archeryutils package are the `targets.Target` and the `rounds.Round` class.\n",
+    "The basic building blocks of the archeryutils package are the `Target` and the `Round` classes.\n",
     "\n",
     "### Target\n",
     "\n",
@@ -69,7 +69,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "my720target = au.targets.Target(\"10_zone\", 122, 70.0)"
+    "my720target = au.Target(\"10_zone\", 122, 70.0)"
    ]
   },
   {
@@ -87,7 +87,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mycompound720target = au.targets.Target(\"10_zone_6_ring\", 80, 50.0)"
+    "mycompound720target = au.Target(\"10_zone_6_ring\", 80, 50.0)"
    ]
   },
   {
@@ -111,7 +111,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "myWorcesterTarget = au.targets.Target(\n",
+    "myWorcesterTarget = au.Target(\n",
     "    \"Worcester\", diameter=(16, \"inches\"), distance=(20.0, \"yards\"), indoor=True\n",
     ")"
    ]
@@ -131,7 +131,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "myIFAATarget = au.targets.Target(\"IFAA_field\", diameter=80, distance=(80.0, \"yards\"))"
+    "myIFAATarget = au.Target(\"IFAA_field\", diameter=80, distance=(80.0, \"yards\"))"
    ]
   },
   {
@@ -174,7 +174,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "my70mPass = au.rounds.Pass(36, \"10_zone\", 122, 70.0)"
+    "my70mPass = au.Pass(36, \"10_zone\", 122, 70.0)"
    ]
   },
   {
@@ -222,7 +222,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "my720Round = au.rounds.Round(\n",
+    "my720Round = au.Round(\n",
     "    \"WA 720 (70m)\",\n",
     "    [my70mPass, my70mPass],\n",
     "    location=\"Outdoor Target\",\n",