From e3834802c31538e578649be5ba5337662f146ead Mon Sep 17 00:00:00 2001
From: Erik Christensen <erikchristensen@comcast.net>
Date: Mon, 1 Mar 2021 22:38:28 -0500
Subject: [PATCH 1/2] Rearrange serializer package structure

---
 .../extensions/parcelize/ranges => }/DateRangeTest.kt       | 4 ++--
 .../{io/islandtime/extensions/parcelize => }/DateTest.kt    | 4 ++--
 .../parcelize/ranges => }/DateTimeIntervalTest.kt           | 4 ++--
 .../islandtime/extensions/parcelize => }/DateTimeTest.kt    | 4 ++--
 .../extensions/parcelize/measures => }/DurationTest.kt      | 4 ++--
 .../extensions/parcelize/ranges => }/InstantIntervalTest.kt | 4 ++--
 .../{io/islandtime/extensions/parcelize => }/InstantTest.kt | 4 ++--
 .../parcelize/ranges => }/OffsetDateTimeIntervalTest.kt     | 4 ++--
 .../extensions/parcelize => }/OffsetDateTimeTest.kt         | 4 ++--
 .../islandtime/extensions/parcelize => }/OffsetTimeTest.kt  | 4 ++--
 .../extensions/parcelize/measures => }/PeriodTest.kt        | 4 ++--
 .../{io/islandtime/extensions/parcelize => }/TimeTest.kt    | 4 ++--
 .../islandtime/extensions/parcelize => }/TimeZoneTest.kt    | 2 +-
 .../islandtime/extensions/parcelize => }/YearMonthTest.kt   | 4 ++--
 .../parcelize/ranges => }/ZonedDateTimeIntervalTest.kt      | 4 ++--
 .../extensions/parcelize => }/ZonedDateTimeTest.kt          | 4 ++--
 .../extensions/parcelize => }/test/TestParcelable.kt        | 2 +-
 extensions/parcelize/src/main/AndroidManifest.xml           | 2 +-
 .../kotlin/{io/islandtime/extensions/parcelize => }/Date.kt | 2 +-
 .../extensions/parcelize/ranges => }/DateRange.kt           | 6 ++----
 .../{io/islandtime/extensions/parcelize => }/DateTime.kt    | 2 +-
 .../extensions/parcelize/ranges => }/DateTimeInterval.kt    | 4 +---
 .../extensions/parcelize/measures => }/Duration.kt          | 2 +-
 .../{io/islandtime/extensions/parcelize => }/Instant.kt     | 2 +-
 .../extensions/parcelize/ranges => }/InstantInterval.kt     | 6 ++----
 .../islandtime/extensions/parcelize => }/OffsetDateTime.kt  | 2 +-
 .../parcelize/ranges => }/OffsetDateTimeInterval.kt         | 6 ++----
 .../{io/islandtime/extensions/parcelize => }/OffsetTime.kt  | 2 +-
 .../islandtime/extensions/parcelize/measures => }/Period.kt | 2 +-
 .../kotlin/{io/islandtime/extensions/parcelize => }/Time.kt | 2 +-
 .../{io/islandtime/extensions/parcelize => }/TimeZone.kt    | 2 +-
 .../{io/islandtime/extensions/parcelize => }/YearMonth.kt   | 2 +-
 .../islandtime/extensions/parcelize => }/ZonedDateTime.kt   | 2 +-
 .../parcelize/ranges => }/ZonedDateTimeInterval.kt          | 6 ++----
 34 files changed, 53 insertions(+), 63 deletions(-)
 rename extensions/parcelize/src/androidTest/kotlin/{io/islandtime/extensions/parcelize/ranges => }/DateRangeTest.kt (85%)
 rename extensions/parcelize/src/androidTest/kotlin/{io/islandtime/extensions/parcelize => }/DateTest.kt (88%)
 rename extensions/parcelize/src/androidTest/kotlin/{io/islandtime/extensions/parcelize/ranges => }/DateTimeIntervalTest.kt (87%)
 rename extensions/parcelize/src/androidTest/kotlin/{io/islandtime/extensions/parcelize => }/DateTimeTest.kt (89%)
 rename extensions/parcelize/src/androidTest/kotlin/{io/islandtime/extensions/parcelize/measures => }/DurationTest.kt (88%)
 rename extensions/parcelize/src/androidTest/kotlin/{io/islandtime/extensions/parcelize/ranges => }/InstantIntervalTest.kt (87%)
 rename extensions/parcelize/src/androidTest/kotlin/{io/islandtime/extensions/parcelize => }/InstantTest.kt (88%)
 rename extensions/parcelize/src/androidTest/kotlin/{io/islandtime/extensions/parcelize/ranges => }/OffsetDateTimeIntervalTest.kt (89%)
 rename extensions/parcelize/src/androidTest/kotlin/{io/islandtime/extensions/parcelize => }/OffsetDateTimeTest.kt (91%)
 rename extensions/parcelize/src/androidTest/kotlin/{io/islandtime/extensions/parcelize => }/OffsetTimeTest.kt (90%)
 rename extensions/parcelize/src/androidTest/kotlin/{io/islandtime/extensions/parcelize/measures => }/PeriodTest.kt (89%)
 rename extensions/parcelize/src/androidTest/kotlin/{io/islandtime/extensions/parcelize => }/TimeTest.kt (87%)
 rename extensions/parcelize/src/androidTest/kotlin/{io/islandtime/extensions/parcelize => }/TimeZoneTest.kt (95%)
 rename extensions/parcelize/src/androidTest/kotlin/{io/islandtime/extensions/parcelize => }/YearMonthTest.kt (89%)
 rename extensions/parcelize/src/androidTest/kotlin/{io/islandtime/extensions/parcelize/ranges => }/ZonedDateTimeIntervalTest.kt (91%)
 rename extensions/parcelize/src/androidTest/kotlin/{io/islandtime/extensions/parcelize => }/ZonedDateTimeTest.kt (92%)
 rename extensions/parcelize/src/androidTest/kotlin/{io/islandtime/extensions/parcelize => }/test/TestParcelable.kt (92%)
 rename extensions/parcelize/src/main/kotlin/{io/islandtime/extensions/parcelize => }/Date.kt (96%)
 rename extensions/parcelize/src/main/kotlin/{io/islandtime/extensions/parcelize/ranges => }/DateRange.kt (63%)
 rename extensions/parcelize/src/main/kotlin/{io/islandtime/extensions/parcelize => }/DateTime.kt (96%)
 rename extensions/parcelize/src/main/kotlin/{io/islandtime/extensions/parcelize/ranges => }/DateTimeInterval.kt (74%)
 rename extensions/parcelize/src/main/kotlin/{io/islandtime/extensions/parcelize/measures => }/Duration.kt (96%)
 rename extensions/parcelize/src/main/kotlin/{io/islandtime/extensions/parcelize => }/Instant.kt (96%)
 rename extensions/parcelize/src/main/kotlin/{io/islandtime/extensions/parcelize/ranges => }/InstantInterval.kt (64%)
 rename extensions/parcelize/src/main/kotlin/{io/islandtime/extensions/parcelize => }/OffsetDateTime.kt (97%)
 rename extensions/parcelize/src/main/kotlin/{io/islandtime/extensions/parcelize/ranges => }/OffsetDateTimeInterval.kt (64%)
 rename extensions/parcelize/src/main/kotlin/{io/islandtime/extensions/parcelize => }/OffsetTime.kt (97%)
 rename extensions/parcelize/src/main/kotlin/{io/islandtime/extensions/parcelize/measures => }/Period.kt (96%)
 rename extensions/parcelize/src/main/kotlin/{io/islandtime/extensions/parcelize => }/Time.kt (96%)
 rename extensions/parcelize/src/main/kotlin/{io/islandtime/extensions/parcelize => }/TimeZone.kt (93%)
 rename extensions/parcelize/src/main/kotlin/{io/islandtime/extensions/parcelize => }/YearMonth.kt (95%)
 rename extensions/parcelize/src/main/kotlin/{io/islandtime/extensions/parcelize => }/ZonedDateTime.kt (97%)
 rename extensions/parcelize/src/main/kotlin/{io/islandtime/extensions/parcelize/ranges => }/ZonedDateTimeInterval.kt (64%)

diff --git a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/ranges/DateRangeTest.kt b/extensions/parcelize/src/androidTest/kotlin/DateRangeTest.kt
similarity index 85%
rename from extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/ranges/DateRangeTest.kt
rename to extensions/parcelize/src/androidTest/kotlin/DateRangeTest.kt
index 520cb039c..4dbd907bd 100644
--- a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/ranges/DateRangeTest.kt
+++ b/extensions/parcelize/src/androidTest/kotlin/DateRangeTest.kt
@@ -1,10 +1,10 @@
-package io.islandtime.extensions.parcelize.ranges
+package io.islandtime.parcelize
 
 import android.os.Parcelable
 import io.islandtime.Date
 import io.islandtime.ranges.DateRange
 import io.islandtime.Month
-import io.islandtime.extensions.parcelize.test.testParcelable
+import io.islandtime.parcelize.test.testParcelable
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
 import org.junit.Test
diff --git a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/DateTest.kt b/extensions/parcelize/src/androidTest/kotlin/DateTest.kt
similarity index 88%
rename from extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/DateTest.kt
rename to extensions/parcelize/src/androidTest/kotlin/DateTest.kt
index 39631e66a..2b4349c5f 100644
--- a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/DateTest.kt
+++ b/extensions/parcelize/src/androidTest/kotlin/DateTest.kt
@@ -1,9 +1,9 @@
-package io.islandtime.extensions.parcelize
+package io.islandtime.parcelize
 
 import android.os.Parcelable
 import io.islandtime.Date
 import io.islandtime.Month
-import io.islandtime.extensions.parcelize.test.testParcelable
+import io.islandtime.parcelize.test.testParcelable
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
 import org.junit.Test
diff --git a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/ranges/DateTimeIntervalTest.kt b/extensions/parcelize/src/androidTest/kotlin/DateTimeIntervalTest.kt
similarity index 87%
rename from extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/ranges/DateTimeIntervalTest.kt
rename to extensions/parcelize/src/androidTest/kotlin/DateTimeIntervalTest.kt
index 6eabbba05..13576c8db 100644
--- a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/ranges/DateTimeIntervalTest.kt
+++ b/extensions/parcelize/src/androidTest/kotlin/DateTimeIntervalTest.kt
@@ -1,10 +1,10 @@
-package io.islandtime.extensions.parcelize.ranges
+package io.islandtime.parcelize
 
 import android.os.Parcelable
 import io.islandtime.DateTime
 import io.islandtime.ranges.DateTimeInterval
 import io.islandtime.Month
-import io.islandtime.extensions.parcelize.test.testParcelable
+import io.islandtime.parcelize.test.testParcelable
 import io.islandtime.ranges.until
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
diff --git a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/DateTimeTest.kt b/extensions/parcelize/src/androidTest/kotlin/DateTimeTest.kt
similarity index 89%
rename from extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/DateTimeTest.kt
rename to extensions/parcelize/src/androidTest/kotlin/DateTimeTest.kt
index 25c655e20..c4c10abdd 100644
--- a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/DateTimeTest.kt
+++ b/extensions/parcelize/src/androidTest/kotlin/DateTimeTest.kt
@@ -1,9 +1,9 @@
-package io.islandtime.extensions.parcelize
+package io.islandtime.parcelize
 
 import android.os.Parcelable
 import io.islandtime.DateTime
 import io.islandtime.Month
-import io.islandtime.extensions.parcelize.test.testParcelable
+import io.islandtime.parcelize.test.testParcelable
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
 import org.junit.Test
diff --git a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/measures/DurationTest.kt b/extensions/parcelize/src/androidTest/kotlin/DurationTest.kt
similarity index 88%
rename from extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/measures/DurationTest.kt
rename to extensions/parcelize/src/androidTest/kotlin/DurationTest.kt
index 45612fe3f..01a9f3b20 100644
--- a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/measures/DurationTest.kt
+++ b/extensions/parcelize/src/androidTest/kotlin/DurationTest.kt
@@ -1,7 +1,7 @@
-package io.islandtime.extensions.parcelize.measures
+package io.islandtime.parcelize
 
 import android.os.Parcelable
-import io.islandtime.extensions.parcelize.test.testParcelable
+import io.islandtime.parcelize.test.testParcelable
 import io.islandtime.measures.Duration
 import io.islandtime.measures.durationOf
 import io.islandtime.measures.hours
diff --git a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/ranges/InstantIntervalTest.kt b/extensions/parcelize/src/androidTest/kotlin/InstantIntervalTest.kt
similarity index 87%
rename from extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/ranges/InstantIntervalTest.kt
rename to extensions/parcelize/src/androidTest/kotlin/InstantIntervalTest.kt
index 386772217..561b671ff 100644
--- a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/ranges/InstantIntervalTest.kt
+++ b/extensions/parcelize/src/androidTest/kotlin/InstantIntervalTest.kt
@@ -1,9 +1,9 @@
-package io.islandtime.extensions.parcelize.ranges
+package io.islandtime.parcelize
 
 import android.os.Parcelable
 import io.islandtime.Instant
 import io.islandtime.ranges.InstantInterval
-import io.islandtime.extensions.parcelize.test.testParcelable
+import io.islandtime.parcelize.test.testParcelable
 import io.islandtime.measures.seconds
 import io.islandtime.ranges.until
 import kotlinx.parcelize.Parcelize
diff --git a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/InstantTest.kt b/extensions/parcelize/src/androidTest/kotlin/InstantTest.kt
similarity index 88%
rename from extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/InstantTest.kt
rename to extensions/parcelize/src/androidTest/kotlin/InstantTest.kt
index 3a440f90e..c6a05ddde 100644
--- a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/InstantTest.kt
+++ b/extensions/parcelize/src/androidTest/kotlin/InstantTest.kt
@@ -1,8 +1,8 @@
-package io.islandtime.extensions.parcelize
+package io.islandtime.parcelize
 
 import android.os.Parcelable
 import io.islandtime.Instant
-import io.islandtime.extensions.parcelize.test.testParcelable
+import io.islandtime.parcelize.test.testParcelable
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
 import org.junit.Test
diff --git a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/ranges/OffsetDateTimeIntervalTest.kt b/extensions/parcelize/src/androidTest/kotlin/OffsetDateTimeIntervalTest.kt
similarity index 89%
rename from extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/ranges/OffsetDateTimeIntervalTest.kt
rename to extensions/parcelize/src/androidTest/kotlin/OffsetDateTimeIntervalTest.kt
index 0ef65816c..ac8e54d49 100644
--- a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/ranges/OffsetDateTimeIntervalTest.kt
+++ b/extensions/parcelize/src/androidTest/kotlin/OffsetDateTimeIntervalTest.kt
@@ -1,10 +1,10 @@
-package io.islandtime.extensions.parcelize.ranges
+package io.islandtime.parcelize
 
 import android.os.Parcelable
 import io.islandtime.OffsetDateTime
 import io.islandtime.ranges.OffsetDateTimeInterval
 import io.islandtime.UtcOffset
-import io.islandtime.extensions.parcelize.test.testParcelable
+import io.islandtime.arcelize.test.testParcelable
 import io.islandtime.measures.hours
 import io.islandtime.ranges.until
 import kotlinx.parcelize.Parcelize
diff --git a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/OffsetDateTimeTest.kt b/extensions/parcelize/src/androidTest/kotlin/OffsetDateTimeTest.kt
similarity index 91%
rename from extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/OffsetDateTimeTest.kt
rename to extensions/parcelize/src/androidTest/kotlin/OffsetDateTimeTest.kt
index aa48ff86c..6a6d69b45 100644
--- a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/OffsetDateTimeTest.kt
+++ b/extensions/parcelize/src/androidTest/kotlin/OffsetDateTimeTest.kt
@@ -1,8 +1,8 @@
-package io.islandtime.extensions.parcelize
+package io.islandtime.parcelize
 
 import android.os.Parcelable
 import io.islandtime.*
-import io.islandtime.extensions.parcelize.test.testParcelable
+import io.islandtime.parcelize.test.testParcelable
 import io.islandtime.measures.hours
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
diff --git a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/OffsetTimeTest.kt b/extensions/parcelize/src/androidTest/kotlin/OffsetTimeTest.kt
similarity index 90%
rename from extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/OffsetTimeTest.kt
rename to extensions/parcelize/src/androidTest/kotlin/OffsetTimeTest.kt
index 2af8494d4..8afd08653 100644
--- a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/OffsetTimeTest.kt
+++ b/extensions/parcelize/src/androidTest/kotlin/OffsetTimeTest.kt
@@ -1,9 +1,9 @@
-package io.islandtime.extensions.parcelize
+package io.islandtime.parcelize
 
 import android.os.Parcelable
 import io.islandtime.OffsetTime
 import io.islandtime.UtcOffset
-import io.islandtime.extensions.parcelize.test.testParcelable
+import io.islandtime.parcelize.test.testParcelable
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
 import org.junit.Test
diff --git a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/measures/PeriodTest.kt b/extensions/parcelize/src/androidTest/kotlin/PeriodTest.kt
similarity index 89%
rename from extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/measures/PeriodTest.kt
rename to extensions/parcelize/src/androidTest/kotlin/PeriodTest.kt
index d55ad604f..9c9ca0302 100644
--- a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/measures/PeriodTest.kt
+++ b/extensions/parcelize/src/androidTest/kotlin/PeriodTest.kt
@@ -1,7 +1,7 @@
-package io.islandtime.extensions.parcelize.measures
+package io.islandtime.parcelize
 
 import android.os.Parcelable
-import io.islandtime.extensions.parcelize.test.testParcelable
+import io.islandtime.parcelize.test.testParcelable
 import io.islandtime.measures.*
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
diff --git a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/TimeTest.kt b/extensions/parcelize/src/androidTest/kotlin/TimeTest.kt
similarity index 87%
rename from extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/TimeTest.kt
rename to extensions/parcelize/src/androidTest/kotlin/TimeTest.kt
index dc027f6a2..ed3c5ee3e 100644
--- a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/TimeTest.kt
+++ b/extensions/parcelize/src/androidTest/kotlin/TimeTest.kt
@@ -1,8 +1,8 @@
-package io.islandtime.extensions.parcelize
+package io.islandtime.parcelize
 
 import android.os.Parcelable
 import io.islandtime.Time
-import io.islandtime.extensions.parcelize.test.testParcelable
+import io.islandtime.parcelize.test.testParcelable
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
 import org.junit.Test
diff --git a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/TimeZoneTest.kt b/extensions/parcelize/src/androidTest/kotlin/TimeZoneTest.kt
similarity index 95%
rename from extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/TimeZoneTest.kt
rename to extensions/parcelize/src/androidTest/kotlin/TimeZoneTest.kt
index 7a95e89f8..bc72a5784 100644
--- a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/TimeZoneTest.kt
+++ b/extensions/parcelize/src/androidTest/kotlin/TimeZoneTest.kt
@@ -1,4 +1,4 @@
-package io.islandtime.extensions.parcelize
+package io.islandtime.parcelize
 
 import android.os.Parcelable
 import io.islandtime.TimeZone
diff --git a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/YearMonthTest.kt b/extensions/parcelize/src/androidTest/kotlin/YearMonthTest.kt
similarity index 89%
rename from extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/YearMonthTest.kt
rename to extensions/parcelize/src/androidTest/kotlin/YearMonthTest.kt
index f9d87d898..b2c4f2090 100644
--- a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/YearMonthTest.kt
+++ b/extensions/parcelize/src/androidTest/kotlin/YearMonthTest.kt
@@ -1,9 +1,9 @@
-package io.islandtime.extensions.parcelize
+package io.islandtime.parcelize
 
 import android.os.Parcelable
 import io.islandtime.YearMonth
 import io.islandtime.Month
-import io.islandtime.extensions.parcelize.test.testParcelable
+import io.islandtime.parcelize.test.testParcelable
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
 import org.junit.Test
diff --git a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/ranges/ZonedDateTimeIntervalTest.kt b/extensions/parcelize/src/androidTest/kotlin/ZonedDateTimeIntervalTest.kt
similarity index 91%
rename from extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/ranges/ZonedDateTimeIntervalTest.kt
rename to extensions/parcelize/src/androidTest/kotlin/ZonedDateTimeIntervalTest.kt
index 4819926df..db9819633 100644
--- a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/ranges/ZonedDateTimeIntervalTest.kt
+++ b/extensions/parcelize/src/androidTest/kotlin/ZonedDateTimeIntervalTest.kt
@@ -1,10 +1,10 @@
-package io.islandtime.extensions.parcelize.ranges
+package io.islandtime.parcelize
 
 import android.os.Parcelable
 import io.islandtime.IslandTime
 import io.islandtime.TimeZone
 import io.islandtime.ZonedDateTime
-import io.islandtime.extensions.parcelize.test.testParcelable
+import io.islandtime.parcelize.test.testParcelable
 import io.islandtime.ranges.ZonedDateTimeInterval
 import io.islandtime.ranges.until
 import kotlinx.parcelize.Parcelize
diff --git a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/ZonedDateTimeTest.kt b/extensions/parcelize/src/androidTest/kotlin/ZonedDateTimeTest.kt
similarity index 92%
rename from extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/ZonedDateTimeTest.kt
rename to extensions/parcelize/src/androidTest/kotlin/ZonedDateTimeTest.kt
index 1e13683fd..fd200370e 100644
--- a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/ZonedDateTimeTest.kt
+++ b/extensions/parcelize/src/androidTest/kotlin/ZonedDateTimeTest.kt
@@ -1,8 +1,8 @@
-package io.islandtime.extensions.parcelize
+package io.islandtime.parcelize
 
 import android.os.Parcelable
 import io.islandtime.*
-import io.islandtime.extensions.parcelize.test.testParcelable
+import io.islandtime.parcelize.test.testParcelable
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
 import org.junit.AfterClass
diff --git a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/test/TestParcelable.kt b/extensions/parcelize/src/androidTest/kotlin/test/TestParcelable.kt
similarity index 92%
rename from extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/test/TestParcelable.kt
rename to extensions/parcelize/src/androidTest/kotlin/test/TestParcelable.kt
index 62eed5ad7..6c7ed8b06 100644
--- a/extensions/parcelize/src/androidTest/kotlin/io/islandtime/extensions/parcelize/test/TestParcelable.kt
+++ b/extensions/parcelize/src/androidTest/kotlin/test/TestParcelable.kt
@@ -1,4 +1,4 @@
-package io.islandtime.extensions.parcelize.test
+package io.islandtime.parcelize.test
 
 import android.os.Bundle
 import android.os.Parcel
diff --git a/extensions/parcelize/src/main/AndroidManifest.xml b/extensions/parcelize/src/main/AndroidManifest.xml
index 06c3c6dd1..06c1b9ff9 100644
--- a/extensions/parcelize/src/main/AndroidManifest.xml
+++ b/extensions/parcelize/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
-<manifest package="io.islandtime.extensions.parcelize">
+<manifest package="io.islandtime.parcelize">
     <application/>
 </manifest>
diff --git a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/Date.kt b/extensions/parcelize/src/main/kotlin/Date.kt
similarity index 96%
rename from extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/Date.kt
rename to extensions/parcelize/src/main/kotlin/Date.kt
index aed4c92f2..2f6ac1867 100644
--- a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/Date.kt
+++ b/extensions/parcelize/src/main/kotlin/Date.kt
@@ -1,4 +1,4 @@
-package io.islandtime.extensions.parcelize
+package io.islandtime.parcelize
 
 import android.os.Parcel
 import io.islandtime.Date
diff --git a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/ranges/DateRange.kt b/extensions/parcelize/src/main/kotlin/DateRange.kt
similarity index 63%
rename from extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/ranges/DateRange.kt
rename to extensions/parcelize/src/main/kotlin/DateRange.kt
index cee00361f..3c0a1db76 100644
--- a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/ranges/DateRange.kt
+++ b/extensions/parcelize/src/main/kotlin/DateRange.kt
@@ -1,12 +1,10 @@
-package io.islandtime.extensions.parcelize.ranges
+package io.islandtime.parcelize
 
 import android.os.Parcel
-import io.islandtime.extensions.parcelize.readDate
-import io.islandtime.extensions.parcelize.writeDate
 import io.islandtime.ranges.DateRange
 import kotlinx.parcelize.Parceler
 
-object DateRangeParceler: Parceler<DateRange> {
+object DateRangeParceler : Parceler<DateRange> {
     override fun create(parcel: Parcel): DateRange = DateRange(parcel.readDate(), parcel.readDate())
 
     override fun DateRange.write(parcel: Parcel, flags: Int) {
diff --git a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/DateTime.kt b/extensions/parcelize/src/main/kotlin/DateTime.kt
similarity index 96%
rename from extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/DateTime.kt
rename to extensions/parcelize/src/main/kotlin/DateTime.kt
index 09b3ff430..69cd7b708 100644
--- a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/DateTime.kt
+++ b/extensions/parcelize/src/main/kotlin/DateTime.kt
@@ -1,4 +1,4 @@
-package io.islandtime.extensions.parcelize
+package io.islandtime.parcelize
 
 import android.os.Parcel
 import io.islandtime.DateTime
diff --git a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/ranges/DateTimeInterval.kt b/extensions/parcelize/src/main/kotlin/DateTimeInterval.kt
similarity index 74%
rename from extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/ranges/DateTimeInterval.kt
rename to extensions/parcelize/src/main/kotlin/DateTimeInterval.kt
index 7e61c4144..f32c2503c 100644
--- a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/ranges/DateTimeInterval.kt
+++ b/extensions/parcelize/src/main/kotlin/DateTimeInterval.kt
@@ -1,8 +1,6 @@
-package io.islandtime.extensions.parcelize.ranges
+package io.islandtime.parcelize
 
 import android.os.Parcel
-import io.islandtime.extensions.parcelize.readDateTime
-import io.islandtime.extensions.parcelize.writeDateTime
 import io.islandtime.ranges.DateTimeInterval
 import kotlinx.parcelize.Parceler
 
diff --git a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/measures/Duration.kt b/extensions/parcelize/src/main/kotlin/Duration.kt
similarity index 96%
rename from extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/measures/Duration.kt
rename to extensions/parcelize/src/main/kotlin/Duration.kt
index fe769b820..f2c8ebd68 100644
--- a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/measures/Duration.kt
+++ b/extensions/parcelize/src/main/kotlin/Duration.kt
@@ -1,4 +1,4 @@
-package io.islandtime.extensions.parcelize.measures
+package io.islandtime.parcelize
 
 import android.os.Parcel
 import io.islandtime.measures.Duration
diff --git a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/Instant.kt b/extensions/parcelize/src/main/kotlin/Instant.kt
similarity index 96%
rename from extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/Instant.kt
rename to extensions/parcelize/src/main/kotlin/Instant.kt
index 0bf06d83f..a8f9df6e5 100644
--- a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/Instant.kt
+++ b/extensions/parcelize/src/main/kotlin/Instant.kt
@@ -1,4 +1,4 @@
-package io.islandtime.extensions.parcelize
+package io.islandtime.parcelize
 
 import android.os.Parcel
 import io.islandtime.Instant
diff --git a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/ranges/InstantInterval.kt b/extensions/parcelize/src/main/kotlin/InstantInterval.kt
similarity index 64%
rename from extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/ranges/InstantInterval.kt
rename to extensions/parcelize/src/main/kotlin/InstantInterval.kt
index 6e0cc477f..e6d9967a0 100644
--- a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/ranges/InstantInterval.kt
+++ b/extensions/parcelize/src/main/kotlin/InstantInterval.kt
@@ -1,12 +1,10 @@
-package io.islandtime.extensions.parcelize.ranges
+package io.islandtime.parcelize
 
 import android.os.Parcel
-import io.islandtime.extensions.parcelize.readInstant
-import io.islandtime.extensions.parcelize.writeInstant
 import io.islandtime.ranges.InstantInterval
 import kotlinx.parcelize.Parceler
 
-object InstantIntervalParceler: Parceler<InstantInterval> {
+object InstantIntervalParceler : Parceler<InstantInterval> {
     override fun create(parcel: Parcel): InstantInterval {
         return InstantInterval(parcel.readInstant(), parcel.readInstant())
     }
diff --git a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/OffsetDateTime.kt b/extensions/parcelize/src/main/kotlin/OffsetDateTime.kt
similarity index 97%
rename from extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/OffsetDateTime.kt
rename to extensions/parcelize/src/main/kotlin/OffsetDateTime.kt
index b6d14d81e..970c2dbdc 100644
--- a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/OffsetDateTime.kt
+++ b/extensions/parcelize/src/main/kotlin/OffsetDateTime.kt
@@ -1,4 +1,4 @@
-package io.islandtime.extensions.parcelize
+package io.islandtime.parcelize
 
 import android.os.Parcel
 import io.islandtime.DateTime
diff --git a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/ranges/OffsetDateTimeInterval.kt b/extensions/parcelize/src/main/kotlin/OffsetDateTimeInterval.kt
similarity index 64%
rename from extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/ranges/OffsetDateTimeInterval.kt
rename to extensions/parcelize/src/main/kotlin/OffsetDateTimeInterval.kt
index d5127b088..bcacc75bd 100644
--- a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/ranges/OffsetDateTimeInterval.kt
+++ b/extensions/parcelize/src/main/kotlin/OffsetDateTimeInterval.kt
@@ -1,12 +1,10 @@
-package io.islandtime.extensions.parcelize.ranges
+package io.islandtime.parcelize
 
 import android.os.Parcel
-import io.islandtime.extensions.parcelize.readOffsetDateTime
-import io.islandtime.extensions.parcelize.writeOffsetDateTime
 import io.islandtime.ranges.OffsetDateTimeInterval
 import kotlinx.parcelize.Parceler
 
-object OffsetDateTimeIntervalParceler: Parceler<OffsetDateTimeInterval> {
+object OffsetDateTimeIntervalParceler : Parceler<OffsetDateTimeInterval> {
     override fun create(parcel: Parcel): OffsetDateTimeInterval {
         return OffsetDateTimeInterval(parcel.readOffsetDateTime(), parcel.readOffsetDateTime())
     }
diff --git a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/OffsetTime.kt b/extensions/parcelize/src/main/kotlin/OffsetTime.kt
similarity index 97%
rename from extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/OffsetTime.kt
rename to extensions/parcelize/src/main/kotlin/OffsetTime.kt
index 7240a03c1..e342c015a 100644
--- a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/OffsetTime.kt
+++ b/extensions/parcelize/src/main/kotlin/OffsetTime.kt
@@ -1,4 +1,4 @@
-package io.islandtime.extensions.parcelize
+package io.islandtime.parcelize
 
 import android.os.Parcel
 import io.islandtime.OffsetTime
diff --git a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/measures/Period.kt b/extensions/parcelize/src/main/kotlin/Period.kt
similarity index 96%
rename from extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/measures/Period.kt
rename to extensions/parcelize/src/main/kotlin/Period.kt
index f61172154..f0432f8b0 100644
--- a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/measures/Period.kt
+++ b/extensions/parcelize/src/main/kotlin/Period.kt
@@ -1,4 +1,4 @@
-package io.islandtime.extensions.parcelize.measures
+package io.islandtime.parcelize
 
 import android.os.Parcel
 import io.islandtime.measures.*
diff --git a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/Time.kt b/extensions/parcelize/src/main/kotlin/Time.kt
similarity index 96%
rename from extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/Time.kt
rename to extensions/parcelize/src/main/kotlin/Time.kt
index c530ce062..910ba2340 100644
--- a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/Time.kt
+++ b/extensions/parcelize/src/main/kotlin/Time.kt
@@ -1,4 +1,4 @@
-package io.islandtime.extensions.parcelize
+package io.islandtime.parcelize
 
 import android.os.Parcel
 import io.islandtime.Time
diff --git a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/TimeZone.kt b/extensions/parcelize/src/main/kotlin/TimeZone.kt
similarity index 93%
rename from extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/TimeZone.kt
rename to extensions/parcelize/src/main/kotlin/TimeZone.kt
index f69e40cf4..712477063 100644
--- a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/TimeZone.kt
+++ b/extensions/parcelize/src/main/kotlin/TimeZone.kt
@@ -1,4 +1,4 @@
-package io.islandtime.extensions.parcelize
+package io.islandtime.parcelize
 
 import android.os.Parcel
 import io.islandtime.TimeZone
diff --git a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/YearMonth.kt b/extensions/parcelize/src/main/kotlin/YearMonth.kt
similarity index 95%
rename from extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/YearMonth.kt
rename to extensions/parcelize/src/main/kotlin/YearMonth.kt
index 1b5548452..4d6639453 100644
--- a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/YearMonth.kt
+++ b/extensions/parcelize/src/main/kotlin/YearMonth.kt
@@ -1,4 +1,4 @@
-package io.islandtime.extensions.parcelize
+package io.islandtime.parcelize
 
 import android.os.Parcel
 import io.islandtime.YearMonth
diff --git a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/ZonedDateTime.kt b/extensions/parcelize/src/main/kotlin/ZonedDateTime.kt
similarity index 97%
rename from extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/ZonedDateTime.kt
rename to extensions/parcelize/src/main/kotlin/ZonedDateTime.kt
index b37cc02b1..df6047140 100644
--- a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/ZonedDateTime.kt
+++ b/extensions/parcelize/src/main/kotlin/ZonedDateTime.kt
@@ -1,4 +1,4 @@
-package io.islandtime.extensions.parcelize
+package io.islandtime.parcelize
 
 import android.os.Parcel
 import io.islandtime.DateTime
diff --git a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/ranges/ZonedDateTimeInterval.kt b/extensions/parcelize/src/main/kotlin/ZonedDateTimeInterval.kt
similarity index 64%
rename from extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/ranges/ZonedDateTimeInterval.kt
rename to extensions/parcelize/src/main/kotlin/ZonedDateTimeInterval.kt
index e107221c5..0d956e0ac 100644
--- a/extensions/parcelize/src/main/kotlin/io/islandtime/extensions/parcelize/ranges/ZonedDateTimeInterval.kt
+++ b/extensions/parcelize/src/main/kotlin/ZonedDateTimeInterval.kt
@@ -1,12 +1,10 @@
-package io.islandtime.extensions.parcelize.ranges
+package io.islandtime.parcelize
 
 import android.os.Parcel
-import io.islandtime.extensions.parcelize.readZonedDateTime
-import io.islandtime.extensions.parcelize.writeZonedDateTime
 import io.islandtime.ranges.ZonedDateTimeInterval
 import kotlinx.parcelize.Parceler
 
-object ZonedDateTimeIntervalParceler: Parceler<ZonedDateTimeInterval> {
+object ZonedDateTimeIntervalParceler : Parceler<ZonedDateTimeInterval> {
     override fun create(parcel: Parcel): ZonedDateTimeInterval {
         return ZonedDateTimeInterval(parcel.readZonedDateTime(), parcel.readZonedDateTime())
     }

From 17abcd5c455e3f8c266a03313a6e6ba9534ddece Mon Sep 17 00:00:00 2001
From: Erik Christensen <erikchristensen@comcast.net>
Date: Tue, 2 Mar 2021 09:01:38 -0500
Subject: [PATCH 2/2] Fix compile errors

---
 .../src/androidTest/kotlin/OffsetDateTimeIntervalTest.kt        | 2 +-
 extensions/parcelize/src/androidTest/kotlin/TimeZoneTest.kt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/parcelize/src/androidTest/kotlin/OffsetDateTimeIntervalTest.kt b/extensions/parcelize/src/androidTest/kotlin/OffsetDateTimeIntervalTest.kt
index ac8e54d49..6a7eb6126 100644
--- a/extensions/parcelize/src/androidTest/kotlin/OffsetDateTimeIntervalTest.kt
+++ b/extensions/parcelize/src/androidTest/kotlin/OffsetDateTimeIntervalTest.kt
@@ -4,7 +4,7 @@ import android.os.Parcelable
 import io.islandtime.OffsetDateTime
 import io.islandtime.ranges.OffsetDateTimeInterval
 import io.islandtime.UtcOffset
-import io.islandtime.arcelize.test.testParcelable
+import io.islandtime.parcelize.test.testParcelable
 import io.islandtime.measures.hours
 import io.islandtime.ranges.until
 import kotlinx.parcelize.Parcelize
diff --git a/extensions/parcelize/src/androidTest/kotlin/TimeZoneTest.kt b/extensions/parcelize/src/androidTest/kotlin/TimeZoneTest.kt
index bc72a5784..397ce49f8 100644
--- a/extensions/parcelize/src/androidTest/kotlin/TimeZoneTest.kt
+++ b/extensions/parcelize/src/androidTest/kotlin/TimeZoneTest.kt
@@ -2,7 +2,7 @@ package io.islandtime.parcelize
 
 import android.os.Parcelable
 import io.islandtime.TimeZone
-import io.islandtime.extensions.parcelize.test.testParcelable
+import io.islandtime.parcelize.test.testParcelable
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
 import org.junit.Test