diff --git a/CONTRIBUTING.MD b/CONTRIBUTING.MD
index adc0720d..1add03ac 100644
--- a/CONTRIBUTING.MD
+++ b/CONTRIBUTING.MD
@@ -1,4 +1,4 @@
-Thank you for visiting BNY Mellon's GitHub.
+Thank you for visiting BNY's GitHub.
 
 We currently do not accept external code contributions. 
 
@@ -6,4 +6,4 @@ We appreciate any potential issues or concerns reported by the community, and ma
 
 Thank you for your interest!
 
-BNY Mellon
+BNY
diff --git a/calendar-kata-solutions/pom.xml b/calendar-kata-solutions/pom.xml
index 548acde3..ab59e96a 100644
--- a/calendar-kata-solutions/pom.xml
+++ b/calendar-kata-solutions/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.codekatas</groupId>
+    <groupId>bny.codekatas</groupId>
     <artifactId>calendar-kata-solutions</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
diff --git a/calendar-kata-solutions/src/main/java/bnymellon/codekatas/calendarkata/CalendarWindow.java b/calendar-kata-solutions/src/main/java/bny/codekatas/calendarkata/CalendarWindow.java
similarity index 94%
rename from calendar-kata-solutions/src/main/java/bnymellon/codekatas/calendarkata/CalendarWindow.java
rename to calendar-kata-solutions/src/main/java/bny/codekatas/calendarkata/CalendarWindow.java
index 775f08a5..c29d3701 100644
--- a/calendar-kata-solutions/src/main/java/bnymellon/codekatas/calendarkata/CalendarWindow.java
+++ b/calendar-kata-solutions/src/main/java/bny/codekatas/calendarkata/CalendarWindow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.calendarkata;
+package bny.codekatas.calendarkata;
 
 import java.time.LocalDate;
 
diff --git a/calendar-kata-solutions/src/main/java/bnymellon/codekatas/calendarkata/FullMonth.java b/calendar-kata-solutions/src/main/java/bny/codekatas/calendarkata/FullMonth.java
similarity index 95%
rename from calendar-kata-solutions/src/main/java/bnymellon/codekatas/calendarkata/FullMonth.java
rename to calendar-kata-solutions/src/main/java/bny/codekatas/calendarkata/FullMonth.java
index eec7f21e..d8043cfa 100644
--- a/calendar-kata-solutions/src/main/java/bnymellon/codekatas/calendarkata/FullMonth.java
+++ b/calendar-kata-solutions/src/main/java/bny/codekatas/calendarkata/FullMonth.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.calendarkata;
+package bny.codekatas.calendarkata;
 
 import java.time.LocalDate;
 
diff --git a/calendar-kata-solutions/src/main/java/bnymellon/codekatas/calendarkata/FullWeek.java b/calendar-kata-solutions/src/main/java/bny/codekatas/calendarkata/FullWeek.java
similarity index 95%
rename from calendar-kata-solutions/src/main/java/bnymellon/codekatas/calendarkata/FullWeek.java
rename to calendar-kata-solutions/src/main/java/bny/codekatas/calendarkata/FullWeek.java
index 33afd53a..32e2b105 100644
--- a/calendar-kata-solutions/src/main/java/bnymellon/codekatas/calendarkata/FullWeek.java
+++ b/calendar-kata-solutions/src/main/java/bny/codekatas/calendarkata/FullWeek.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.calendarkata;
+package bny.codekatas.calendarkata;
 
 import java.time.DayOfWeek;
 import java.time.LocalDate;
diff --git a/calendar-kata/src/main/java/bnymellon/codekatas/calendarkata/Meeting.java b/calendar-kata-solutions/src/main/java/bny/codekatas/calendarkata/Meeting.java
similarity index 97%
rename from calendar-kata/src/main/java/bnymellon/codekatas/calendarkata/Meeting.java
rename to calendar-kata-solutions/src/main/java/bny/codekatas/calendarkata/Meeting.java
index 9d6d3392..13ada458 100644
--- a/calendar-kata/src/main/java/bnymellon/codekatas/calendarkata/Meeting.java
+++ b/calendar-kata-solutions/src/main/java/bny/codekatas/calendarkata/Meeting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.calendarkata;
+package bny.codekatas.calendarkata;
 
 import java.time.Duration;
 import java.time.LocalDate;
diff --git a/calendar-kata-solutions/src/main/java/bnymellon/codekatas/calendarkata/MyCalendar.java b/calendar-kata-solutions/src/main/java/bny/codekatas/calendarkata/MyCalendar.java
similarity index 98%
rename from calendar-kata-solutions/src/main/java/bnymellon/codekatas/calendarkata/MyCalendar.java
rename to calendar-kata-solutions/src/main/java/bny/codekatas/calendarkata/MyCalendar.java
index 66da7b6b..e22acb18 100644
--- a/calendar-kata-solutions/src/main/java/bnymellon/codekatas/calendarkata/MyCalendar.java
+++ b/calendar-kata-solutions/src/main/java/bny/codekatas/calendarkata/MyCalendar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.calendarkata;
+package bny.codekatas.calendarkata;
 
 import java.time.Duration;
 import java.time.Instant;
diff --git a/calendar-kata-solutions/src/main/java/bnymellon/codekatas/calendarkata/WorkWeek.java b/calendar-kata-solutions/src/main/java/bny/codekatas/calendarkata/WorkWeek.java
similarity index 95%
rename from calendar-kata-solutions/src/main/java/bnymellon/codekatas/calendarkata/WorkWeek.java
rename to calendar-kata-solutions/src/main/java/bny/codekatas/calendarkata/WorkWeek.java
index cb4ef3a4..27851daa 100644
--- a/calendar-kata-solutions/src/main/java/bnymellon/codekatas/calendarkata/WorkWeek.java
+++ b/calendar-kata-solutions/src/main/java/bny/codekatas/calendarkata/WorkWeek.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.calendarkata;
+package bny.codekatas.calendarkata;
 
 import java.time.DayOfWeek;
 import java.time.LocalDate;
diff --git a/calendar-kata-solutions/src/test/java/bnymellon/codekatas/calendarkata/MyCalendarTest.java b/calendar-kata-solutions/src/test/java/bny/codekatas/calendarkata/MyCalendarTest.java
similarity index 98%
rename from calendar-kata-solutions/src/test/java/bnymellon/codekatas/calendarkata/MyCalendarTest.java
rename to calendar-kata-solutions/src/test/java/bny/codekatas/calendarkata/MyCalendarTest.java
index 11ba5132..edacc524 100644
--- a/calendar-kata-solutions/src/test/java/bnymellon/codekatas/calendarkata/MyCalendarTest.java
+++ b/calendar-kata-solutions/src/test/java/bny/codekatas/calendarkata/MyCalendarTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.calendarkata;
+package bny.codekatas.calendarkata;
 
 import java.time.Duration;
 import java.time.LocalDate;
diff --git a/calendar-kata/README.md b/calendar-kata/README.md
index ab918d92..8ee2f0b9 100644
--- a/calendar-kata/README.md
+++ b/calendar-kata/README.md
@@ -6,16 +6,16 @@ and [ThreeTen-Extra](http://www.threeten.org/threeten-extra/) libraries.
 
 The domain for the Calendar kata is an object representation of an Outlook Calendar.  
 There are several domain classes that are shared by all of the exercises.  These are 
-[`MyCalendar`](./src/main/java/bnymellon/codekatas/calendarkata/MyCalendar.java), 
-[`Meeting`](./src/main/java/bnymellon/codekatas/calendarkata/Meeting.java),
-[`WorkWeek`](./src/main/java/bnymellon/codekatas/calendarkata/WorkWeek.java),
-[`FullWeek`](./src/main/java/bnymellon/codekatas/calendarkata/FullWeek.java),
-[`FullMonth`](./src/main/java/bnymellon/codekatas/calendarkata/FullMonth.java) and
+[`MyCalendar`](src/main/java/bny/codekatas/calendarkata/MyCalendar.java), 
+[`Meeting`](src/main/java/bny/codekatas/calendarkata/Meeting.java),
+[`WorkWeek`](src/main/java/bny/codekatas/calendarkata/WorkWeek.java),
+[`FullWeek`](src/main/java/bny/codekatas/calendarkata/FullWeek.java),
+[`FullMonth`](src/main/java/bny/codekatas/calendarkata/FullMonth.java) and
 
 ![Diagram](mycalendar.png)
 </p> 
 
 ### How to get started
 
-* There are failing tests in [`MyCalendarTest`](./src/test/java/bnymellon/codekatas/calendarkata/MyCalendarTest.java)
+* There are failing tests in [`MyCalendarTest`](./src/test/java/bny/codekatas/calendarkata/MyCalendarTest.java)
 	* Make the tests pass by following and completing the TODOs in MyCalendar, WorkWeek, FullMonth and FullWeek.
\ No newline at end of file
diff --git a/calendar-kata/pom.xml b/calendar-kata/pom.xml
index 7e317675..24baacd3 100644
--- a/calendar-kata/pom.xml
+++ b/calendar-kata/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.codekatas</groupId>
+    <groupId>bny.codekatas</groupId>
     <artifactId>calendar-kata</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
diff --git a/calendar-kata/src/main/java/bnymellon/codekatas/calendarkata/CalendarWindow.java b/calendar-kata/src/main/java/bny/codekatas/calendarkata/CalendarWindow.java
similarity index 94%
rename from calendar-kata/src/main/java/bnymellon/codekatas/calendarkata/CalendarWindow.java
rename to calendar-kata/src/main/java/bny/codekatas/calendarkata/CalendarWindow.java
index 775f08a5..c29d3701 100644
--- a/calendar-kata/src/main/java/bnymellon/codekatas/calendarkata/CalendarWindow.java
+++ b/calendar-kata/src/main/java/bny/codekatas/calendarkata/CalendarWindow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.calendarkata;
+package bny.codekatas.calendarkata;
 
 import java.time.LocalDate;
 
diff --git a/calendar-kata/src/main/java/bnymellon/codekatas/calendarkata/FullMonth.java b/calendar-kata/src/main/java/bny/codekatas/calendarkata/FullMonth.java
similarity index 95%
rename from calendar-kata/src/main/java/bnymellon/codekatas/calendarkata/FullMonth.java
rename to calendar-kata/src/main/java/bny/codekatas/calendarkata/FullMonth.java
index 050965dd..62679d40 100644
--- a/calendar-kata/src/main/java/bnymellon/codekatas/calendarkata/FullMonth.java
+++ b/calendar-kata/src/main/java/bny/codekatas/calendarkata/FullMonth.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.calendarkata;
+package bny.codekatas.calendarkata;
 
 import java.time.LocalDate;
 
diff --git a/calendar-kata/src/main/java/bnymellon/codekatas/calendarkata/FullWeek.java b/calendar-kata/src/main/java/bny/codekatas/calendarkata/FullWeek.java
similarity index 95%
rename from calendar-kata/src/main/java/bnymellon/codekatas/calendarkata/FullWeek.java
rename to calendar-kata/src/main/java/bny/codekatas/calendarkata/FullWeek.java
index d0a57fd0..cb126a2c 100644
--- a/calendar-kata/src/main/java/bnymellon/codekatas/calendarkata/FullWeek.java
+++ b/calendar-kata/src/main/java/bny/codekatas/calendarkata/FullWeek.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.calendarkata;
+package bny.codekatas.calendarkata;
 
 import java.time.DayOfWeek;
 import java.time.LocalDate;
diff --git a/calendar-kata-solutions/src/main/java/bnymellon/codekatas/calendarkata/Meeting.java b/calendar-kata/src/main/java/bny/codekatas/calendarkata/Meeting.java
similarity index 97%
rename from calendar-kata-solutions/src/main/java/bnymellon/codekatas/calendarkata/Meeting.java
rename to calendar-kata/src/main/java/bny/codekatas/calendarkata/Meeting.java
index 9d6d3392..13ada458 100644
--- a/calendar-kata-solutions/src/main/java/bnymellon/codekatas/calendarkata/Meeting.java
+++ b/calendar-kata/src/main/java/bny/codekatas/calendarkata/Meeting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.calendarkata;
+package bny.codekatas.calendarkata;
 
 import java.time.Duration;
 import java.time.LocalDate;
diff --git a/calendar-kata/src/main/java/bnymellon/codekatas/calendarkata/MyCalendar.java b/calendar-kata/src/main/java/bny/codekatas/calendarkata/MyCalendar.java
similarity index 97%
rename from calendar-kata/src/main/java/bnymellon/codekatas/calendarkata/MyCalendar.java
rename to calendar-kata/src/main/java/bny/codekatas/calendarkata/MyCalendar.java
index a5a02f6b..438969c6 100644
--- a/calendar-kata/src/main/java/bnymellon/codekatas/calendarkata/MyCalendar.java
+++ b/calendar-kata/src/main/java/bny/codekatas/calendarkata/MyCalendar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.calendarkata;
+package bny.codekatas.calendarkata;
 
 import java.time.Duration;
 import java.time.Instant;
diff --git a/calendar-kata/src/main/java/bnymellon/codekatas/calendarkata/WorkWeek.java b/calendar-kata/src/main/java/bny/codekatas/calendarkata/WorkWeek.java
similarity index 95%
rename from calendar-kata/src/main/java/bnymellon/codekatas/calendarkata/WorkWeek.java
rename to calendar-kata/src/main/java/bny/codekatas/calendarkata/WorkWeek.java
index 28b9d75c..7a202311 100644
--- a/calendar-kata/src/main/java/bnymellon/codekatas/calendarkata/WorkWeek.java
+++ b/calendar-kata/src/main/java/bny/codekatas/calendarkata/WorkWeek.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.calendarkata;
+package bny.codekatas.calendarkata;
 
 import java.time.DayOfWeek;
 import java.time.LocalDate;
diff --git a/calendar-kata/src/test/java/bnymellon/codekatas/calendarkata/MyCalendarTest.java b/calendar-kata/src/test/java/bny/codekatas/calendarkata/MyCalendarTest.java
similarity index 98%
rename from calendar-kata/src/test/java/bnymellon/codekatas/calendarkata/MyCalendarTest.java
rename to calendar-kata/src/test/java/bny/codekatas/calendarkata/MyCalendarTest.java
index 11ba5132..edacc524 100644
--- a/calendar-kata/src/test/java/bnymellon/codekatas/calendarkata/MyCalendarTest.java
+++ b/calendar-kata/src/test/java/bny/codekatas/calendarkata/MyCalendarTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.calendarkata;
+package bny.codekatas.calendarkata;
 
 import java.time.Duration;
 import java.time.LocalDate;
diff --git a/code-point-kata-solutions/pom.xml b/code-point-kata-solutions/pom.xml
index 284f721a..b0c44d42 100644
--- a/code-point-kata-solutions/pom.xml
+++ b/code-point-kata-solutions/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.codekatas</groupId>
+    <groupId>bny.codekatas</groupId>
     <artifactId>code-point-kata-solutions</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
diff --git a/code-point-kata-solutions/src/test/java/bnymellon/codekatas/codepointkata/CodePointKataTest.java b/code-point-kata-solutions/src/test/java/bny/codekatas/codepointkata/CodePointKataTest.java
similarity index 97%
rename from code-point-kata-solutions/src/test/java/bnymellon/codekatas/codepointkata/CodePointKataTest.java
rename to code-point-kata-solutions/src/test/java/bny/codekatas/codepointkata/CodePointKataTest.java
index 3362c57f..fb898941 100644
--- a/code-point-kata-solutions/src/test/java/bnymellon/codekatas/codepointkata/CodePointKataTest.java
+++ b/code-point-kata-solutions/src/test/java/bny/codekatas/codepointkata/CodePointKataTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.codepointkata;
+package bny.codekatas.codepointkata;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/code-point-kata/pom.xml b/code-point-kata/pom.xml
index 175c61a1..b89db7d4 100644
--- a/code-point-kata/pom.xml
+++ b/code-point-kata/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.codekatas</groupId>
+    <groupId>bny.codekatas</groupId>
     <artifactId>code-point-kata</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
diff --git a/code-point-kata/src/test/java/bnymellon/codekatas/codepointkata/CodePointKataTest.java b/code-point-kata/src/test/java/bny/codekatas/codepointkata/CodePointKataTest.java
similarity index 97%
rename from code-point-kata/src/test/java/bnymellon/codekatas/codepointkata/CodePointKataTest.java
rename to code-point-kata/src/test/java/bny/codekatas/codepointkata/CodePointKataTest.java
index 79d0eddc..1ccb84dd 100644
--- a/code-point-kata/src/test/java/bnymellon/codekatas/codepointkata/CodePointKataTest.java
+++ b/code-point-kata/src/test/java/bny/codekatas/codepointkata/CodePointKataTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.codepointkata;
+package bny.codekatas.codepointkata;
 
 import org.eclipse.collections.api.bag.primitive.CharBag;
 import org.eclipse.collections.api.bag.primitive.MutableCharBag;
diff --git a/coffee-shop-kata-solutions/pom.xml b/coffee-shop-kata-solutions/pom.xml
index 361d61a4..ea2557cb 100644
--- a/coffee-shop-kata-solutions/pom.xml
+++ b/coffee-shop-kata-solutions/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.codekatas</groupId>
+    <groupId>bny.codekatas</groupId>
     <version>1.0.0-SNAPSHOT</version>
 
     <artifactId>coffee-shop-kata-solutions</artifactId>
diff --git a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopOrder.java b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/CoffeeShopOrder.java
similarity index 81%
rename from coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopOrder.java
rename to coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/CoffeeShopOrder.java
index 5fd20aa2..b0990549 100644
--- a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopOrder.java
+++ b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/CoffeeShopOrder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata;
+package bny.codekatas.coffeeshopkata;
 
-import bnymellon.codekatas.coffeeshopkata.beverage.Americano;
-import bnymellon.codekatas.coffeeshopkata.beverage.CoffeeDrink;
-import bnymellon.codekatas.coffeeshopkata.beverage.DrinkTemperature;
-import bnymellon.codekatas.coffeeshopkata.beverage.FlavorSyrup;
-import bnymellon.codekatas.coffeeshopkata.beverage.Latte;
-import bnymellon.codekatas.coffeeshopkata.beverage.Macchiato;
-import bnymellon.codekatas.coffeeshopkata.beverage.MilkType;
-import bnymellon.codekatas.coffeeshopkata.beverage.Tea;
-import bnymellon.codekatas.coffeeshopkata.beverage.TeaType;
-import bnymellon.codekatas.coffeeshopkata.food.Bagel;
-import bnymellon.codekatas.coffeeshopkata.food.BagelType;
-import bnymellon.codekatas.coffeeshopkata.food.Cookie;
-import bnymellon.codekatas.coffeeshopkata.food.CookieType;
-import bnymellon.codekatas.coffeeshopkata.food.Donut;
-import bnymellon.codekatas.coffeeshopkata.food.DonutType;
-import bnymellon.codekatas.coffeeshopkata.food.SpreadType;
+import bny.codekatas.coffeeshopkata.beverage.Americano;
+import bny.codekatas.coffeeshopkata.beverage.CoffeeDrink;
+import bny.codekatas.coffeeshopkata.beverage.DrinkTemperature;
+import bny.codekatas.coffeeshopkata.beverage.FlavorSyrup;
+import bny.codekatas.coffeeshopkata.beverage.Latte;
+import bny.codekatas.coffeeshopkata.beverage.Macchiato;
+import bny.codekatas.coffeeshopkata.beverage.MilkType;
+import bny.codekatas.coffeeshopkata.beverage.Tea;
+import bny.codekatas.coffeeshopkata.beverage.TeaType;
+import bny.codekatas.coffeeshopkata.food.Bagel;
+import bny.codekatas.coffeeshopkata.food.BagelType;
+import bny.codekatas.coffeeshopkata.food.Cookie;
+import bny.codekatas.coffeeshopkata.food.CookieType;
+import bny.codekatas.coffeeshopkata.food.Donut;
+import bny.codekatas.coffeeshopkata.food.DonutType;
+import bny.codekatas.coffeeshopkata.food.SpreadType;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/Item.java b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/Item.java
similarity index 87%
rename from coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/Item.java
rename to coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/Item.java
index edd0f136..7d84e354 100644
--- a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/Item.java
+++ b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/Item.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata;
+package bny.codekatas.coffeeshopkata;
 
 public interface Item
 {
diff --git a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Americano.java b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/Americano.java
similarity index 92%
rename from coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Americano.java
rename to coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/Americano.java
index be6f6a1a..e898bb2d 100644
--- a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Americano.java
+++ b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/Americano.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public non-sealed class Americano implements CoffeeDrink
 {
diff --git a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Beverage.java b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/Beverage.java
similarity index 80%
rename from coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Beverage.java
rename to coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/Beverage.java
index e5a9bb40..74d86410 100644
--- a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Beverage.java
+++ b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/Beverage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
-import bnymellon.codekatas.coffeeshopkata.Item;
+import bny.codekatas.coffeeshopkata.Item;
 
 public interface Beverage extends Item
 {
diff --git a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/CoffeeDrink.java b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/CoffeeDrink.java
similarity index 87%
rename from coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/CoffeeDrink.java
rename to coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/CoffeeDrink.java
index 2fd3fdb8..efb43360 100644
--- a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/CoffeeDrink.java
+++ b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/CoffeeDrink.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public sealed interface CoffeeDrink extends Beverage permits Latte, Macchiato, Americano
 {
diff --git a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/DrinkTemperature.java b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/DrinkTemperature.java
similarity index 86%
rename from coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/DrinkTemperature.java
rename to coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/DrinkTemperature.java
index 7c9b59ba..2644de0e 100644
--- a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/DrinkTemperature.java
+++ b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/DrinkTemperature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public enum DrinkTemperature
 {
diff --git a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/FlavorSyrup.java b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/FlavorSyrup.java
similarity index 86%
rename from coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/FlavorSyrup.java
rename to coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/FlavorSyrup.java
index f6b94288..c0f94d67 100644
--- a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/FlavorSyrup.java
+++ b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/FlavorSyrup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public enum FlavorSyrup
 {
diff --git a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Latte.java b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/Latte.java
similarity index 94%
rename from coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Latte.java
rename to coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/Latte.java
index 77c87f18..c89ceecc 100644
--- a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Latte.java
+++ b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/Latte.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public final class Latte implements CoffeeDrink
 {
diff --git a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Macchiato.java b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/Macchiato.java
similarity index 93%
rename from coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Macchiato.java
rename to coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/Macchiato.java
index 9c185bd4..74431f91 100644
--- a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Macchiato.java
+++ b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/Macchiato.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public non-sealed class Macchiato implements CoffeeDrink
 {
diff --git a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/MilkType.java b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/MilkType.java
similarity index 86%
rename from coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/MilkType.java
rename to coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/MilkType.java
index ff7984c7..39c5feaa 100644
--- a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/MilkType.java
+++ b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/MilkType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public enum MilkType
 {
diff --git a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Tea.java b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/Tea.java
similarity index 90%
rename from coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Tea.java
rename to coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/Tea.java
index 089b60de..526239d5 100644
--- a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Tea.java
+++ b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/Tea.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public class Tea implements Beverage
 {
diff --git a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/TeaType.java b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/TeaType.java
similarity index 86%
rename from coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/TeaType.java
rename to coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/TeaType.java
index 3fb2976f..2a1af19c 100644
--- a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/TeaType.java
+++ b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/beverage/TeaType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public enum TeaType
 {
diff --git a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Bagel.java b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/Bagel.java
similarity index 88%
rename from coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Bagel.java
rename to coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/Bagel.java
index ef1de12b..849d39d4 100644
--- a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Bagel.java
+++ b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/Bagel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 public record Bagel(BagelType bagelType, SpreadType spreadType, boolean toasted) implements BakeryItem
 {
diff --git a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BagelType.java b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/BagelType.java
similarity index 86%
rename from coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BagelType.java
rename to coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/BagelType.java
index 5d0c8e14..ceaf1479 100644
--- a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BagelType.java
+++ b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/BagelType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 public enum BagelType
 {
diff --git a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BakeryItem.java b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/BakeryItem.java
similarity index 81%
rename from coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BakeryItem.java
rename to coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/BakeryItem.java
index 099ba0f3..409e4c1a 100644
--- a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BakeryItem.java
+++ b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/BakeryItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
-import bnymellon.codekatas.coffeeshopkata.Item;
+import bny.codekatas.coffeeshopkata.Item;
 
 public interface BakeryItem extends Item
 {
diff --git a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Cookie.java b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/Cookie.java
similarity index 88%
rename from coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Cookie.java
rename to coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/Cookie.java
index 7f45f885..10d8f9e4 100644
--- a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Cookie.java
+++ b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/Cookie.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 public record Cookie(CookieType cookieType, boolean warmed) implements BakeryItem
 {
diff --git a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/CookieType.java b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/CookieType.java
similarity index 87%
rename from coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/CookieType.java
rename to coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/CookieType.java
index 26bc6806..efda991c 100644
--- a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/CookieType.java
+++ b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/CookieType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 public enum CookieType
 {
diff --git a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Donut.java b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/Donut.java
similarity index 88%
rename from coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Donut.java
rename to coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/Donut.java
index 5aedfa4e..0a49a6bc 100644
--- a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Donut.java
+++ b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/Donut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 public record Donut(DonutType donutType) implements BakeryItem
 {
diff --git a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/DonutType.java b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/DonutType.java
similarity index 87%
rename from coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/DonutType.java
rename to coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/DonutType.java
index 4859d435..7581356b 100644
--- a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/DonutType.java
+++ b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/DonutType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 public enum DonutType
 {
diff --git a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/SpreadType.java b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/SpreadType.java
similarity index 87%
rename from coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/SpreadType.java
rename to coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/SpreadType.java
index 25c42445..fc8185bb 100644
--- a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/SpreadType.java
+++ b/coffee-shop-kata-solutions/src/main/java/bny/codekatas/coffeeshopkata/food/SpreadType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 public enum SpreadType
 {
diff --git a/coffee-shop-kata-solutions/src/test/java/bnymellon/codekata/coffeeshopkata/CoffeeShopTest.java b/coffee-shop-kata-solutions/src/test/java/bny/codekata/coffeeshopkata/CoffeeShopTest.java
similarity index 76%
rename from coffee-shop-kata-solutions/src/test/java/bnymellon/codekata/coffeeshopkata/CoffeeShopTest.java
rename to coffee-shop-kata-solutions/src/test/java/bny/codekata/coffeeshopkata/CoffeeShopTest.java
index 2741f7f5..411fa815 100644
--- a/coffee-shop-kata-solutions/src/test/java/bnymellon/codekata/coffeeshopkata/CoffeeShopTest.java
+++ b/coffee-shop-kata-solutions/src/test/java/bny/codekata/coffeeshopkata/CoffeeShopTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-package bnymellon.codekata.coffeeshopkata;
+package bny.codekata.coffeeshopkata;
 
-import bnymellon.codekatas.coffeeshopkata.CoffeeShopOrder;
-import bnymellon.codekatas.coffeeshopkata.Item;
-import bnymellon.codekatas.coffeeshopkata.beverage.Americano;
-import bnymellon.codekatas.coffeeshopkata.beverage.CoffeeDrink;
-import bnymellon.codekatas.coffeeshopkata.beverage.DrinkTemperature;
-import bnymellon.codekatas.coffeeshopkata.beverage.Latte;
-import bnymellon.codekatas.coffeeshopkata.beverage.Macchiato;
-import bnymellon.codekatas.coffeeshopkata.food.Bagel;
-import bnymellon.codekatas.coffeeshopkata.food.Cookie;
-import bnymellon.codekatas.coffeeshopkata.food.Donut;
+import bny.codekatas.coffeeshopkata.CoffeeShopOrder;
+import bny.codekatas.coffeeshopkata.Item;
+import bny.codekatas.coffeeshopkata.beverage.Americano;
+import bny.codekatas.coffeeshopkata.beverage.CoffeeDrink;
+import bny.codekatas.coffeeshopkata.beverage.DrinkTemperature;
+import bny.codekatas.coffeeshopkata.beverage.Latte;
+import bny.codekatas.coffeeshopkata.beverage.Macchiato;
+import bny.codekatas.coffeeshopkata.food.Bagel;
+import bny.codekatas.coffeeshopkata.food.Cookie;
+import bny.codekatas.coffeeshopkata.food.Donut;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.List;
 
-import static bnymellon.codekatas.coffeeshopkata.food.BagelType.EVERYTHING;
-import static bnymellon.codekatas.coffeeshopkata.food.CookieType.CHOCOLATE_CHIP;
-import static bnymellon.codekatas.coffeeshopkata.food.DonutType.GLAZED;
-import static bnymellon.codekatas.coffeeshopkata.food.SpreadType.HERB_GARLIC_CREAM_CHEESE;
+import static bny.codekatas.coffeeshopkata.food.BagelType.EVERYTHING;
+import static bny.codekatas.coffeeshopkata.food.CookieType.CHOCOLATE_CHIP;
+import static bny.codekatas.coffeeshopkata.food.DonutType.GLAZED;
+import static bny.codekatas.coffeeshopkata.food.SpreadType.HERB_GARLIC_CREAM_CHEESE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/coffee-shop-kata/README.md b/coffee-shop-kata/README.md
index 8b477a48..ce394986 100644
--- a/coffee-shop-kata/README.md
+++ b/coffee-shop-kata/README.md
@@ -5,18 +5,18 @@ Java features while comparing them with older.
 
 The domain for the kata is a Coffee Shop. There are several domain
 classes that are shared by all the exercises. These are
-[`Items`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/Item.java),
-[`CoffeeShopOrder`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopOrder.java),
-[`Beverage`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Beverage.java),
-[`Tea`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Tea.java),
-[`CoffeeDrink`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/CoffeeDrink.java),
-[`Latte`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Latte.java),
-[`Macchiato`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Macchiato.java),
-[`Americano`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Americano.java),
-[`BakeryItem`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BakeryItem.java),
-[`Cookie`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Cookie.java),
-[`Bagel`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Bagel.java), and
-[`Donut`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Donut.java).
+[`Items`](jdk8/src/main/java/bny/codekatas/coffeeshopkata/Item.java),
+[`CoffeeShopOrder`](jdk8/src/main/java/bny/codekatas/coffeeshopkata/CoffeeShopOrder.java),
+[`Beverage`](jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/Beverage.java),
+[`Tea`](jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/Tea.java),
+[`CoffeeDrink`](jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/CoffeeDrink.java),
+[`Latte`](jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/Latte.java),
+[`Macchiato`](jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/Macchiato.java),
+[`Americano`](jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/Americano.java),
+[`BakeryItem`](jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/BakeryItem.java),
+[`Cookie`](jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/Cookie.java),
+[`Bagel`](jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/Bagel.java), and
+[`Donut`](jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/Donut.java).
 
 ![Diagram](CoffeeShopDomain.png)
 
@@ -34,6 +34,6 @@ problems; there are no TODOs in this module. For technical setup, follow the ins
 
 ## Getting started ##
 
-1. Run the Tests in [CoffeeShopTest](jdk21/src/test/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopTest.java)
+1. Run the Tests in [CoffeeShopTest](jdk21/src/test/java/bny/codekatas/coffeeshopkata/CoffeeShopTest.java)
 2. Fix the Code Using "TODO" and "HINT" Comments
 3. Repeat step 1 and 2 until all tests pass
\ No newline at end of file
diff --git a/coffee-shop-kata/SETUP.md b/coffee-shop-kata/SETUP.md
index 8098bc9a..03103770 100644
--- a/coffee-shop-kata/SETUP.md
+++ b/coffee-shop-kata/SETUP.md
@@ -18,10 +18,10 @@
    - Set the Project language level to "21 - Record patterns, pattern matching for switch...".
    - Make sure you have the correct JDK selected.
 4. To verify that the Java 8 module is set up correctly,
-   run [CoffeeShopTest](jdk8/src/test/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopTest.java) in the
+   run [CoffeeShopTest](jdk8/src/test/java/bny/codekatas/coffeeshopkata/CoffeeShopTest.java) in the
    jdk8 module - the class should compile and all tests will pass.
 5. To verify that the Java 21 module is set up correctly,
-   run [CoffeeShopTest](jdk21/src/test/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopTest.java) in the
+   run [CoffeeShopTest](jdk21/src/test/java/bny/codekatas/coffeeshopkata/CoffeeShopTest.java) in the
    jdk21 module - the class should compile but all tests will fail.
 
 ### Getting started
diff --git a/coffee-shop-kata/jdk21/pom.xml b/coffee-shop-kata/jdk21/pom.xml
index 94361361..36bbd41d 100644
--- a/coffee-shop-kata/jdk21/pom.xml
+++ b/coffee-shop-kata/jdk21/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>bnymellon.codekatas</groupId>
+        <groupId>bny.codekatas</groupId>
         <artifactId>code-katas</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
diff --git a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopOrder.java b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/CoffeeShopOrder.java
similarity index 74%
rename from coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopOrder.java
rename to coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/CoffeeShopOrder.java
index 7bd1173a..8e38ab23 100644
--- a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopOrder.java
+++ b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/CoffeeShopOrder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,24 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata;
-
-import bnymellon.codekatas.coffeeshopkata.beverage.Americano;
-import bnymellon.codekatas.coffeeshopkata.beverage.CoffeeDrink;
-import bnymellon.codekatas.coffeeshopkata.beverage.DrinkTemperature;
-import bnymellon.codekatas.coffeeshopkata.beverage.FlavorSyrup;
-import bnymellon.codekatas.coffeeshopkata.beverage.Latte;
-import bnymellon.codekatas.coffeeshopkata.beverage.Macchiato;
-import bnymellon.codekatas.coffeeshopkata.beverage.MilkType;
-import bnymellon.codekatas.coffeeshopkata.beverage.Tea;
-import bnymellon.codekatas.coffeeshopkata.beverage.TeaType;
-import bnymellon.codekatas.coffeeshopkata.food.Bagel;
-import bnymellon.codekatas.coffeeshopkata.food.BagelType;
-import bnymellon.codekatas.coffeeshopkata.food.Cookie;
-import bnymellon.codekatas.coffeeshopkata.food.CookieType;
-import bnymellon.codekatas.coffeeshopkata.food.Donut;
-import bnymellon.codekatas.coffeeshopkata.food.DonutType;
-import bnymellon.codekatas.coffeeshopkata.food.SpreadType;
+package bny.codekatas.coffeeshopkata;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/Item.java b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/Item.java
similarity index 87%
rename from coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/Item.java
rename to coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/Item.java
index edd0f136..7d84e354 100644
--- a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/Item.java
+++ b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/Item.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata;
+package bny.codekatas.coffeeshopkata;
 
 public interface Item
 {
diff --git a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Americano.java b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/Americano.java
similarity index 91%
rename from coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Americano.java
rename to coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/Americano.java
index 10278d27..9caedaf8 100644
--- a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Americano.java
+++ b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/Americano.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public class Americano implements CoffeeDrink
 {
diff --git a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Beverage.java b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/Beverage.java
similarity index 80%
rename from coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Beverage.java
rename to coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/Beverage.java
index e3d1070b..db38ea4b 100644
--- a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Beverage.java
+++ b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/Beverage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
-import bnymellon.codekatas.coffeeshopkata.Item;
+import bny.codekatas.coffeeshopkata.Item;
 
 public interface Beverage extends Item
 {
diff --git a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/CoffeeDrink.java b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/CoffeeDrink.java
similarity index 92%
rename from coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/CoffeeDrink.java
rename to coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/CoffeeDrink.java
index 9258f3ec..06dae73d 100644
--- a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/CoffeeDrink.java
+++ b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/CoffeeDrink.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 /**
  * Prior to Java 15, a class was either declared as 'final' or left 'open,'
diff --git a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/DrinkTemperature.java b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/DrinkTemperature.java
similarity index 86%
rename from coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/DrinkTemperature.java
rename to coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/DrinkTemperature.java
index 7c9b59ba..2644de0e 100644
--- a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/DrinkTemperature.java
+++ b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/DrinkTemperature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public enum DrinkTemperature
 {
diff --git a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/FlavorSyrup.java b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/FlavorSyrup.java
similarity index 86%
rename from coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/FlavorSyrup.java
rename to coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/FlavorSyrup.java
index f6b94288..c0f94d67 100644
--- a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/FlavorSyrup.java
+++ b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/FlavorSyrup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public enum FlavorSyrup
 {
diff --git a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Latte.java b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/Latte.java
similarity index 82%
rename from coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Latte.java
rename to coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/Latte.java
index 63b41265..5c1a9370 100644
--- a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Latte.java
+++ b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/Latte.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
-import bnymellon.codekatas.coffeeshopkata.beverage.CoffeeDrink;
-import bnymellon.codekatas.coffeeshopkata.beverage.DrinkTemperature;
-import bnymellon.codekatas.coffeeshopkata.beverage.FlavorSyrup;
-import bnymellon.codekatas.coffeeshopkata.beverage.MilkType;
+import bny.codekatas.coffeeshopkata.beverage.CoffeeDrink;
+import bny.codekatas.coffeeshopkata.beverage.DrinkTemperature;
+import bny.codekatas.coffeeshopkata.beverage.FlavorSyrup;
+import bny.codekatas.coffeeshopkata.beverage.MilkType;
 
 public class Latte implements CoffeeDrink
 {
diff --git a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Macchiato.java b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/Macchiato.java
similarity index 93%
rename from coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Macchiato.java
rename to coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/Macchiato.java
index dd2f67fb..0d9da3b4 100644
--- a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Macchiato.java
+++ b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/Macchiato.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public class Macchiato implements CoffeeDrink
 {
diff --git a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/MilkType.java b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/MilkType.java
similarity index 86%
rename from coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/MilkType.java
rename to coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/MilkType.java
index ff7984c7..39c5feaa 100644
--- a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/MilkType.java
+++ b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/MilkType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public enum MilkType
 {
diff --git a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Tea.java b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/Tea.java
similarity index 81%
rename from coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Tea.java
rename to coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/Tea.java
index 1bdb12b3..38510e32 100644
--- a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Tea.java
+++ b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/Tea.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
-import bnymellon.codekatas.coffeeshopkata.beverage.Beverage;
-import bnymellon.codekatas.coffeeshopkata.beverage.TeaType;
+import bny.codekatas.coffeeshopkata.beverage.Beverage;
+import bny.codekatas.coffeeshopkata.beverage.TeaType;
 
 public class Tea implements Beverage
 {
diff --git a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/TeaType.java b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/TeaType.java
similarity index 86%
rename from coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/TeaType.java
rename to coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/TeaType.java
index 3fb2976f..2a1af19c 100644
--- a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/TeaType.java
+++ b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/beverage/TeaType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public enum TeaType
 {
diff --git a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Bagel.java b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/Bagel.java
similarity index 94%
rename from coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Bagel.java
rename to coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/Bagel.java
index 3f6135bf..e728cc42 100644
--- a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Bagel.java
+++ b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/Bagel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 /**
  * Replace the entire class with a Record.
diff --git a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BagelType.java b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/BagelType.java
similarity index 86%
rename from coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BagelType.java
rename to coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/BagelType.java
index 5d0c8e14..ceaf1479 100644
--- a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BagelType.java
+++ b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/BagelType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 public enum BagelType
 {
diff --git a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BakeryItem.java b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/BakeryItem.java
similarity index 81%
rename from coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BakeryItem.java
rename to coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/BakeryItem.java
index 099ba0f3..409e4c1a 100644
--- a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BakeryItem.java
+++ b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/BakeryItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
-import bnymellon.codekatas.coffeeshopkata.Item;
+import bny.codekatas.coffeeshopkata.Item;
 
 public interface BakeryItem extends Item
 {
diff --git a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Cookie.java b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/Cookie.java
similarity index 88%
rename from coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Cookie.java
rename to coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/Cookie.java
index 7f45f885..10d8f9e4 100644
--- a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Cookie.java
+++ b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/Cookie.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 public record Cookie(CookieType cookieType, boolean warmed) implements BakeryItem
 {
diff --git a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/CookieType.java b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/CookieType.java
similarity index 87%
rename from coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/CookieType.java
rename to coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/CookieType.java
index 26bc6806..efda991c 100644
--- a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/CookieType.java
+++ b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/CookieType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 public enum CookieType
 {
diff --git a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Donut.java b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/Donut.java
similarity index 88%
rename from coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Donut.java
rename to coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/Donut.java
index 5aedfa4e..0a49a6bc 100644
--- a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Donut.java
+++ b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/Donut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 public record Donut(DonutType donutType) implements BakeryItem
 {
diff --git a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/DonutType.java b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/DonutType.java
similarity index 87%
rename from coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/DonutType.java
rename to coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/DonutType.java
index 4859d435..7581356b 100644
--- a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/DonutType.java
+++ b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/DonutType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 public enum DonutType
 {
diff --git a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/SpreadType.java b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/SpreadType.java
similarity index 87%
rename from coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/SpreadType.java
rename to coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/SpreadType.java
index 25c42445..fc8185bb 100644
--- a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/SpreadType.java
+++ b/coffee-shop-kata/jdk21/src/main/java/bny/codekatas/coffeeshopkata/food/SpreadType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 public enum SpreadType
 {
diff --git a/coffee-shop-kata/jdk21/src/test/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopTest.java b/coffee-shop-kata/jdk21/src/test/java/bny/codekatas/coffeeshopkata/CoffeeShopTest.java
similarity index 81%
rename from coffee-shop-kata/jdk21/src/test/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopTest.java
rename to coffee-shop-kata/jdk21/src/test/java/bny/codekatas/coffeeshopkata/CoffeeShopTest.java
index 2381a45c..a2aa4735 100644
--- a/coffee-shop-kata/jdk21/src/test/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopTest.java
+++ b/coffee-shop-kata/jdk21/src/test/java/bny/codekatas/coffeeshopkata/CoffeeShopTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata;
+package bny.codekatas.coffeeshopkata;
 
-import bnymellon.codekatas.coffeeshopkata.beverage.Americano;
-import bnymellon.codekatas.coffeeshopkata.beverage.CoffeeDrink;
-import bnymellon.codekatas.coffeeshopkata.beverage.DrinkTemperature;
-import bnymellon.codekatas.coffeeshopkata.beverage.Latte;
-import bnymellon.codekatas.coffeeshopkata.beverage.Macchiato;
-import bnymellon.codekatas.coffeeshopkata.food.Bagel;
-import bnymellon.codekatas.coffeeshopkata.food.Cookie;
-import bnymellon.codekatas.coffeeshopkata.food.Donut;
+import bny.codekatas.coffeeshopkata.beverage.Americano;
+import bny.codekatas.coffeeshopkata.beverage.CoffeeDrink;
+import bny.codekatas.coffeeshopkata.beverage.DrinkTemperature;
+import bny.codekatas.coffeeshopkata.beverage.Latte;
+import bny.codekatas.coffeeshopkata.beverage.Macchiato;
+import bny.codekatas.coffeeshopkata.food.Bagel;
+import bny.codekatas.coffeeshopkata.food.Cookie;
+import bny.codekatas.coffeeshopkata.food.Donut;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -31,10 +31,10 @@
 import java.util.Collections;
 import java.util.List;
 
-import static bnymellon.codekatas.coffeeshopkata.food.BagelType.EVERYTHING;
-import static bnymellon.codekatas.coffeeshopkata.food.CookieType.CHOCOLATE_CHIP;
-import static bnymellon.codekatas.coffeeshopkata.food.DonutType.GLAZED;
-import static bnymellon.codekatas.coffeeshopkata.food.SpreadType.HERB_GARLIC_CREAM_CHEESE;
+import static bny.codekatas.coffeeshopkata.food.BagelType.EVERYTHING;
+import static bny.codekatas.coffeeshopkata.food.CookieType.CHOCOLATE_CHIP;
+import static bny.codekatas.coffeeshopkata.food.DonutType.GLAZED;
+import static bny.codekatas.coffeeshopkata.food.SpreadType.HERB_GARLIC_CREAM_CHEESE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/coffee-shop-kata/jdk8/pom.xml b/coffee-shop-kata/jdk8/pom.xml
index 10e415cc..549db302 100644
--- a/coffee-shop-kata/jdk8/pom.xml
+++ b/coffee-shop-kata/jdk8/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>bnymellon.codekatas</groupId>
+        <groupId>bny.codekatas</groupId>
         <artifactId>code-katas</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
diff --git a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopOrder.java b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/CoffeeShopOrder.java
similarity index 82%
rename from coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopOrder.java
rename to coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/CoffeeShopOrder.java
index f3c834f3..70690e96 100644
--- a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopOrder.java
+++ b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/CoffeeShopOrder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata;
+package bny.codekatas.coffeeshopkata;
 
-import bnymellon.codekatas.coffeeshopkata.beverage.Americano;
-import bnymellon.codekatas.coffeeshopkata.beverage.CoffeeDrink;
-import bnymellon.codekatas.coffeeshopkata.beverage.DrinkTemperature;
-import bnymellon.codekatas.coffeeshopkata.beverage.FlavorSyrup;
-import bnymellon.codekatas.coffeeshopkata.beverage.Latte;
-import bnymellon.codekatas.coffeeshopkata.beverage.Macchiato;
-import bnymellon.codekatas.coffeeshopkata.beverage.MilkType;
-import bnymellon.codekatas.coffeeshopkata.beverage.Tea;
-import bnymellon.codekatas.coffeeshopkata.beverage.TeaType;
-import bnymellon.codekatas.coffeeshopkata.food.Bagel;
-import bnymellon.codekatas.coffeeshopkata.food.BagelType;
-import bnymellon.codekatas.coffeeshopkata.food.Cookie;
-import bnymellon.codekatas.coffeeshopkata.food.CookieType;
-import bnymellon.codekatas.coffeeshopkata.food.Donut;
-import bnymellon.codekatas.coffeeshopkata.food.DonutType;
-import bnymellon.codekatas.coffeeshopkata.food.SpreadType;
+import bny.codekatas.coffeeshopkata.beverage.Americano;
+import bny.codekatas.coffeeshopkata.beverage.CoffeeDrink;
+import bny.codekatas.coffeeshopkata.beverage.DrinkTemperature;
+import bny.codekatas.coffeeshopkata.beverage.FlavorSyrup;
+import bny.codekatas.coffeeshopkata.beverage.Latte;
+import bny.codekatas.coffeeshopkata.beverage.Macchiato;
+import bny.codekatas.coffeeshopkata.beverage.MilkType;
+import bny.codekatas.coffeeshopkata.beverage.Tea;
+import bny.codekatas.coffeeshopkata.beverage.TeaType;
+import bny.codekatas.coffeeshopkata.food.Bagel;
+import bny.codekatas.coffeeshopkata.food.BagelType;
+import bny.codekatas.coffeeshopkata.food.Cookie;
+import bny.codekatas.coffeeshopkata.food.CookieType;
+import bny.codekatas.coffeeshopkata.food.Donut;
+import bny.codekatas.coffeeshopkata.food.DonutType;
+import bny.codekatas.coffeeshopkata.food.SpreadType;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/Item.java b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/Item.java
similarity index 87%
rename from coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/Item.java
rename to coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/Item.java
index 362dcfd4..f38e3729 100644
--- a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/Item.java
+++ b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/Item.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata;
+package bny.codekatas.coffeeshopkata;
 
 public interface Item
 {
diff --git a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Americano.java b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/Americano.java
similarity index 92%
rename from coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Americano.java
rename to coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/Americano.java
index 9e130139..c2154c0f 100644
--- a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Americano.java
+++ b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/Americano.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public final class Americano implements CoffeeDrink
 {
diff --git a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Beverage.java b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/Beverage.java
similarity index 80%
rename from coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Beverage.java
rename to coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/Beverage.java
index e5a9bb40..74d86410 100644
--- a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Beverage.java
+++ b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/Beverage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
-import bnymellon.codekatas.coffeeshopkata.Item;
+import bny.codekatas.coffeeshopkata.Item;
 
 public interface Beverage extends Item
 {
diff --git a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/CoffeeDrink.java b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/CoffeeDrink.java
similarity index 86%
rename from coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/CoffeeDrink.java
rename to coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/CoffeeDrink.java
index ac038e66..666ae2ee 100644
--- a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/CoffeeDrink.java
+++ b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/CoffeeDrink.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public interface CoffeeDrink extends Beverage
 {
diff --git a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/DrinkTemperature.java b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/DrinkTemperature.java
similarity index 86%
rename from coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/DrinkTemperature.java
rename to coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/DrinkTemperature.java
index 7c9b59ba..2644de0e 100644
--- a/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/DrinkTemperature.java
+++ b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/DrinkTemperature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public enum DrinkTemperature
 {
diff --git a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/FlavorSyrup.java b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/FlavorSyrup.java
similarity index 86%
rename from coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/FlavorSyrup.java
rename to coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/FlavorSyrup.java
index f6b94288..c0f94d67 100644
--- a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/FlavorSyrup.java
+++ b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/FlavorSyrup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public enum FlavorSyrup
 {
diff --git a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Latte.java b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/Latte.java
similarity index 94%
rename from coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Latte.java
rename to coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/Latte.java
index 77c87f18..c89ceecc 100644
--- a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Latte.java
+++ b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/Latte.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public final class Latte implements CoffeeDrink
 {
diff --git a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Macchiato.java b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/Macchiato.java
similarity index 93%
rename from coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Macchiato.java
rename to coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/Macchiato.java
index ac0eb87f..ed0a0f93 100644
--- a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Macchiato.java
+++ b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/Macchiato.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public final class Macchiato implements CoffeeDrink
 {
diff --git a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/MilkType.java b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/MilkType.java
similarity index 86%
rename from coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/MilkType.java
rename to coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/MilkType.java
index ff7984c7..39c5feaa 100644
--- a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/MilkType.java
+++ b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/MilkType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public enum MilkType
 {
diff --git a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Tea.java b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/Tea.java
similarity index 90%
rename from coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Tea.java
rename to coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/Tea.java
index b7fc02ea..471b2386 100644
--- a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Tea.java
+++ b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/Tea.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public class Tea implements Beverage
 {
diff --git a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/TeaType.java b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/TeaType.java
similarity index 86%
rename from coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/TeaType.java
rename to coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/TeaType.java
index 3fb2976f..2a1af19c 100644
--- a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/TeaType.java
+++ b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/beverage/TeaType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.beverage;
+package bny.codekatas.coffeeshopkata.beverage;
 
 public enum TeaType
 {
diff --git a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Bagel.java b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/Bagel.java
similarity index 95%
rename from coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Bagel.java
rename to coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/Bagel.java
index fbc502ec..8a811cd8 100644
--- a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Bagel.java
+++ b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/Bagel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 import java.util.Objects;
 
diff --git a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BagelType.java b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/BagelType.java
similarity index 86%
rename from coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BagelType.java
rename to coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/BagelType.java
index 5d0c8e14..ceaf1479 100644
--- a/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BagelType.java
+++ b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/BagelType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 public enum BagelType
 {
diff --git a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BakeryItem.java b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/BakeryItem.java
similarity index 81%
rename from coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BakeryItem.java
rename to coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/BakeryItem.java
index 099ba0f3..409e4c1a 100644
--- a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BakeryItem.java
+++ b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/BakeryItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
-import bnymellon.codekatas.coffeeshopkata.Item;
+import bny.codekatas.coffeeshopkata.Item;
 
 public interface BakeryItem extends Item
 {
diff --git a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Cookie.java b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/Cookie.java
similarity index 94%
rename from coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Cookie.java
rename to coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/Cookie.java
index 849150ff..c7b6e57c 100644
--- a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Cookie.java
+++ b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/Cookie.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 import java.util.Objects;
 
diff --git a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/CookieType.java b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/CookieType.java
similarity index 87%
rename from coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/CookieType.java
rename to coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/CookieType.java
index 26bc6806..efda991c 100644
--- a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/CookieType.java
+++ b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/CookieType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 public enum CookieType
 {
diff --git a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Donut.java b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/Donut.java
similarity index 93%
rename from coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Donut.java
rename to coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/Donut.java
index d6dc686e..f79d54c2 100644
--- a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Donut.java
+++ b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/Donut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 import java.util.Objects;
 
diff --git a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/DonutType.java b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/DonutType.java
similarity index 87%
rename from coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/DonutType.java
rename to coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/DonutType.java
index 4859d435..7581356b 100644
--- a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/DonutType.java
+++ b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/DonutType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 public enum DonutType
 {
diff --git a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/SpreadType.java b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/SpreadType.java
similarity index 87%
rename from coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/SpreadType.java
rename to coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/SpreadType.java
index 25c42445..fc8185bb 100644
--- a/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/SpreadType.java
+++ b/coffee-shop-kata/jdk8/src/main/java/bny/codekatas/coffeeshopkata/food/SpreadType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.coffeeshopkata.food;
+package bny.codekatas.coffeeshopkata.food;
 
 public enum SpreadType
 {
diff --git a/coffee-shop-kata/jdk8/src/test/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopTest.java b/coffee-shop-kata/jdk8/src/test/java/bny/codekatas/coffeeshopkata/CoffeeShopTest.java
similarity index 80%
rename from coffee-shop-kata/jdk8/src/test/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopTest.java
rename to coffee-shop-kata/jdk8/src/test/java/bny/codekatas/coffeeshopkata/CoffeeShopTest.java
index cfa4afc5..2e984404 100644
--- a/coffee-shop-kata/jdk8/src/test/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopTest.java
+++ b/coffee-shop-kata/jdk8/src/test/java/bny/codekatas/coffeeshopkata/CoffeeShopTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.coffeeshopkata;
+package bny.codekatas.coffeeshopkata;
 
-import bnymellon.codekatas.coffeeshopkata.beverage.Americano;
-import bnymellon.codekatas.coffeeshopkata.beverage.DrinkTemperature;
-import bnymellon.codekatas.coffeeshopkata.food.Bagel;
-import bnymellon.codekatas.coffeeshopkata.food.Cookie;
-import bnymellon.codekatas.coffeeshopkata.food.Donut;
+import bny.codekatas.coffeeshopkata.beverage.Americano;
+import bny.codekatas.coffeeshopkata.beverage.DrinkTemperature;
+import bny.codekatas.coffeeshopkata.food.Bagel;
+import bny.codekatas.coffeeshopkata.food.Cookie;
+import bny.codekatas.coffeeshopkata.food.Donut;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -27,11 +27,12 @@
 import java.util.Collections;
 import java.util.List;
 
-import static bnymellon.codekatas.coffeeshopkata.food.BagelType.EVERYTHING;
-import static bnymellon.codekatas.coffeeshopkata.food.CookieType.CHOCOLATE_CHIP;
-import static bnymellon.codekatas.coffeeshopkata.food.DonutType.GLAZED;
-import static bnymellon.codekatas.coffeeshopkata.food.SpreadType.HERB_GARLIC_CREAM_CHEESE;
-import static org.junit.jupiter.api.Assertions.*;
+import static bny.codekatas.coffeeshopkata.food.BagelType.EVERYTHING;
+import static bny.codekatas.coffeeshopkata.food.CookieType.CHOCOLATE_CHIP;
+import static bny.codekatas.coffeeshopkata.food.DonutType.GLAZED;
+import static bny.codekatas.coffeeshopkata.food.SpreadType.HERB_GARLIC_CREAM_CHEESE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class CoffeeShopTest
 {
diff --git a/coffee-shop-kata/pom.xml b/coffee-shop-kata/pom.xml
index 430280e9..9153cce1 100644
--- a/coffee-shop-kata/pom.xml
+++ b/coffee-shop-kata/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.codekatas</groupId>
+    <groupId>bny.codekatas</groupId>
     <version>1.0.0-SNAPSHOT</version>
 
     <artifactId>coffee-shop-kata</artifactId>
diff --git a/deck-of-cards-kata-solutions/pom.xml b/deck-of-cards-kata-solutions/pom.xml
index 7e5282a7..79bb24bb 100644
--- a/deck-of-cards-kata-solutions/pom.xml
+++ b/deck-of-cards-kata-solutions/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.codekatas</groupId>
+    <groupId>bny.codekatas</groupId>
     <artifactId>deck-of-cards-kata-solutions</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
diff --git a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/Card.java b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/Card.java
similarity index 98%
rename from deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/Card.java
rename to deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/Card.java
index 53dece6f..c4af1568 100644
--- a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/Card.java
+++ b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/Card.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards;
+package bny.codekatas.deckofcards;
 
 import java.util.Comparator;
 import java.util.EnumSet;
diff --git a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/Rank.java b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/Rank.java
similarity index 96%
rename from deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/Rank.java
rename to deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/Rank.java
index fffaab3e..6bfdafef 100644
--- a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/Rank.java
+++ b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/Rank.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards;
+package bny.codekatas.deckofcards;
 
 public enum Rank
 {
diff --git a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/Suit.java b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/Suit.java
similarity index 95%
rename from deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/Suit.java
rename to deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/Suit.java
index 56d2289a..fc1ec4b1 100644
--- a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/Suit.java
+++ b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/Suit.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards;
+package bny.codekatas.deckofcards;
 
 public enum Suit
 {
diff --git a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/SuitMatchGame.java b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/SuitMatchGame.java
similarity index 99%
rename from deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/SuitMatchGame.java
rename to deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/SuitMatchGame.java
index f7cb9a29..d5010afc 100644
--- a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/SuitMatchGame.java
+++ b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/SuitMatchGame.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards;
+package bny.codekatas.deckofcards;
 
 import org.eclipse.collections.api.bag.Bag;
 import org.eclipse.collections.api.bag.MutableBag;
diff --git a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsList.java b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsList.java
similarity index 95%
rename from deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsList.java
rename to deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsList.java
index 9e36bc4a..d9ccd572 100644
--- a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsList.java
+++ b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsList.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -27,9 +27,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import org.apache.commons.collections4.Bag;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.collections4.ListValuedMap;
diff --git a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsList.java b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsList.java
similarity index 93%
rename from deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsList.java
rename to deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsList.java
index a194781f..84efa255 100644
--- a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsList.java
+++ b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsList.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.Random;
 import java.util.Set;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import org.eclipse.collections.api.bag.Bag;
 import org.eclipse.collections.api.list.ImmutableList;
 import org.eclipse.collections.api.multimap.list.ImmutableListMultimap;
diff --git a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsList.java b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsList.java
similarity index 94%
rename from deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsList.java
rename to deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsList.java
index 39501390..72854ee8 100644
--- a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsList.java
+++ b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsList.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -25,9 +25,9 @@
 import java.util.Set;
 import java.util.stream.IntStream;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import com.google.common.collect.HashMultiset;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableListMultimap;
diff --git a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsList.java b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsList.java
similarity index 95%
rename from deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsList.java
rename to deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsList.java
index 59ab8044..2d968e32 100644
--- a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsList.java
+++ b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsList.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -27,9 +27,9 @@
 import java.util.Random;
 import java.util.Set;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 
 public class JDKImperativeDeckOfCardsAsList
 {
diff --git a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsList.java b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsList.java
similarity index 94%
rename from deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsList.java
rename to deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsList.java
index bdd4a3cc..37cab3ba 100644
--- a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsList.java
+++ b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsList.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -28,9 +28,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 
 public class JavaStreamsDeckOfCardsAsList
 {
diff --git a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsList.java b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsList.java
similarity index 94%
rename from deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsList.java
rename to deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsList.java
index 6b5f09fa..ae401097 100644
--- a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsList.java
+++ b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsList.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.Collections;
 import java.util.Random;
 import java.util.stream.Collectors;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import io.vavr.Tuple;
 import io.vavr.Tuple2;
 import io.vavr.collection.HashMap;
diff --git a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSet.java b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSet.java
similarity index 95%
rename from deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSet.java
rename to deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSet.java
index c8bce07a..698b5691 100644
--- a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSet.java
+++ b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -29,9 +29,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import org.apache.commons.collections4.Bag;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.collections4.MultiMapUtils;
diff --git a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSet.java b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSet.java
similarity index 93%
rename from deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSet.java
rename to deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSet.java
index adf91c85..f986adc6 100644
--- a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSet.java
+++ b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSet.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.Random;
 import java.util.Set;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import org.eclipse.collections.api.bag.Bag;
 import org.eclipse.collections.api.list.ImmutableList;
 import org.eclipse.collections.api.multimap.sortedset.ImmutableSortedSetMultimap;
diff --git a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSet.java b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSet.java
similarity index 95%
rename from deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSet.java
rename to deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSet.java
index 98afe46c..9784d620 100644
--- a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSet.java
+++ b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -27,9 +27,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import com.google.common.collect.HashMultiset;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSetMultimap;
diff --git a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSet.java b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSet.java
similarity index 96%
rename from deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSet.java
rename to deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSet.java
index adb638f0..78c7fab2 100644
--- a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSet.java
+++ b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -30,9 +30,9 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 
 public class JDKImperativeDeckOfCardsAsSortedSet
 {
diff --git a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSet.java b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSet.java
similarity index 94%
rename from deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSet.java
rename to deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSet.java
index 001cc014..372bdc48 100644
--- a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSet.java
+++ b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -30,9 +30,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 
 public class JavaStreamsDeckOfCardsAsSortedSet
 {
diff --git a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSet.java b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSet.java
similarity index 95%
rename from deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSet.java
rename to deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSet.java
index 8f7822b5..39108ae3 100644
--- a/deck-of-cards-kata-solutions/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSet.java
+++ b/deck-of-cards-kata-solutions/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSet.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.Collections;
 import java.util.Random;
 import java.util.stream.Collectors;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import io.vavr.Tuple;
 import io.vavr.Tuple2;
 import io.vavr.collection.HashMap;
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/CardTest.java b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/CardTest.java
similarity index 97%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/CardTest.java
rename to deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/CardTest.java
index 0919dcf7..ec6037de 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/CardTest.java
+++ b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/CardTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards;
+package bny.codekatas.deckofcards;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/RankTest.java b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/RankTest.java
similarity index 95%
rename from deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/RankTest.java
rename to deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/RankTest.java
index 4a638967..600d1380 100644
--- a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/RankTest.java
+++ b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/RankTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards;
+package bny.codekatas.deckofcards;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/SuitMatchGameTest.java b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/SuitMatchGameTest.java
similarity index 97%
rename from deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/SuitMatchGameTest.java
rename to deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/SuitMatchGameTest.java
index 71011443..e6a13bee 100644
--- a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/SuitMatchGameTest.java
+++ b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/SuitMatchGameTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards;
+package bny.codekatas.deckofcards;
 
 import org.eclipse.collections.api.bag.MutableBag;
 import org.eclipse.collections.api.list.ListIterable;
diff --git a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsListTest.java b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsListTest.java
similarity index 97%
rename from deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsListTest.java
rename to deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsListTest.java
index 69aea684..0546f405 100644
--- a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsListTest.java
+++ b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Random;
 
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import org.apache.commons.collections4.Bag;
 import org.apache.commons.collections4.FluentIterable;
 import org.apache.commons.collections4.IterableUtils;
diff --git a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsListTest.java b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsListTest.java
similarity index 97%
rename from deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsListTest.java
rename to deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsListTest.java
index 8308f734..35a956f3 100644
--- a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsListTest.java
+++ b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.List;
 import java.util.Random;
 
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import org.eclipse.collections.api.factory.Bags;
 import org.eclipse.collections.impl.factory.Lists;
 import org.eclipse.collections.impl.factory.Sets;
diff --git a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsListTest.java b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsListTest.java
similarity index 97%
rename from deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsListTest.java
rename to deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsListTest.java
index 51c57388..3b9d4c11 100644
--- a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsListTest.java
+++ b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.List;
 import java.util.Random;
 
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.HashMultiset;
diff --git a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsListTest.java b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsListTest.java
similarity index 97%
rename from deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsListTest.java
rename to deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsListTest.java
index 3b90b173..2d6fe712 100644
--- a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsListTest.java
+++ b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.HashMap;
 import java.util.List;
@@ -23,9 +23,9 @@
 import java.util.Random;
 import java.util.stream.Collectors;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import org.eclipse.collections.impl.utility.Iterate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsListTest.java b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsListTest.java
similarity index 97%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsListTest.java
rename to deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsListTest.java
index 341f87a0..abf6c1cf 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsListTest.java
+++ b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.HashMap;
 import java.util.List;
@@ -22,8 +22,8 @@
 import java.util.Random;
 import java.util.stream.Collectors;
 
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import org.eclipse.collections.impl.utility.Iterate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsListTest.java b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsListTest.java
similarity index 97%
rename from deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsListTest.java
rename to deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsListTest.java
index 49801f8f..55c10811 100644
--- a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsListTest.java
+++ b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.Random;
 
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import io.vavr.collection.HashMap;
 import io.vavr.collection.List;
 import io.vavr.collection.Map;
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSetTest.java b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSetTest.java
similarity index 97%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSetTest.java
rename to deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSetTest.java
index 4c4ed8ff..ca77e6fc 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSetTest.java
+++ b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.Comparator;
 import java.util.Deque;
@@ -26,9 +26,9 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import org.apache.commons.collections4.Bag;
 import org.apache.commons.collections4.FluentIterable;
 import org.apache.commons.collections4.IterableUtils;
diff --git a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSetTest.java b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSetTest.java
similarity index 96%
rename from deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSetTest.java
rename to deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSetTest.java
index e9dca2c3..fcaa0b8e 100644
--- a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSetTest.java
+++ b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.Deque;
 import java.util.List;
@@ -23,9 +23,9 @@
 import java.util.Set;
 import java.util.SortedSet;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import org.eclipse.collections.api.factory.Bags;
 import org.eclipse.collections.api.list.ImmutableList;
 import org.eclipse.collections.api.multimap.sortedset.ImmutableSortedSetMultimap;
diff --git a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSetTest.java b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSetTest.java
similarity index 96%
rename from deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSetTest.java
rename to deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSetTest.java
index 9ce348f3..d0610560 100644
--- a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSetTest.java
+++ b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.Deque;
 import java.util.List;
@@ -23,9 +23,9 @@
 import java.util.Set;
 import java.util.SortedSet;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.HashMultiset;
diff --git a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSetTest.java b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSetTest.java
similarity index 97%
rename from deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSetTest.java
rename to deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSetTest.java
index e7678080..ec91e847 100644
--- a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSetTest.java
+++ b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.Deque;
 import java.util.HashMap;
@@ -25,9 +25,9 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import org.eclipse.collections.impl.utility.Iterate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSetTest.java b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSetTest.java
similarity index 96%
rename from deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSetTest.java
rename to deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSetTest.java
index d2731e62..b7132e12 100644
--- a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSetTest.java
+++ b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.Deque;
 import java.util.HashMap;
@@ -25,9 +25,9 @@
 import java.util.SortedSet;
 import java.util.stream.Collectors;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import org.eclipse.collections.impl.utility.Iterate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSetTest.java b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSetTest.java
similarity index 96%
rename from deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSetTest.java
rename to deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSetTest.java
index 24982163..c1cdf0bf 100644
--- a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSetTest.java
+++ b/deck-of-cards-kata-solutions/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.Deque;
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import io.vavr.collection.HashMap;
 import io.vavr.collection.Map;
 import org.junit.jupiter.api.Assertions;
diff --git a/deck-of-cards-kata/README.md b/deck-of-cards-kata/README.md
index c02f0b1e..aa1155da 100644
--- a/deck-of-cards-kata/README.md
+++ b/deck-of-cards-kata/README.md
@@ -8,9 +8,9 @@ talk from the Devoxx US 2017 conference.
 
 The domain for the kata is Deck of Playing Cards.  There are three
 classes that are shared by all of the exercises.  These are 
-[`Rank`](./src/main/java/bnymellon/codekatas/deckofcards/Rank.java), 
-[`Suit`](./src/main/java/bnymellon/codekatas/deckofcards/Suit.java) and 
-[`Card`](./src/main/java/bnymellon/codekatas/deckofcards/Card.java).  
+[`Rank`](./src/main/java/bny/codekatas/deckofcards/Rank.java), 
+[`Suit`](./src/main/java/bny/codekatas/deckofcards/Suit.java) and 
+[`Card`](./src/main/java/bny/codekatas/deckofcards/Card.java).  
 
 ![Diagram](diagram.png)
 
@@ -27,15 +27,15 @@ learn in the kata.  They are:
 * [Google Guava 31.1.1-jre](https://google.github.io/guava/releases/31.1-jre/api/docs/)
 * [Eclipse Collections 11.1.0](https://github.com/eclipse/eclipse-collections/blob/master/docs/0-RefGuide.adoc)
 * [Vavr 0.10.4](http://www.vavr.io/vavr-docs/)
-* [Custom Collections Framework](./src/main/java/bnymellon/codekatas/deckofcards/custom/collections/) (Uses features from [Project Amber](https://openjdk.java.net/projects/amber/))
+* [Custom Collections Framework](./src/main/java/bny/codekatas/deckofcards/custom/collections/) (Uses features from [Project Amber](https://openjdk.java.net/projects/amber/))
 
 There are two classes which are fully implemented and which have 
 passing tests.  They are:
 
-* [`JDKImperativeDeckOfCardsAsList`](./src/main/java/bnymellon/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsList.java)
-	* [`JDKImperativeDeckOfCardsAsListTest`](./src/test/java/bnymellon/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsListTest.java)
-* [`JDKImperativeDeckOfCardsAsSortedSet`](./src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSet.java)
-	* [`JDKImperativeDeckOfCardsAsSortedSetTest`](./src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSetTest.java)
+* [`JDKImperativeDeckOfCardsAsList`](./src/main/java/bny/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsList.java)
+	* [`JDKImperativeDeckOfCardsAsListTest`](./src/test/java/bny/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsListTest.java)
+* [`JDKImperativeDeckOfCardsAsSortedSet`](./src/main/java/bny/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSet.java)
+	* [`JDKImperativeDeckOfCardsAsSortedSetTest`](./src/test/java/bny/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSetTest.java)
 
 The JDK imperative deck of cards is used as the control subject in
 the tests for each of the other frameworks.  There are TODOs in each
@@ -48,8 +48,8 @@ class that must be completed in order for a test to pass.
 	* Replace the code with Java Streams - Look to use `flatMap` and `map`.
 * Choose whether you could like to solve the kata using an `ImmutableSortedList`
 or an `ImmutableSortedSet`.
-	* [`ImmutableSortedList`](./src/test/java/bnymellon/codekatas/deckofcards/list/immutable/) Tests
-	* [`ImmutableSortedSet`](./src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/) Tests
+	* [`ImmutableSortedList`](./src/test/java/bny/codekatas/deckofcards/list/immutable/) Tests
+	* [`ImmutableSortedSet`](./src/test/java/bny/codekatas/deckofcards/sortedset/immutable/) Tests
 * Choose the framework(s) you would like to complete the kata with.
 * Fix the failing tests for each framework.
 * Follow the TODOs and hints in each of the frameworks `DeckOfCards` domain class and test.
diff --git a/deck-of-cards-kata/pom.xml b/deck-of-cards-kata/pom.xml
index 8cfa8586..0a536bce 100644
--- a/deck-of-cards-kata/pom.xml
+++ b/deck-of-cards-kata/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.codekatas</groupId>
+    <groupId>bny.codekatas</groupId>
     <artifactId>deck-of-cards-kata</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/Card.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/Card.java
similarity index 95%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/Card.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/Card.java
index b95f607b..56c21606 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/Card.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/Card.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards;
+package bny.codekatas.deckofcards;
 
 import java.util.Set;
 import java.util.stream.Stream;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/Rank.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/Rank.java
similarity index 92%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/Rank.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/Rank.java
index 0b29f62f..600b1cda 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/Rank.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/Rank.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards;
+package bny.codekatas.deckofcards;
 
 public enum Rank
 {
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/Suit.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/Suit.java
similarity index 90%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/Suit.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/Suit.java
index 56d2289a..26037700 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/Suit.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/Suit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards;
+package bny.codekatas.deckofcards;
 
 public enum Suit
 {
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/AbstractMutableMultimap.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/AbstractMutableMultimap.java
similarity index 98%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/AbstractMutableMultimap.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/AbstractMutableMultimap.java
index a88c7379..5ca250c7 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/AbstractMutableMultimap.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/AbstractMutableMultimap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ArrayList2.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ArrayList2.java
similarity index 89%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ArrayList2.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ArrayList2.java
index 83c09141..f5940f7d 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ArrayList2.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ArrayList2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ArrayListMultimap.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ArrayListMultimap.java
similarity index 93%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ArrayListMultimap.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ArrayListMultimap.java
index 54fc0c80..ae6f8a07 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ArrayListMultimap.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ArrayListMultimap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 public class ArrayListMultimap<K, V>
         extends AbstractMutableMultimap<K, V, MutableList<V>>
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/Bag.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/Bag.java
similarity index 92%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/Bag.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/Bag.java
index 70cb2fbe..44f4c6ca 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/Bag.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/Bag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/CustomCollectionsDeckOfCardsAsList.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/CustomCollectionsDeckOfCardsAsList.java
similarity index 93%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/CustomCollectionsDeckOfCardsAsList.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/CustomCollectionsDeckOfCardsAsList.java
index f900d038..206fc2c5 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/CustomCollectionsDeckOfCardsAsList.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/CustomCollectionsDeckOfCardsAsList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.Random;
 import java.util.stream.IntStream;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 
 public class CustomCollectionsDeckOfCardsAsList
 {
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/EmptyIterator.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/EmptyIterator.java
similarity index 89%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/EmptyIterator.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/EmptyIterator.java
index 06845b1a..69fdd7a2 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/EmptyIterator.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/EmptyIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/HashBag.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/HashBag.java
similarity index 98%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/HashBag.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/HashBag.java
index 62cf9f91..03ef16e0 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/HashBag.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/HashBag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.lang.reflect.Array;
 import java.util.Collection;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/HashMap2.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/HashMap2.java
similarity index 88%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/HashMap2.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/HashMap2.java
index 52871b93..50a5c986 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/HashMap2.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/HashMap2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.HashMap;
 
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/HashSet2.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/HashSet2.java
similarity index 90%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/HashSet2.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/HashSet2.java
index 589835b0..5c2672e0 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/HashSet2.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/HashSet2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/HashSetMultimap.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/HashSetMultimap.java
similarity index 93%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/HashSetMultimap.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/HashSetMultimap.java
index e57ae50e..678c0af9 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/HashSetMultimap.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/HashSetMultimap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 public class HashSetMultimap<K, V>
         extends AbstractMutableMultimap<K, V, MutableSet<V>>
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableArrayList.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableArrayList.java
similarity index 95%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableArrayList.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableArrayList.java
index a15c5aaf..812c9009 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableArrayList.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableArrayList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.AbstractList;
 import java.util.Collection;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableBag.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableBag.java
similarity index 95%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableBag.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableBag.java
index f00196e1..dde9cbbd 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableBag.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableBag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableCollection.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableCollection.java
similarity index 94%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableCollection.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableCollection.java
index 8729323b..66b58896 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableCollection.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableEmptyBag.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableEmptyBag.java
similarity index 95%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableEmptyBag.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableEmptyBag.java
index e85d1eb2..635e34dc 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableEmptyBag.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableEmptyBag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.Iterator;
 import java.util.Spliterator;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableEmptyList.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableEmptyList.java
similarity index 95%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableEmptyList.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableEmptyList.java
index 2a7664a1..08b579ff 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableEmptyList.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableEmptyList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.AbstractList;
 import java.util.Iterator;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableEmptySet.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableEmptySet.java
similarity index 94%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableEmptySet.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableEmptySet.java
index 942d5520..1bf76b57 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableEmptySet.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableEmptySet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.Iterator;
 import java.util.Spliterator;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableHashBag.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableHashBag.java
similarity index 96%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableHashBag.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableHashBag.java
index b02f2c4e..7692190b 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableHashBag.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableHashBag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.AbstractCollection;
 import java.util.Collection;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableHashSet.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableHashSet.java
similarity index 95%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableHashSet.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableHashSet.java
index f3390fab..3172442b 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableHashSet.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableHashSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.AbstractSet;
 import java.util.Collection;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableList.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableList.java
similarity index 96%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableList.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableList.java
index f96a00a6..fd2fc76f 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableList.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableSet.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableSet.java
similarity index 96%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableSet.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableSet.java
index 88ea28b4..5982f11b 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableSet.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/ImmutableSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/List.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/List.java
similarity index 91%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/List.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/List.java
index 002644ca..bbdc4497 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/List.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/List.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableBag.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableBag.java
similarity index 97%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableBag.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableBag.java
index cd94b694..75914f0b 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableBag.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableBag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.Collection;
 import java.util.function.BiConsumer;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableCollection.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableCollection.java
similarity index 95%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableCollection.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableCollection.java
index 46b07977..72ba8311 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableCollection.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.Collection;
 import java.util.function.Consumer;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableList.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableList.java
similarity index 97%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableList.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableList.java
index 6c2d02ba..ecb7b090 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableList.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableListMultimap.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableListMultimap.java
similarity index 89%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableListMultimap.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableListMultimap.java
index 7229ee6f..37ce4d92 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableListMultimap.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableListMultimap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 public interface MutableListMultimap<K, V> extends MutableMultimap<K, V>
 {
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableMap.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableMap.java
similarity index 93%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableMap.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableMap.java
index 7c64cce6..c994b758 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableMap.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.Map;
 import java.util.function.Supplier;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableMultimap.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableMultimap.java
similarity index 91%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableMultimap.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableMultimap.java
index 9d34b5fd..a1c81476 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableMultimap.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableMultimap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.Map;
 import java.util.Set;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableSet.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableSet.java
similarity index 97%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableSet.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableSet.java
index 60b55cde..22d88285 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableSet.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableSetMultimap.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableSetMultimap.java
similarity index 88%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableSetMultimap.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableSetMultimap.java
index 94cd5edb..823944ba 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/MutableSetMultimap.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/MutableSetMultimap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 public interface MutableSetMultimap<K, V> extends MutableMultimap<K, V>
 {
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/RichIterable.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/RichIterable.java
similarity index 98%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/RichIterable.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/RichIterable.java
index 09758ce3..1320ee30 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/RichIterable.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/RichIterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.Collection;
 import java.util.Optional;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/Set.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/Set.java
similarity index 91%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/Set.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/Set.java
index acdc9018..f7926ee0 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/Set.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/Set.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/UnmodifiableArrayListMultimap.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/UnmodifiableArrayListMultimap.java
similarity index 97%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/UnmodifiableArrayListMultimap.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/UnmodifiableArrayListMultimap.java
index 6ecc7bb1..c159a275 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/UnmodifiableArrayListMultimap.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/UnmodifiableArrayListMultimap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.Map;
 import java.util.Set;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/UnmodifiableMutableList.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/UnmodifiableMutableList.java
similarity index 95%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/UnmodifiableMutableList.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/UnmodifiableMutableList.java
index ff680991..db42043e 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/UnmodifiableMutableList.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/UnmodifiableMutableList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.AbstractList;
 import java.util.Collection;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/UnmodifiableMutableMap.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/UnmodifiableMutableMap.java
similarity index 97%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/UnmodifiableMutableMap.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/UnmodifiableMutableMap.java
index 0539058d..2960b84f 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/custom/collections/UnmodifiableMutableMap.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/custom/collections/UnmodifiableMutableMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.AbstractMap;
 import java.util.Collection;
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsList.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsList.java
similarity index 93%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsList.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsList.java
index b38c1818..b25e31d4 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsList.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.Deque;
 import java.util.HashSet;
@@ -29,9 +29,9 @@
 import org.apache.commons.collections4.MultiSet;
 import org.apache.commons.collections4.MultiValuedMap;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 
 public class ApacheCommonsDeckOfCardsAsList
 {
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsList.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsList.java
similarity index 93%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsList.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsList.java
index d2f58494..db3398a4 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsList.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.Random;
 import java.util.Set;
@@ -26,9 +26,9 @@
 import org.eclipse.collections.api.set.MutableSet;
 import org.eclipse.collections.api.stack.MutableStack;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 
 public class EclipseCollectionsDeckOfCardsAsList
 {
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsList.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsList.java
similarity index 93%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsList.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsList.java
index 8ce0203a..00c8844a 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsList.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.Collection;
 import java.util.Deque;
@@ -29,9 +29,9 @@
 import com.google.common.collect.Multimaps;
 import com.google.common.collect.Multiset;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 
 public class GoogleGuavaDeckOfCardsAsList
 {
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsList.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsList.java
similarity index 94%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsList.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsList.java
index 5d95664e..fa1b40a4 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsList.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.*;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 
 public class JDKImperativeDeckOfCardsAsList
 {
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsList.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsList.java
similarity index 93%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsList.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsList.java
index 0d282f05..eae18efd 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsList.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.Collections;
 import java.util.Deque;
@@ -28,9 +28,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 
 public class JavaStreamsDeckOfCardsAsList
 {
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsList.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsList.java
similarity index 93%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsList.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsList.java
index 2b32a5b2..25127494 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsList.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.Random;
 import java.util.function.Function;
@@ -26,9 +26,9 @@
 import io.vavr.collection.Map;
 import io.vavr.collection.Set;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 
 public class VavrDeckOfCardsAsList
 {
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSet.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSet.java
similarity index 93%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSet.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSet.java
index 28b2af26..bc90b068 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSet.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.Deque;
 import java.util.HashSet;
@@ -30,9 +30,9 @@
 import org.apache.commons.collections4.MultiValuedMap;
 import org.apache.commons.collections4.SetValuedMap;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 
 public class ApacheCommonsDeckOfCardsAsSortedSet
 {
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSet.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSet.java
similarity index 93%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSet.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSet.java
index 4e649627..9b92a352 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSet.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.Random;
 import java.util.Set;
@@ -27,9 +27,9 @@
 import org.eclipse.collections.api.set.sorted.ImmutableSortedSet;
 import org.eclipse.collections.api.stack.MutableStack;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 
 public class EclipseCollectionsDeckOfCardsAsSortedSet
 {
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSet.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSet.java
similarity index 93%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSet.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSet.java
index 43c830ae..ba10d72b 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSet.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.Comparator;
 import java.util.Deque;
@@ -28,9 +28,9 @@
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Multiset;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 
 public class GoogleGuavaDeckOfCardsAsSortedSet
 {
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSet.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSet.java
similarity index 94%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSet.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSet.java
index d1c26744..d52015f9 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSet.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.*;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 
 public class JDKImperativeDeckOfCardsAsSortedSet
 {
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSet.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSet.java
similarity index 93%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSet.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSet.java
index db114e3e..f0d48b62 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSet.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.Collections;
 import java.util.Deque;
@@ -29,9 +29,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 
 public class JavaStreamsDeckOfCardsAsSortedSet
 {
diff --git a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSet.java b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSet.java
similarity index 94%
rename from deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSet.java
rename to deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSet.java
index dc9bc5f4..c6f3005f 100644
--- a/deck-of-cards-kata/src/main/java/bnymellon/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSet.java
+++ b/deck-of-cards-kata/src/main/java/bny/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.Random;
 import java.util.function.Function;
@@ -28,9 +28,9 @@
 import io.vavr.collection.SortedSet;
 import io.vavr.collection.TreeSet;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 
 public class VavrDeckOfCardsAsSortedSet
 {
diff --git a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/CardTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/CardTest.java
similarity index 97%
rename from deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/CardTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/CardTest.java
index 0919dcf7..ec6037de 100644
--- a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/CardTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/CardTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards;
+package bny.codekatas.deckofcards;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/RankTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/RankTest.java
similarity index 95%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/RankTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/RankTest.java
index 4a638967..600d1380 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/RankTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/RankTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards;
+package bny.codekatas.deckofcards;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/ArrayListMultimapTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/ArrayListMultimapTest.java
similarity index 98%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/ArrayListMultimapTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/ArrayListMultimapTest.java
index 92cc8d80..fe910abb 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/ArrayListMultimapTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/ArrayListMultimapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.HashSet;
 
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/CustomCollectionsDeckOfCardsAsListTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/CustomCollectionsDeckOfCardsAsListTest.java
similarity index 96%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/CustomCollectionsDeckOfCardsAsListTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/CustomCollectionsDeckOfCardsAsListTest.java
index 51c5dd26..364661ea 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/CustomCollectionsDeckOfCardsAsListTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/CustomCollectionsDeckOfCardsAsListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.Objects;
 import java.util.Random;
 import java.util.stream.Collectors;
 
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
-import bnymellon.codekatas.deckofcards.list.immutable.JDKImperativeDeckOfCardsAsList;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.list.immutable.JDKImperativeDeckOfCardsAsList;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/HashBagTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/HashBagTest.java
similarity index 99%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/HashBagTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/HashBagTest.java
index 4e8d025e..695f2df8 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/HashBagTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/HashBagTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.Iterator;
 
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/HashSetMultimapTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/HashSetMultimapTest.java
similarity index 98%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/HashSetMultimapTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/HashSetMultimapTest.java
index 8f3fe502..b429b94e 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/HashSetMultimapTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/HashSetMultimapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.HashSet;
 
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableBagTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/ImmutableBagTest.java
similarity index 99%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableBagTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/ImmutableBagTest.java
index ededd700..e867a90f 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableBagTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/ImmutableBagTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.List;
 import java.util.Map;
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableListTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/ImmutableListTest.java
similarity index 99%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableListTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/ImmutableListTest.java
index 37e9ff28..7a3d129c 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableListTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/ImmutableListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.List;
 import java.util.Map;
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableSetTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/ImmutableSetTest.java
similarity index 98%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableSetTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/ImmutableSetTest.java
index 2011d865..36c79dca 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/ImmutableSetTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/ImmutableSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.List;
 import java.util.Map;
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/MutableListTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/MutableListTest.java
similarity index 99%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/MutableListTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/MutableListTest.java
index bee34215..963d039b 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/MutableListTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/MutableListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.List;
 import java.util.Map;
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/MutableMapTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/MutableMapTest.java
similarity index 90%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/MutableMapTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/MutableMapTest.java
index 78f29972..c4f3b08a 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/MutableMapTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/MutableMapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.Map;
 
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/MutableSetTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/MutableSetTest.java
similarity index 98%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/MutableSetTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/MutableSetTest.java
index d02348da..e246dfc6 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/MutableSetTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/MutableSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import java.util.List;
 import java.util.Map;
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/UnmodifiableArrayListMultimapTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/UnmodifiableArrayListMultimapTest.java
similarity index 97%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/UnmodifiableArrayListMultimapTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/UnmodifiableArrayListMultimapTest.java
index e7db477f..2c455759 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/custom/collections/UnmodifiableArrayListMultimapTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/custom/collections/UnmodifiableArrayListMultimapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.deckofcards.custom.collections;
+package bny.codekatas.deckofcards.custom.collections;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsListTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsListTest.java
similarity index 97%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsListTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsListTest.java
index 69aea684..0546f405 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsListTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/list/immutable/ApacheCommonsDeckOfCardsAsListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Random;
 
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import org.apache.commons.collections4.Bag;
 import org.apache.commons.collections4.FluentIterable;
 import org.apache.commons.collections4.IterableUtils;
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsListTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsListTest.java
similarity index 97%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsListTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsListTest.java
index 5ec2e74f..a78a87a3 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsListTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/list/immutable/EclipseCollectionsDeckOfCardsAsListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.List;
 import java.util.Random;
 
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import org.eclipse.collections.api.factory.Bags;
 import org.eclipse.collections.impl.factory.Lists;
 import org.eclipse.collections.impl.factory.Sets;
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsListTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsListTest.java
similarity index 96%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsListTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsListTest.java
index 92145165..919f6e8a 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsListTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/list/immutable/GoogleGuavaDeckOfCardsAsListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import com.google.common.base.Joiner;
 import com.google.common.collect.HashMultiset;
 import com.google.common.collect.Multiset;
@@ -28,7 +28,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsListTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsListTest.java
similarity index 97%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsListTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsListTest.java
index 3b90b173..2d6fe712 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsListTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/list/immutable/JDKImperativeDeckOfCardsAsListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.HashMap;
 import java.util.List;
@@ -23,9 +23,9 @@
 import java.util.Random;
 import java.util.stream.Collectors;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import org.eclipse.collections.impl.utility.Iterate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsListTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsListTest.java
similarity index 97%
rename from deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsListTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsListTest.java
index 341f87a0..abf6c1cf 100644
--- a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsListTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/list/immutable/JavaStreamsDeckOfCardsAsListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.HashMap;
 import java.util.List;
@@ -22,8 +22,8 @@
 import java.util.Random;
 import java.util.stream.Collectors;
 
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import org.eclipse.collections.impl.utility.Iterate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsListTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsListTest.java
similarity index 97%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsListTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsListTest.java
index 1e3cf26c..671306f3 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsListTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/list/immutable/VavrDeckOfCardsAsListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.list.immutable;
+package bny.codekatas.deckofcards.list.immutable;
 
 import java.util.Random;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import io.vavr.collection.HashMap;
 import io.vavr.collection.List;
 import io.vavr.collection.Map;
diff --git a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSetTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSetTest.java
similarity index 97%
rename from deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSetTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSetTest.java
index 4c4ed8ff..ca77e6fc 100644
--- a/deck-of-cards-kata-solutions/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSetTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/ApacheCommonsDeckOfCardsAsSortedSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.Comparator;
 import java.util.Deque;
@@ -26,9 +26,9 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import org.apache.commons.collections4.Bag;
 import org.apache.commons.collections4.FluentIterable;
 import org.apache.commons.collections4.IterableUtils;
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSetTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSetTest.java
similarity index 96%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSetTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSetTest.java
index f70322b6..976eb1c0 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSetTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/EclipseCollectionsDeckOfCardsAsSortedSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.Deque;
 import java.util.List;
@@ -23,9 +23,9 @@
 import java.util.Set;
 import java.util.SortedSet;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import org.eclipse.collections.api.factory.Bags;
 import org.eclipse.collections.api.list.ImmutableList;
 import org.eclipse.collections.api.multimap.sortedset.ImmutableSortedSetMultimap;
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSetTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSetTest.java
similarity index 96%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSetTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSetTest.java
index 1669806e..863f38b2 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSetTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/GoogleGuavaDeckOfCardsAsSortedSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.Deque;
 import java.util.List;
@@ -23,9 +23,9 @@
 import java.util.Set;
 import java.util.SortedSet;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.HashMultiset;
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSetTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSetTest.java
similarity index 97%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSetTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSetTest.java
index ef8577e9..898f426c 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSetTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/JDKImperativeDeckOfCardsAsSortedSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.Deque;
 import java.util.List;
@@ -25,9 +25,9 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import org.eclipse.collections.impl.utility.Iterate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSetTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSetTest.java
similarity index 96%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSetTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSetTest.java
index 6813d5fe..88af4d75 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSetTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/JavaStreamsDeckOfCardsAsSortedSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.Deque;
 import java.util.List;
@@ -25,9 +25,9 @@
 import java.util.SortedSet;
 import java.util.stream.Collectors;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 import org.eclipse.collections.impl.utility.Iterate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSetTest.java b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSetTest.java
similarity index 96%
rename from deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSetTest.java
rename to deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSetTest.java
index d26a7e66..d8d2cb27 100644
--- a/deck-of-cards-kata/src/test/java/bnymellon/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSetTest.java
+++ b/deck-of-cards-kata/src/test/java/bny/codekatas/deckofcards/sortedset/immutable/VavrDeckOfCardsAsSortedSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.deckofcards.sortedset.immutable;
+package bny.codekatas.deckofcards.sortedset.immutable;
 
 import java.util.Deque;
 import java.util.List;
@@ -26,9 +26,9 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import bnymellon.codekatas.deckofcards.Card;
-import bnymellon.codekatas.deckofcards.Rank;
-import bnymellon.codekatas.deckofcards.Suit;
+import bny.codekatas.deckofcards.Card;
+import bny.codekatas.deckofcards.Rank;
+import bny.codekatas.deckofcards.Suit;
 
 public class VavrDeckOfCardsAsSortedSetTest
 {
diff --git a/donut-kata-solutions/pom.xml b/donut-kata-solutions/pom.xml
index aef36c8f..612051b8 100644
--- a/donut-kata-solutions/pom.xml
+++ b/donut-kata-solutions/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.codekatas</groupId>
+    <groupId>bny.codekatas</groupId>
     <artifactId>donut-kata-solutions</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
diff --git a/donut-kata-solutions/src/main/java/bnymellon/codekatas/donutkata/Customer.java b/donut-kata-solutions/src/main/java/bny/codekatas/donutkata/Customer.java
similarity index 95%
rename from donut-kata-solutions/src/main/java/bnymellon/codekatas/donutkata/Customer.java
rename to donut-kata-solutions/src/main/java/bny/codekatas/donutkata/Customer.java
index 27eb4ae4..50c38107 100644
--- a/donut-kata-solutions/src/main/java/bnymellon/codekatas/donutkata/Customer.java
+++ b/donut-kata-solutions/src/main/java/bny/codekatas/donutkata/Customer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkata;
+package bny.codekatas.donutkata;
 
 import org.eclipse.collections.api.list.ListIterable;
 import org.eclipse.collections.api.list.MutableList;
diff --git a/donut-kata/src/main/java/bnymellon/codekatas/donutkata/Delivery.java b/donut-kata-solutions/src/main/java/bny/codekatas/donutkata/Delivery.java
similarity index 94%
rename from donut-kata/src/main/java/bnymellon/codekatas/donutkata/Delivery.java
rename to donut-kata-solutions/src/main/java/bny/codekatas/donutkata/Delivery.java
index ea1418db..b9fa8297 100644
--- a/donut-kata/src/main/java/bnymellon/codekatas/donutkata/Delivery.java
+++ b/donut-kata-solutions/src/main/java/bny/codekatas/donutkata/Delivery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkata;
+package bny.codekatas.donutkata;
 
 import java.time.LocalDate;
 
diff --git a/donut-kata/src/main/java/bnymellon/codekatas/donutkata/Donut.java b/donut-kata-solutions/src/main/java/bny/codekatas/donutkata/Donut.java
similarity index 87%
rename from donut-kata/src/main/java/bnymellon/codekatas/donutkata/Donut.java
rename to donut-kata-solutions/src/main/java/bny/codekatas/donutkata/Donut.java
index e56f08aa..fe9d690f 100644
--- a/donut-kata/src/main/java/bnymellon/codekatas/donutkata/Donut.java
+++ b/donut-kata-solutions/src/main/java/bny/codekatas/donutkata/Donut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkata;
+package bny.codekatas.donutkata;
 
 public record Donut(DonutType type, double price) {}
diff --git a/donut-kata-solutions/src/main/java/bnymellon/codekatas/donutkata/DonutShop.java b/donut-kata-solutions/src/main/java/bny/codekatas/donutkata/DonutShop.java
similarity index 98%
rename from donut-kata-solutions/src/main/java/bnymellon/codekatas/donutkata/DonutShop.java
rename to donut-kata-solutions/src/main/java/bny/codekatas/donutkata/DonutShop.java
index f77b0172..ce5b01ee 100644
--- a/donut-kata-solutions/src/main/java/bnymellon/codekatas/donutkata/DonutShop.java
+++ b/donut-kata-solutions/src/main/java/bny/codekatas/donutkata/DonutShop.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkata;
+package bny.codekatas.donutkata;
 
 import java.time.LocalDate;
 import java.util.DoubleSummaryStatistics;
diff --git a/donut-kata-solutions/src/main/java/bnymellon/codekatas/donutkata/DonutType.java b/donut-kata-solutions/src/main/java/bny/codekatas/donutkata/DonutType.java
similarity index 93%
rename from donut-kata-solutions/src/main/java/bnymellon/codekatas/donutkata/DonutType.java
rename to donut-kata-solutions/src/main/java/bny/codekatas/donutkata/DonutType.java
index dc621f42..cfcae6a7 100644
--- a/donut-kata-solutions/src/main/java/bnymellon/codekatas/donutkata/DonutType.java
+++ b/donut-kata-solutions/src/main/java/bny/codekatas/donutkata/DonutType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkata;
+package bny.codekatas.donutkata;
 
 import org.eclipse.collections.impl.utility.ArrayIterate;
 
diff --git a/donut-kata/src/main/java/bnymellon/codekatas/donutkata/Order.java b/donut-kata-solutions/src/main/java/bny/codekatas/donutkata/Order.java
similarity index 95%
rename from donut-kata/src/main/java/bnymellon/codekatas/donutkata/Order.java
rename to donut-kata-solutions/src/main/java/bny/codekatas/donutkata/Order.java
index dfebb5e0..96b2eab9 100644
--- a/donut-kata/src/main/java/bnymellon/codekatas/donutkata/Order.java
+++ b/donut-kata-solutions/src/main/java/bny/codekatas/donutkata/Order.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkata;
+package bny.codekatas.donutkata;
 
 import java.time.LocalDate;
 
diff --git a/donut-kata/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Customer.kt b/donut-kata-solutions/src/main/kotlin/bny/codekatas/donutkatakotlin/Customer.kt
similarity index 95%
rename from donut-kata/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Customer.kt
rename to donut-kata-solutions/src/main/kotlin/bny/codekatas/donutkatakotlin/Customer.kt
index 8a1b5ead..1a471112 100644
--- a/donut-kata/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Customer.kt
+++ b/donut-kata-solutions/src/main/kotlin/bny/codekatas/donutkatakotlin/Customer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkatakotlin
+package bny.codekatas.donutkatakotlin
 
 import org.eclipse.collections.api.list.ListIterable
 import org.eclipse.collections.api.set.SetIterable
diff --git a/donut-kata-solutions/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Delivery.kt b/donut-kata-solutions/src/main/kotlin/bny/codekatas/donutkatakotlin/Delivery.kt
similarity index 93%
rename from donut-kata-solutions/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Delivery.kt
rename to donut-kata-solutions/src/main/kotlin/bny/codekatas/donutkatakotlin/Delivery.kt
index 17aea5f7..229ccaa3 100644
--- a/donut-kata-solutions/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Delivery.kt
+++ b/donut-kata-solutions/src/main/kotlin/bny/codekatas/donutkatakotlin/Delivery.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkatakotlin
+package bny.codekatas.donutkatakotlin
 
 import org.eclipse.collections.api.list.ImmutableList
 import java.time.LocalDate
diff --git a/donut-kata-solutions/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Donut.kt b/donut-kata-solutions/src/main/kotlin/bny/codekatas/donutkatakotlin/Donut.kt
similarity index 87%
rename from donut-kata-solutions/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Donut.kt
rename to donut-kata-solutions/src/main/kotlin/bny/codekatas/donutkatakotlin/Donut.kt
index 94efc653..6ffcab75 100644
--- a/donut-kata-solutions/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Donut.kt
+++ b/donut-kata-solutions/src/main/kotlin/bny/codekatas/donutkatakotlin/Donut.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkatakotlin
+package bny.codekatas.donutkatakotlin
 
 data class Donut(val type: DonutType, val price: Double)
diff --git a/donut-kata-solutions/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/DonutShop.kt b/donut-kata-solutions/src/main/kotlin/bny/codekatas/donutkatakotlin/DonutShop.kt
similarity index 93%
rename from donut-kata-solutions/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/DonutShop.kt
rename to donut-kata-solutions/src/main/kotlin/bny/codekatas/donutkatakotlin/DonutShop.kt
index 56d8ce16..0dbe1b36 100644
--- a/donut-kata-solutions/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/DonutShop.kt
+++ b/donut-kata-solutions/src/main/kotlin/bny/codekatas/donutkatakotlin/DonutShop.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkatakotlin
+package bny.codekatas.donutkatakotlin
 
 import org.eclipse.collections.api.bag.Bag
 import org.eclipse.collections.api.block.function.Function
@@ -166,10 +166,10 @@ class DonutShop
         private val DOZEN = 12
         private val BAKERS_DOZEN = 13
         private val PRICES = Lists.immutable.with(
-            pair(zeroTo(this.SINGLE), 1.50),
-            pair(fromTo(this.DOUBLE, this.HALF_DOZEN - 1), 1.35),
-            pair(fromTo(this.HALF_DOZEN, this.DOZEN - 1), 1.25),
-            pair(fromTo(this.DOZEN, this.DOZEN), 1.00),
-            pair(fromTo(this.BAKERS_DOZEN, this.DOZEN * 100), 0.95))
+            pair(zeroTo(SINGLE), 1.50),
+            pair(fromTo(DOUBLE, HALF_DOZEN - 1), 1.35),
+            pair(fromTo(HALF_DOZEN, DOZEN - 1), 1.25),
+            pair(fromTo(DOZEN, DOZEN), 1.00),
+            pair(fromTo(BAKERS_DOZEN, DOZEN * 100), 0.95))
     }
 }
diff --git a/donut-kata-solutions/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/DonutType.kt b/donut-kata-solutions/src/main/kotlin/bny/codekatas/donutkatakotlin/DonutType.kt
similarity index 93%
rename from donut-kata-solutions/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/DonutType.kt
rename to donut-kata-solutions/src/main/kotlin/bny/codekatas/donutkatakotlin/DonutType.kt
index 177025a3..dc43ce66 100644
--- a/donut-kata-solutions/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/DonutType.kt
+++ b/donut-kata-solutions/src/main/kotlin/bny/codekatas/donutkatakotlin/DonutType.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkatakotlin
+package bny.codekatas.donutkatakotlin
 
 import org.eclipse.collections.impl.utility.ArrayIterate
 
diff --git a/donut-kata/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Order.kt b/donut-kata-solutions/src/main/kotlin/bny/codekatas/donutkatakotlin/Order.kt
similarity index 95%
rename from donut-kata/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Order.kt
rename to donut-kata-solutions/src/main/kotlin/bny/codekatas/donutkatakotlin/Order.kt
index 12c8282d..b7824702 100644
--- a/donut-kata/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Order.kt
+++ b/donut-kata-solutions/src/main/kotlin/bny/codekatas/donutkatakotlin/Order.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkatakotlin
+package bny.codekatas.donutkatakotlin
 
 import org.eclipse.collections.api.bag.Bag
 import org.eclipse.collections.api.tuple.primitive.ObjectIntPair
diff --git a/donut-kata-solutions/src/test/java/bnymellon/codekatas/donutkata/DonutShopTest.java b/donut-kata-solutions/src/test/java/bny/codekatas/donutkata/DonutShopTest.java
similarity index 98%
rename from donut-kata-solutions/src/test/java/bnymellon/codekatas/donutkata/DonutShopTest.java
rename to donut-kata-solutions/src/test/java/bny/codekatas/donutkata/DonutShopTest.java
index ca9aeb37..9b1d7ca0 100644
--- a/donut-kata-solutions/src/test/java/bnymellon/codekatas/donutkata/DonutShopTest.java
+++ b/donut-kata-solutions/src/test/java/bny/codekatas/donutkata/DonutShopTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkata;
+package bny.codekatas.donutkata;
 
 import java.time.Clock;
 import java.time.Instant;
diff --git a/donut-kata-solutions/src/test/kotlin/bnymellon/codekatas/donutkatakotlin/DonutShopTest.kt b/donut-kata-solutions/src/test/kotlin/bny/codekatas/donutkatakotlin/DonutShopTest.kt
similarity index 98%
rename from donut-kata-solutions/src/test/kotlin/bnymellon/codekatas/donutkatakotlin/DonutShopTest.kt
rename to donut-kata-solutions/src/test/kotlin/bny/codekatas/donutkatakotlin/DonutShopTest.kt
index 606b26cc..fe998dd9 100644
--- a/donut-kata-solutions/src/test/kotlin/bnymellon/codekatas/donutkatakotlin/DonutShopTest.kt
+++ b/donut-kata-solutions/src/test/kotlin/bny/codekatas/donutkatakotlin/DonutShopTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkatakotlin
+package bny.codekatas.donutkatakotlin
 
 import org.eclipse.collections.api.factory.Lists
 import org.eclipse.collections.impl.test.Verify
diff --git a/donut-kata/README.md b/donut-kata/README.md
index e6d0dfb2..1047636d 100644
--- a/donut-kata/README.md
+++ b/donut-kata/README.md
@@ -5,12 +5,12 @@ become familiar with lesser known APIs of Eclipse Collections.
 
 The domain for the kata is a Donut Shop.  There are several domain
 classes that are shared by all of the exercises.  These are 
-[`DonutType`](./src/main/java/bnymellon/codekatas/donutkata/DonutType.java), 
-[`Donut`](./src/main/java/bnymellon/codekatas/donutkata/Donut.java),
-[`DonutShop`](./src/main/java/bnymellon/codekatas/donutkata/DonutShop.java),
-[`Customer`](./src/main/java/bnymellon/codekatas/donutkata/Customer.java),
-[`Order`](./src/main/java/bnymellon/codekatas/donutkata/Order.java) and
-[`Delivery`](./src/main/java/bnymellon/codekatas/donutkata/Delivery.java).  
+[`DonutType`](src/main/java/bny/codekatas/donutkata/DonutType.java), 
+[`Donut`](src/main/java/bny/codekatas/donutkata/Donut.java),
+[`DonutShop`](src/main/java/bny/codekatas/donutkata/DonutShop.java),
+[`Customer`](src/main/java/bny/codekatas/donutkata/Customer.java),
+[`Order`](src/main/java/bny/codekatas/donutkata/Order.java) and
+[`Delivery`](src/main/java/bny/codekatas/donutkata/Delivery.java).  
 
 ![Diagram](donutshop.png)
 </p> 
@@ -18,11 +18,11 @@ classes that are shared by all of the exercises.  These are
 ### How to get started
 
 Java version (17) (uses [Local-Variable Type Inference](http://openjdk.java.net/jeps/286) and [Records](https://openjdk.java.net/jeps/359)):
-* There are failing tests in [`DonutShopTest.java`](./src/test/java/bnymellon/codekatas/donutkata/DonutShopTest.java)
-	* Make the tests pass by following and completing the TODOs in [`DonutShop.java`](./src/main/java/bnymellon/codekatas/donutkata/DonutShop.java)
+* There are failing tests in [`DonutShopTest.java`](./src/test/java/bny/codekatas/donutkata/DonutShopTest.java)
+	* Make the tests pass by following and completing the TODOs in [`DonutShop.java`](src/main/java/bny/codekatas/donutkata/DonutShop.java)
 
 Kotlin version (1.8.0):
-* There are failing tests in [`DonutShopTest.kt`](./src/test/kotlin/bnymellon/codekatas/donutkatakotlin/DonutShopTest.kt)
-	* Make the tests pass by following and completing the TODOs in [`DonutShop.kt`](./src/main/kotlin/bnymellon/codekatas/donutkatakotlin/DonutShop.kt)
+* There are failing tests in [`DonutShopTest.kt`](./src/test/kotlin/bny/codekatas/donutkatakotlin/DonutShopTest.kt)
+	* Make the tests pass by following and completing the TODOs in [`DonutShop.kt`](src/main/kotlin/bny/codekatas/donutkatakotlin/DonutShop.kt)
 
 All of the `DonutShop` implementations and tests use [Eclipse Collections](http://www.eclipse.org/collections/).
diff --git a/donut-kata/pom.xml b/donut-kata/pom.xml
index f8ee5436..012150a5 100644
--- a/donut-kata/pom.xml
+++ b/donut-kata/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.codekatas</groupId>
+    <groupId>bny.codekatas</groupId>
     <artifactId>donut-kata</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
diff --git a/donut-kata/src/main/java/bnymellon/codekatas/donutkata/Customer.java b/donut-kata/src/main/java/bny/codekatas/donutkata/Customer.java
similarity index 95%
rename from donut-kata/src/main/java/bnymellon/codekatas/donutkata/Customer.java
rename to donut-kata/src/main/java/bny/codekatas/donutkata/Customer.java
index 27eb4ae4..50c38107 100644
--- a/donut-kata/src/main/java/bnymellon/codekatas/donutkata/Customer.java
+++ b/donut-kata/src/main/java/bny/codekatas/donutkata/Customer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkata;
+package bny.codekatas.donutkata;
 
 import org.eclipse.collections.api.list.ListIterable;
 import org.eclipse.collections.api.list.MutableList;
diff --git a/donut-kata-solutions/src/main/java/bnymellon/codekatas/donutkata/Delivery.java b/donut-kata/src/main/java/bny/codekatas/donutkata/Delivery.java
similarity index 94%
rename from donut-kata-solutions/src/main/java/bnymellon/codekatas/donutkata/Delivery.java
rename to donut-kata/src/main/java/bny/codekatas/donutkata/Delivery.java
index ea1418db..b9fa8297 100644
--- a/donut-kata-solutions/src/main/java/bnymellon/codekatas/donutkata/Delivery.java
+++ b/donut-kata/src/main/java/bny/codekatas/donutkata/Delivery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkata;
+package bny.codekatas.donutkata;
 
 import java.time.LocalDate;
 
diff --git a/donut-kata-solutions/src/main/java/bnymellon/codekatas/donutkata/Donut.java b/donut-kata/src/main/java/bny/codekatas/donutkata/Donut.java
similarity index 87%
rename from donut-kata-solutions/src/main/java/bnymellon/codekatas/donutkata/Donut.java
rename to donut-kata/src/main/java/bny/codekatas/donutkata/Donut.java
index e56f08aa..fe9d690f 100644
--- a/donut-kata-solutions/src/main/java/bnymellon/codekatas/donutkata/Donut.java
+++ b/donut-kata/src/main/java/bny/codekatas/donutkata/Donut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkata;
+package bny.codekatas.donutkata;
 
 public record Donut(DonutType type, double price) {}
diff --git a/donut-kata/src/main/java/bnymellon/codekatas/donutkata/DonutShop.java b/donut-kata/src/main/java/bny/codekatas/donutkata/DonutShop.java
similarity index 98%
rename from donut-kata/src/main/java/bnymellon/codekatas/donutkata/DonutShop.java
rename to donut-kata/src/main/java/bny/codekatas/donutkata/DonutShop.java
index 3e228d41..9bf8574a 100644
--- a/donut-kata/src/main/java/bnymellon/codekatas/donutkata/DonutShop.java
+++ b/donut-kata/src/main/java/bny/codekatas/donutkata/DonutShop.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkata;
+package bny.codekatas.donutkata;
 
 import java.time.LocalDate;
 import java.util.DoubleSummaryStatistics;
diff --git a/donut-kata/src/main/java/bnymellon/codekatas/donutkata/DonutType.java b/donut-kata/src/main/java/bny/codekatas/donutkata/DonutType.java
similarity index 93%
rename from donut-kata/src/main/java/bnymellon/codekatas/donutkata/DonutType.java
rename to donut-kata/src/main/java/bny/codekatas/donutkata/DonutType.java
index dc621f42..cfcae6a7 100644
--- a/donut-kata/src/main/java/bnymellon/codekatas/donutkata/DonutType.java
+++ b/donut-kata/src/main/java/bny/codekatas/donutkata/DonutType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkata;
+package bny.codekatas.donutkata;
 
 import org.eclipse.collections.impl.utility.ArrayIterate;
 
diff --git a/donut-kata-solutions/src/main/java/bnymellon/codekatas/donutkata/Order.java b/donut-kata/src/main/java/bny/codekatas/donutkata/Order.java
similarity index 95%
rename from donut-kata-solutions/src/main/java/bnymellon/codekatas/donutkata/Order.java
rename to donut-kata/src/main/java/bny/codekatas/donutkata/Order.java
index dfebb5e0..96b2eab9 100644
--- a/donut-kata-solutions/src/main/java/bnymellon/codekatas/donutkata/Order.java
+++ b/donut-kata/src/main/java/bny/codekatas/donutkata/Order.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkata;
+package bny.codekatas.donutkata;
 
 import java.time.LocalDate;
 
diff --git a/donut-kata-solutions/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Customer.kt b/donut-kata/src/main/kotlin/bny/codekatas/donutkatakotlin/Customer.kt
similarity index 95%
rename from donut-kata-solutions/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Customer.kt
rename to donut-kata/src/main/kotlin/bny/codekatas/donutkatakotlin/Customer.kt
index 8a1b5ead..1a471112 100644
--- a/donut-kata-solutions/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Customer.kt
+++ b/donut-kata/src/main/kotlin/bny/codekatas/donutkatakotlin/Customer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkatakotlin
+package bny.codekatas.donutkatakotlin
 
 import org.eclipse.collections.api.list.ListIterable
 import org.eclipse.collections.api.set.SetIterable
diff --git a/donut-kata/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Delivery.kt b/donut-kata/src/main/kotlin/bny/codekatas/donutkatakotlin/Delivery.kt
similarity index 93%
rename from donut-kata/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Delivery.kt
rename to donut-kata/src/main/kotlin/bny/codekatas/donutkatakotlin/Delivery.kt
index 17aea5f7..229ccaa3 100644
--- a/donut-kata/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Delivery.kt
+++ b/donut-kata/src/main/kotlin/bny/codekatas/donutkatakotlin/Delivery.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkatakotlin
+package bny.codekatas.donutkatakotlin
 
 import org.eclipse.collections.api.list.ImmutableList
 import java.time.LocalDate
diff --git a/donut-kata/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Donut.kt b/donut-kata/src/main/kotlin/bny/codekatas/donutkatakotlin/Donut.kt
similarity index 87%
rename from donut-kata/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Donut.kt
rename to donut-kata/src/main/kotlin/bny/codekatas/donutkatakotlin/Donut.kt
index 94efc653..6ffcab75 100644
--- a/donut-kata/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Donut.kt
+++ b/donut-kata/src/main/kotlin/bny/codekatas/donutkatakotlin/Donut.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkatakotlin
+package bny.codekatas.donutkatakotlin
 
 data class Donut(val type: DonutType, val price: Double)
diff --git a/donut-kata/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/DonutShop.kt b/donut-kata/src/main/kotlin/bny/codekatas/donutkatakotlin/DonutShop.kt
similarity index 93%
rename from donut-kata/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/DonutShop.kt
rename to donut-kata/src/main/kotlin/bny/codekatas/donutkatakotlin/DonutShop.kt
index f00d6242..d93e5f5c 100644
--- a/donut-kata/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/DonutShop.kt
+++ b/donut-kata/src/main/kotlin/bny/codekatas/donutkatakotlin/DonutShop.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkatakotlin
+package bny.codekatas.donutkatakotlin
 
 import org.eclipse.collections.api.bag.Bag
 import org.eclipse.collections.api.list.MutableList
@@ -167,10 +167,10 @@ class DonutShop
         private val DOZEN = 12
         private val BAKERS_DOZEN = 13
         private val PRICES = Lists.immutable.with(
-            pair(zeroTo(this.SINGLE), 1.50),
-            pair(fromTo(this.DOUBLE, this.HALF_DOZEN - 1), 1.35),
-            pair(fromTo(this.HALF_DOZEN, this.DOZEN - 1), 1.25),
-            pair(fromTo(this.DOZEN, this.DOZEN), 1.00),
-            pair(fromTo(this.BAKERS_DOZEN, this.DOZEN * 100), 0.95))
+            pair(zeroTo(SINGLE), 1.50),
+            pair(fromTo(DOUBLE, HALF_DOZEN - 1), 1.35),
+            pair(fromTo(HALF_DOZEN, DOZEN - 1), 1.25),
+            pair(fromTo(DOZEN, DOZEN), 1.00),
+            pair(fromTo(BAKERS_DOZEN, DOZEN * 100), 0.95))
     }
 }
diff --git a/donut-kata/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/DonutType.kt b/donut-kata/src/main/kotlin/bny/codekatas/donutkatakotlin/DonutType.kt
similarity index 93%
rename from donut-kata/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/DonutType.kt
rename to donut-kata/src/main/kotlin/bny/codekatas/donutkatakotlin/DonutType.kt
index 6defa73a..6d713d08 100644
--- a/donut-kata/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/DonutType.kt
+++ b/donut-kata/src/main/kotlin/bny/codekatas/donutkatakotlin/DonutType.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkatakotlin
+package bny.codekatas.donutkatakotlin
 
 import org.eclipse.collections.impl.utility.ArrayIterate
 
diff --git a/donut-kata-solutions/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Order.kt b/donut-kata/src/main/kotlin/bny/codekatas/donutkatakotlin/Order.kt
similarity index 95%
rename from donut-kata-solutions/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Order.kt
rename to donut-kata/src/main/kotlin/bny/codekatas/donutkatakotlin/Order.kt
index 12c8282d..b7824702 100644
--- a/donut-kata-solutions/src/main/kotlin/bnymellon/codekatas/donutkatakotlin/Order.kt
+++ b/donut-kata/src/main/kotlin/bny/codekatas/donutkatakotlin/Order.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkatakotlin
+package bny.codekatas.donutkatakotlin
 
 import org.eclipse.collections.api.bag.Bag
 import org.eclipse.collections.api.tuple.primitive.ObjectIntPair
diff --git a/donut-kata/src/test/java/bnymellon/codekatas/donutkata/DonutShopTest.java b/donut-kata/src/test/java/bny/codekatas/donutkata/DonutShopTest.java
similarity index 98%
rename from donut-kata/src/test/java/bnymellon/codekatas/donutkata/DonutShopTest.java
rename to donut-kata/src/test/java/bny/codekatas/donutkata/DonutShopTest.java
index 3b470ce5..0963654d 100644
--- a/donut-kata/src/test/java/bnymellon/codekatas/donutkata/DonutShopTest.java
+++ b/donut-kata/src/test/java/bny/codekatas/donutkata/DonutShopTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkata;
+package bny.codekatas.donutkata;
 
 import java.time.Clock;
 import java.time.Instant;
diff --git a/donut-kata/src/test/kotlin/bnymellon/codekatas/donutkatakotlin/DonutShopTest.kt b/donut-kata/src/test/kotlin/bny/codekatas/donutkatakotlin/DonutShopTest.kt
similarity index 98%
rename from donut-kata/src/test/kotlin/bnymellon/codekatas/donutkatakotlin/DonutShopTest.kt
rename to donut-kata/src/test/kotlin/bny/codekatas/donutkatakotlin/DonutShopTest.kt
index d4aa1460..6754bac0 100644
--- a/donut-kata/src/test/kotlin/bnymellon/codekatas/donutkatakotlin/DonutShopTest.kt
+++ b/donut-kata/src/test/kotlin/bny/codekatas/donutkatakotlin/DonutShopTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.donutkatakotlin
+package bny.codekatas.donutkatakotlin
 
 import org.eclipse.collections.impl.factory.Lists
 import org.eclipse.collections.impl.test.Verify
diff --git a/java-lambda-kata-solutions/pom.xml b/java-lambda-kata-solutions/pom.xml
index 898e0461..05ce9df9 100644
--- a/java-lambda-kata-solutions/pom.xml
+++ b/java-lambda-kata-solutions/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.codekatas</groupId>
+    <groupId>bny.codekatas</groupId>
     <artifactId>java-lambda-kata-solutions</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
diff --git a/java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/ec/EclipseCollectionsCheckedExceptionsTest.java b/java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/ec/EclipseCollectionsCheckedExceptionsTest.java
similarity index 93%
rename from java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/ec/EclipseCollectionsCheckedExceptionsTest.java
rename to java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/ec/EclipseCollectionsCheckedExceptionsTest.java
index 922bdf26..53aa7509 100644
--- a/java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/ec/EclipseCollectionsCheckedExceptionsTest.java
+++ b/java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/ec/EclipseCollectionsCheckedExceptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.lambdakata.ec;
+package bny.codekatas.lambdakata.ec;
 
 import org.eclipse.collections.api.factory.Lists;
 import org.eclipse.collections.api.list.MutableList;
diff --git a/java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/ec/EclipseCollectionsFunctionalInterfaceTest.java b/java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/ec/EclipseCollectionsFunctionalInterfaceTest.java
similarity index 98%
rename from java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/ec/EclipseCollectionsFunctionalInterfaceTest.java
rename to java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/ec/EclipseCollectionsFunctionalInterfaceTest.java
index 4a19eb62..ffd10e36 100644
--- a/java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/ec/EclipseCollectionsFunctionalInterfaceTest.java
+++ b/java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/ec/EclipseCollectionsFunctionalInterfaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.lambdakata.ec;
+package bny.codekatas.lambdakata.ec;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/ec/EclipseCollectionsPrimitiveFunctionalInterfaceTest.java b/java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/ec/EclipseCollectionsPrimitiveFunctionalInterfaceTest.java
similarity index 98%
rename from java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/ec/EclipseCollectionsPrimitiveFunctionalInterfaceTest.java
rename to java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/ec/EclipseCollectionsPrimitiveFunctionalInterfaceTest.java
index e2d5784e..f512ba7f 100644
--- a/java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/ec/EclipseCollectionsPrimitiveFunctionalInterfaceTest.java
+++ b/java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/ec/EclipseCollectionsPrimitiveFunctionalInterfaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.lambdakata.ec;
+package bny.codekatas.lambdakata.ec;
 
 import java.util.concurrent.atomic.DoubleAdder;
 import java.util.concurrent.atomic.LongAdder;
diff --git a/java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/jdk/ClassicSAMInterfaceTest.java b/java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/jdk/ClassicSAMInterfaceTest.java
similarity index 97%
rename from java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/jdk/ClassicSAMInterfaceTest.java
rename to java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/jdk/ClassicSAMInterfaceTest.java
index bea31711..fc176497 100644
--- a/java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/jdk/ClassicSAMInterfaceTest.java
+++ b/java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/jdk/ClassicSAMInterfaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.lambdakata.jdk;
+package bny.codekatas.lambdakata.jdk;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/jdk/FunctionalInterfaceTest.java b/java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/jdk/FunctionalInterfaceTest.java
similarity index 98%
rename from java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/jdk/FunctionalInterfaceTest.java
rename to java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/jdk/FunctionalInterfaceTest.java
index f5975d3d..e8585be3 100644
--- a/java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/jdk/FunctionalInterfaceTest.java
+++ b/java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/jdk/FunctionalInterfaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.lambdakata.jdk;
+package bny.codekatas.lambdakata.jdk;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/jdk/PrimitiveFunctionalInterfaceTest.java b/java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/jdk/PrimitiveFunctionalInterfaceTest.java
similarity index 98%
rename from java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/jdk/PrimitiveFunctionalInterfaceTest.java
rename to java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/jdk/PrimitiveFunctionalInterfaceTest.java
index e9298c97..a4a4c171 100644
--- a/java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/jdk/PrimitiveFunctionalInterfaceTest.java
+++ b/java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/jdk/PrimitiveFunctionalInterfaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.lambdakata.jdk;
+package bny.codekatas.lambdakata.jdk;
 
 import java.util.Arrays;
 import java.util.concurrent.atomic.DoubleAdder;
diff --git a/java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/jdk/RollYourOwnFunctionalInterfaceTest.java b/java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/jdk/RollYourOwnFunctionalInterfaceTest.java
similarity index 95%
rename from java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/jdk/RollYourOwnFunctionalInterfaceTest.java
rename to java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/jdk/RollYourOwnFunctionalInterfaceTest.java
index d2b7d5c9..13786b38 100644
--- a/java-lambda-kata-solutions/src/test/java/bnymellon/codekatas/lambdakata/jdk/RollYourOwnFunctionalInterfaceTest.java
+++ b/java-lambda-kata-solutions/src/test/java/bny/codekatas/lambdakata/jdk/RollYourOwnFunctionalInterfaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.lambdakata.jdk;
+package bny.codekatas.lambdakata.jdk;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/java-lambda-kata/README.md b/java-lambda-kata/README.md
index 7c8ceac1..a458464f 100644
--- a/java-lambda-kata/README.md
+++ b/java-lambda-kata/README.md
@@ -77,4 +77,4 @@ Assertions.assertEquals(Arrays.asList("1", "2", "3"), list);
 
 That's Java Lambdas in 10 minutes!  Lambdas are awesome!  Now enjoy using them in the kata and your applications!
 
-Start converting the [tests here](./src/test/java/bnymellon/codekatas/lambdakata/) to use lambdas.
+Start converting the [tests here](./src/test/java/bny/codekatas/lambdakata/) to use lambdas.
diff --git a/java-lambda-kata/pom.xml b/java-lambda-kata/pom.xml
index 55b543d0..cbf6af84 100644
--- a/java-lambda-kata/pom.xml
+++ b/java-lambda-kata/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.codekatas</groupId>
+    <groupId>bny.codekatas</groupId>
     <artifactId>java-lambda-kata</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
diff --git a/java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/ec/EclipseCollectionsCheckedExceptionsTest.java b/java-lambda-kata/src/test/java/bny/codekatas/lambdakata/ec/EclipseCollectionsCheckedExceptionsTest.java
similarity index 94%
rename from java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/ec/EclipseCollectionsCheckedExceptionsTest.java
rename to java-lambda-kata/src/test/java/bny/codekatas/lambdakata/ec/EclipseCollectionsCheckedExceptionsTest.java
index fa97ddc2..c62a5ed3 100644
--- a/java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/ec/EclipseCollectionsCheckedExceptionsTest.java
+++ b/java-lambda-kata/src/test/java/bny/codekatas/lambdakata/ec/EclipseCollectionsCheckedExceptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.lambdakata.ec;
+package bny.codekatas.lambdakata.ec;
 
 import java.io.IOException;
 
diff --git a/java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/ec/EclipseCollectionsFunctionalInterfaceTest.java b/java-lambda-kata/src/test/java/bny/codekatas/lambdakata/ec/EclipseCollectionsFunctionalInterfaceTest.java
similarity index 98%
rename from java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/ec/EclipseCollectionsFunctionalInterfaceTest.java
rename to java-lambda-kata/src/test/java/bny/codekatas/lambdakata/ec/EclipseCollectionsFunctionalInterfaceTest.java
index 6a8d48e0..65703b89 100644
--- a/java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/ec/EclipseCollectionsFunctionalInterfaceTest.java
+++ b/java-lambda-kata/src/test/java/bny/codekatas/lambdakata/ec/EclipseCollectionsFunctionalInterfaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.lambdakata.ec;
+package bny.codekatas.lambdakata.ec;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/ec/EclipseCollectionsPrimitiveFunctionalInterfaceTest.java b/java-lambda-kata/src/test/java/bny/codekatas/lambdakata/ec/EclipseCollectionsPrimitiveFunctionalInterfaceTest.java
similarity index 98%
rename from java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/ec/EclipseCollectionsPrimitiveFunctionalInterfaceTest.java
rename to java-lambda-kata/src/test/java/bny/codekatas/lambdakata/ec/EclipseCollectionsPrimitiveFunctionalInterfaceTest.java
index 2ea54fcd..9d663345 100644
--- a/java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/ec/EclipseCollectionsPrimitiveFunctionalInterfaceTest.java
+++ b/java-lambda-kata/src/test/java/bny/codekatas/lambdakata/ec/EclipseCollectionsPrimitiveFunctionalInterfaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.lambdakata.ec;
+package bny.codekatas.lambdakata.ec;
 
 import java.util.concurrent.atomic.DoubleAdder;
 import java.util.concurrent.atomic.LongAdder;
diff --git a/java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/jdk/ClassicSAMInterfaceTest.java b/java-lambda-kata/src/test/java/bny/codekatas/lambdakata/jdk/ClassicSAMInterfaceTest.java
similarity index 97%
rename from java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/jdk/ClassicSAMInterfaceTest.java
rename to java-lambda-kata/src/test/java/bny/codekatas/lambdakata/jdk/ClassicSAMInterfaceTest.java
index e7c7e527..935f440d 100644
--- a/java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/jdk/ClassicSAMInterfaceTest.java
+++ b/java-lambda-kata/src/test/java/bny/codekatas/lambdakata/jdk/ClassicSAMInterfaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.lambdakata.jdk;
+package bny.codekatas.lambdakata.jdk;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/jdk/FunctionalInterfaceTest.java b/java-lambda-kata/src/test/java/bny/codekatas/lambdakata/jdk/FunctionalInterfaceTest.java
similarity index 98%
rename from java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/jdk/FunctionalInterfaceTest.java
rename to java-lambda-kata/src/test/java/bny/codekatas/lambdakata/jdk/FunctionalInterfaceTest.java
index c2f0ffac..143ef6cd 100644
--- a/java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/jdk/FunctionalInterfaceTest.java
+++ b/java-lambda-kata/src/test/java/bny/codekatas/lambdakata/jdk/FunctionalInterfaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.lambdakata.jdk;
+package bny.codekatas.lambdakata.jdk;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/jdk/PrimitiveFunctionalInterfaceTest.java b/java-lambda-kata/src/test/java/bny/codekatas/lambdakata/jdk/PrimitiveFunctionalInterfaceTest.java
similarity index 98%
rename from java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/jdk/PrimitiveFunctionalInterfaceTest.java
rename to java-lambda-kata/src/test/java/bny/codekatas/lambdakata/jdk/PrimitiveFunctionalInterfaceTest.java
index 4dca7b8b..778b5e9a 100644
--- a/java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/jdk/PrimitiveFunctionalInterfaceTest.java
+++ b/java-lambda-kata/src/test/java/bny/codekatas/lambdakata/jdk/PrimitiveFunctionalInterfaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.lambdakata.jdk;
+package bny.codekatas.lambdakata.jdk;
 
 import java.util.Arrays;
 import java.util.concurrent.atomic.DoubleAdder;
diff --git a/java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/jdk/RollYourOwnFunctionalInterfaceTest.java b/java-lambda-kata/src/test/java/bny/codekatas/lambdakata/jdk/RollYourOwnFunctionalInterfaceTest.java
similarity index 95%
rename from java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/jdk/RollYourOwnFunctionalInterfaceTest.java
rename to java-lambda-kata/src/test/java/bny/codekatas/lambdakata/jdk/RollYourOwnFunctionalInterfaceTest.java
index 5750a18e..aabfaa6d 100644
--- a/java-lambda-kata/src/test/java/bnymellon/codekatas/lambdakata/jdk/RollYourOwnFunctionalInterfaceTest.java
+++ b/java-lambda-kata/src/test/java/bny/codekatas/lambdakata/jdk/RollYourOwnFunctionalInterfaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.lambdakata.jdk;
+package bny.codekatas.lambdakata.jdk;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/jmh-kata/README.md b/jmh-kata/README.md
index 1453ffd6..83959dd0 100644
--- a/jmh-kata/README.md
+++ b/jmh-kata/README.md
@@ -8,10 +8,10 @@ tool from OpenJDK.
 
 There are two micro-benchmarks currently checked in:
 
-1. [`IntListJMHBenchmark`](./src/test/java/bnymellon/codekatas/jmhkata/IntListJMHBenchmark.java)
+1. [`IntListJMHBenchmark`](./src/test/java/bny/codekatas/jmhkata/IntListJMHBenchmark.java)
  This test compares the performance of filtering, summing and transforming a million randomly generated integers stored 
  in an `ArrayList<Integer>`, a `FastList<Integer>` and an `IntArrayList`.<br>
-2. [`PersonJMHBenchmark`](./src/test/java/bnymellon/codekatas/jmhkata/PersonJMHBenchmark.java)
+2. [`PersonJMHBenchmark`](./src/test/java/bny/codekatas/jmhkata/PersonJMHBenchmark.java)
  This test compares the performance of various algorithms applied to a `List` of class `Person` which has randomly 
  generated values for age, height and weight.  The instances of class `Person` are stored in a JDK `List` and an 
  Eclipse Collections `MutableList`<br> 
diff --git a/jmh-kata/pom.xml b/jmh-kata/pom.xml
index d3c58467..7b8b1e5a 100644
--- a/jmh-kata/pom.xml
+++ b/jmh-kata/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.codekatas</groupId>
+    <groupId>bny.codekatas</groupId>
     <artifactId>jmh-kata</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
diff --git a/jmh-kata/src/main/java/bnymellon/codekatas/jmhkata/Person.java b/jmh-kata/src/main/java/bny/codekatas/jmhkata/Person.java
similarity index 96%
rename from jmh-kata/src/main/java/bnymellon/codekatas/jmhkata/Person.java
rename to jmh-kata/src/main/java/bny/codekatas/jmhkata/Person.java
index fa10e571..e679cc56 100644
--- a/jmh-kata/src/main/java/bnymellon/codekatas/jmhkata/Person.java
+++ b/jmh-kata/src/main/java/bny/codekatas/jmhkata/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.jmhkata;
+package bny.codekatas.jmhkata;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/FilterJMHBenchmark.java b/jmh-kata/src/test/java/bny/codekatas/jmhkata/FilterJMHBenchmark.java
similarity index 98%
rename from jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/FilterJMHBenchmark.java
rename to jmh-kata/src/test/java/bny/codekatas/jmhkata/FilterJMHBenchmark.java
index 35a9873f..3d83f63e 100644
--- a/jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/FilterJMHBenchmark.java
+++ b/jmh-kata/src/test/java/bny/codekatas/jmhkata/FilterJMHBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.jmhkata;
+package bny.codekatas.jmhkata;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/FilterMapJMHBenchmark.java b/jmh-kata/src/test/java/bny/codekatas/jmhkata/FilterMapJMHBenchmark.java
similarity index 98%
rename from jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/FilterMapJMHBenchmark.java
rename to jmh-kata/src/test/java/bny/codekatas/jmhkata/FilterMapJMHBenchmark.java
index c6bb557b..ef851ab4 100644
--- a/jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/FilterMapJMHBenchmark.java
+++ b/jmh-kata/src/test/java/bny/codekatas/jmhkata/FilterMapJMHBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.jmhkata;
+package bny.codekatas.jmhkata;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/IntListJMHBenchmark.java b/jmh-kata/src/test/java/bny/codekatas/jmhkata/IntListJMHBenchmark.java
similarity index 98%
rename from jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/IntListJMHBenchmark.java
rename to jmh-kata/src/test/java/bny/codekatas/jmhkata/IntListJMHBenchmark.java
index c49301d4..0284975a 100644
--- a/jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/IntListJMHBenchmark.java
+++ b/jmh-kata/src/test/java/bny/codekatas/jmhkata/IntListJMHBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.jmhkata;
+package bny.codekatas.jmhkata;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/IntListTest.java b/jmh-kata/src/test/java/bny/codekatas/jmhkata/IntListTest.java
similarity index 97%
rename from jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/IntListTest.java
rename to jmh-kata/src/test/java/bny/codekatas/jmhkata/IntListTest.java
index c599ac89..77ec8d6f 100644
--- a/jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/IntListTest.java
+++ b/jmh-kata/src/test/java/bny/codekatas/jmhkata/IntListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.jmhkata;
+package bny.codekatas.jmhkata;
 
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.api.list.primitive.IntList;
diff --git a/jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/IsPrimeJMHBenchmark.java b/jmh-kata/src/test/java/bny/codekatas/jmhkata/IsPrimeJMHBenchmark.java
similarity index 98%
rename from jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/IsPrimeJMHBenchmark.java
rename to jmh-kata/src/test/java/bny/codekatas/jmhkata/IsPrimeJMHBenchmark.java
index bbfdc3f3..e3a36314 100644
--- a/jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/IsPrimeJMHBenchmark.java
+++ b/jmh-kata/src/test/java/bny/codekatas/jmhkata/IsPrimeJMHBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.jmhkata;
+package bny.codekatas.jmhkata;
 
 import java.util.Random;
 import java.util.concurrent.ExecutorService;
diff --git a/jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/PersonJMHBenchmark.java b/jmh-kata/src/test/java/bny/codekatas/jmhkata/PersonJMHBenchmark.java
similarity index 99%
rename from jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/PersonJMHBenchmark.java
rename to jmh-kata/src/test/java/bny/codekatas/jmhkata/PersonJMHBenchmark.java
index be84b44e..b7c7047a 100644
--- a/jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/PersonJMHBenchmark.java
+++ b/jmh-kata/src/test/java/bny/codekatas/jmhkata/PersonJMHBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.jmhkata;
+package bny.codekatas.jmhkata;
 
 import java.util.Collection;
 import java.util.IntSummaryStatistics;
diff --git a/jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/PersonTest.java b/jmh-kata/src/test/java/bny/codekatas/jmhkata/PersonTest.java
similarity index 96%
rename from jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/PersonTest.java
rename to jmh-kata/src/test/java/bny/codekatas/jmhkata/PersonTest.java
index 9db34b29..2e2f7799 100644
--- a/jmh-kata/src/test/java/bnymellon/codekatas/jmhkata/PersonTest.java
+++ b/jmh-kata/src/test/java/bny/codekatas/jmhkata/PersonTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.codekatas.jmhkata;
+package bny.codekatas.jmhkata;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/kata-of-katas-solutions/pom.xml b/kata-of-katas-solutions/pom.xml
index 90d2e96b..141500ff 100644
--- a/kata-of-katas-solutions/pom.xml
+++ b/kata-of-katas-solutions/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.codekatas</groupId>
+    <groupId>bny.codekatas</groupId>
     <artifactId>kata-of-katas-solutions</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
diff --git a/kata-of-katas-solutions/src/main/java/bnymellon/codekatas/kataofkatas/Kata.java b/kata-of-katas-solutions/src/main/java/bny/codekatas/kataofkatas/Kata.java
similarity index 96%
rename from kata-of-katas-solutions/src/main/java/bnymellon/codekatas/kataofkatas/Kata.java
rename to kata-of-katas-solutions/src/main/java/bny/codekatas/kataofkatas/Kata.java
index 392f827f..203cb405 100644
--- a/kata-of-katas-solutions/src/main/java/bnymellon/codekatas/kataofkatas/Kata.java
+++ b/kata-of-katas-solutions/src/main/java/bny/codekatas/kataofkatas/Kata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.kataofkatas;
+package bny.codekatas.kataofkatas;
 
 import org.eclipse.collections.api.factory.Sets;
 import org.eclipse.collections.api.set.ImmutableSet;
diff --git a/kata-of-katas-solutions/src/main/java/bnymellon/codekatas/kataofkatas/Language.java b/kata-of-katas-solutions/src/main/java/bny/codekatas/kataofkatas/Language.java
similarity index 88%
rename from kata-of-katas-solutions/src/main/java/bnymellon/codekatas/kataofkatas/Language.java
rename to kata-of-katas-solutions/src/main/java/bny/codekatas/kataofkatas/Language.java
index d46d72fa..911f3300 100644
--- a/kata-of-katas-solutions/src/main/java/bnymellon/codekatas/kataofkatas/Language.java
+++ b/kata-of-katas-solutions/src/main/java/bny/codekatas/kataofkatas/Language.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.kataofkatas;
+package bny.codekatas.kataofkatas;
 
 public enum Language implements Technology
 {
diff --git a/kata-of-katas-solutions/src/main/java/bnymellon/codekatas/kataofkatas/Library.java b/kata-of-katas-solutions/src/main/java/bny/codekatas/kataofkatas/Library.java
similarity index 89%
rename from kata-of-katas-solutions/src/main/java/bnymellon/codekatas/kataofkatas/Library.java
rename to kata-of-katas-solutions/src/main/java/bny/codekatas/kataofkatas/Library.java
index f9b6e382..78582a0b 100644
--- a/kata-of-katas-solutions/src/main/java/bnymellon/codekatas/kataofkatas/Library.java
+++ b/kata-of-katas-solutions/src/main/java/bny/codekatas/kataofkatas/Library.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.kataofkatas;
+package bny.codekatas.kataofkatas;
 
 public enum Library implements Technology
 {
diff --git a/kata-of-katas/src/main/java/bnymellon/codekatas/kataofkatas/Technology.java b/kata-of-katas-solutions/src/main/java/bny/codekatas/kataofkatas/Technology.java
similarity index 87%
rename from kata-of-katas/src/main/java/bnymellon/codekatas/kataofkatas/Technology.java
rename to kata-of-katas-solutions/src/main/java/bny/codekatas/kataofkatas/Technology.java
index 60d34b6b..31b8b54a 100644
--- a/kata-of-katas/src/main/java/bnymellon/codekatas/kataofkatas/Technology.java
+++ b/kata-of-katas-solutions/src/main/java/bny/codekatas/kataofkatas/Technology.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.kataofkatas;
+package bny.codekatas.kataofkatas;
 
 public interface Technology
 {
diff --git a/kata-of-katas-solutions/src/test/java/bnymellon/codekatas/kataofkatas/KataOfKatasTest.java b/kata-of-katas-solutions/src/test/java/bny/codekatas/kataofkatas/KataOfKatasTest.java
similarity index 97%
rename from kata-of-katas-solutions/src/test/java/bnymellon/codekatas/kataofkatas/KataOfKatasTest.java
rename to kata-of-katas-solutions/src/test/java/bny/codekatas/kataofkatas/KataOfKatasTest.java
index 7bba7c2c..a8ff38bf 100644
--- a/kata-of-katas-solutions/src/test/java/bnymellon/codekatas/kataofkatas/KataOfKatasTest.java
+++ b/kata-of-katas-solutions/src/test/java/bny/codekatas/kataofkatas/KataOfKatasTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.kataofkatas;
+package bny.codekatas.kataofkatas;
 
 import org.eclipse.collections.api.bag.ImmutableBag;
 import org.eclipse.collections.api.factory.Sets;
diff --git a/kata-of-katas/README.md b/kata-of-katas/README.md
index 8516045f..1c16bedc 100644
--- a/kata-of-katas/README.md
+++ b/kata-of-katas/README.md
@@ -2,9 +2,9 @@
 
 The Kata of Katas is basically the [README](./../README.md) of the Code Katas repo in code form. In this kata, each `Kata` is associated to the technologies (`Language` and `Library`) they have been implemented in and that a developer can learn.  
 
-[`Kata`](./src/main/java/bnymellon/codekatas/kataofkatas/Kata.java), [`Language`](./src/main/java/bnymellon/codekatas/kataofkatas/Language.java) and [`Library`](./src/main/java/bnymellon/codekatas/kataofkatas/Library.java) are implemented as Java Enums.
+[`Kata`](src/main/java/bny/codekatas/kataofkatas/Kata.java), [`Language`](src/main/java/bny/codekatas/kataofkatas/Language.java) and [`Library`](src/main/java/bny/codekatas/kataofkatas/Library.java) are implemented as Java Enums.
 
 There is a single test where you have to group the Katas, find the katas common to various languages and libraries, and count the Kata by `Language` and `Library`.
 
 Start here:
-[`KataOfKatasTest`](./src/test/java/bnymellon/codekatas/kataofkatas/KataOfKatasTest.java)
+[`KataOfKatasTest`](./src/test/java/bny/codekatas/kataofkatas/KataOfKatasTest.java)
diff --git a/kata-of-katas/pom.xml b/kata-of-katas/pom.xml
index 1312a498..2d3ab50f 100644
--- a/kata-of-katas/pom.xml
+++ b/kata-of-katas/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.codekatas</groupId>
+    <groupId>bny.codekatas</groupId>
     <artifactId>kata-of-katas</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
diff --git a/kata-of-katas/src/main/java/bnymellon/codekatas/kataofkatas/Kata.java b/kata-of-katas/src/main/java/bny/codekatas/kataofkatas/Kata.java
similarity index 96%
rename from kata-of-katas/src/main/java/bnymellon/codekatas/kataofkatas/Kata.java
rename to kata-of-katas/src/main/java/bny/codekatas/kataofkatas/Kata.java
index 096433de..a37ac9d7 100644
--- a/kata-of-katas/src/main/java/bnymellon/codekatas/kataofkatas/Kata.java
+++ b/kata-of-katas/src/main/java/bny/codekatas/kataofkatas/Kata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.kataofkatas;
+package bny.codekatas.kataofkatas;
 
 import org.eclipse.collections.api.factory.Sets;
 import org.eclipse.collections.api.set.ImmutableSet;
diff --git a/kata-of-katas/src/main/java/bnymellon/codekatas/kataofkatas/Language.java b/kata-of-katas/src/main/java/bny/codekatas/kataofkatas/Language.java
similarity index 88%
rename from kata-of-katas/src/main/java/bnymellon/codekatas/kataofkatas/Language.java
rename to kata-of-katas/src/main/java/bny/codekatas/kataofkatas/Language.java
index d46d72fa..911f3300 100644
--- a/kata-of-katas/src/main/java/bnymellon/codekatas/kataofkatas/Language.java
+++ b/kata-of-katas/src/main/java/bny/codekatas/kataofkatas/Language.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.kataofkatas;
+package bny.codekatas.kataofkatas;
 
 public enum Language implements Technology
 {
diff --git a/kata-of-katas/src/main/java/bnymellon/codekatas/kataofkatas/Library.java b/kata-of-katas/src/main/java/bny/codekatas/kataofkatas/Library.java
similarity index 89%
rename from kata-of-katas/src/main/java/bnymellon/codekatas/kataofkatas/Library.java
rename to kata-of-katas/src/main/java/bny/codekatas/kataofkatas/Library.java
index f9b6e382..78582a0b 100644
--- a/kata-of-katas/src/main/java/bnymellon/codekatas/kataofkatas/Library.java
+++ b/kata-of-katas/src/main/java/bny/codekatas/kataofkatas/Library.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.kataofkatas;
+package bny.codekatas.kataofkatas;
 
 public enum Library implements Technology
 {
diff --git a/kata-of-katas-solutions/src/main/java/bnymellon/codekatas/kataofkatas/Technology.java b/kata-of-katas/src/main/java/bny/codekatas/kataofkatas/Technology.java
similarity index 87%
rename from kata-of-katas-solutions/src/main/java/bnymellon/codekatas/kataofkatas/Technology.java
rename to kata-of-katas/src/main/java/bny/codekatas/kataofkatas/Technology.java
index 60d34b6b..31b8b54a 100644
--- a/kata-of-katas-solutions/src/main/java/bnymellon/codekatas/kataofkatas/Technology.java
+++ b/kata-of-katas/src/main/java/bny/codekatas/kataofkatas/Technology.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.kataofkatas;
+package bny.codekatas.kataofkatas;
 
 public interface Technology
 {
diff --git a/kata-of-katas/src/test/java/bnymellon/codekatas/kataofkatas/KataOfKatasTest.java b/kata-of-katas/src/test/java/bny/codekatas/kataofkatas/KataOfKatasTest.java
similarity index 95%
rename from kata-of-katas/src/test/java/bnymellon/codekatas/kataofkatas/KataOfKatasTest.java
rename to kata-of-katas/src/test/java/bny/codekatas/kataofkatas/KataOfKatasTest.java
index c9ab9603..9f6db016 100644
--- a/kata-of-katas/src/test/java/bnymellon/codekatas/kataofkatas/KataOfKatasTest.java
+++ b/kata-of-katas/src/test/java/bny/codekatas/kataofkatas/KataOfKatasTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.kataofkatas;
+package bny.codekatas.kataofkatas;
 
 import org.eclipse.collections.api.bag.ImmutableBag;
 import org.eclipse.collections.api.factory.Sets;
 import org.eclipse.collections.api.multimap.set.ImmutableSetMultimap;
 import org.eclipse.collections.api.set.ImmutableSet;
-import org.eclipse.collections.impl.factory.Multimaps;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/pitest-mutation-kata-solutions/pom.xml b/pitest-mutation-kata-solutions/pom.xml
index 9b0a434b..88186086 100644
--- a/pitest-mutation-kata-solutions/pom.xml
+++ b/pitest-mutation-kata-solutions/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.codekatas</groupId>
+    <groupId>bny.codekatas</groupId>
     <version>1.0.0-SNAPSHOT</version>
     <artifactId>pitest-mutation-kata-solutions</artifactId>
     <name>Pitest Mutation Kata Solutions</name>
diff --git a/pitest-mutation-kata-solutions/src/main/java/bnymellon/codekatas/pitestmutationkata/Position.java b/pitest-mutation-kata-solutions/src/main/java/bny/codekatas/pitestmutationkata/Position.java
similarity index 97%
rename from pitest-mutation-kata-solutions/src/main/java/bnymellon/codekatas/pitestmutationkata/Position.java
rename to pitest-mutation-kata-solutions/src/main/java/bny/codekatas/pitestmutationkata/Position.java
index 037311d4..8ba734a8 100644
--- a/pitest-mutation-kata-solutions/src/main/java/bnymellon/codekatas/pitestmutationkata/Position.java
+++ b/pitest-mutation-kata-solutions/src/main/java/bny/codekatas/pitestmutationkata/Position.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.pitestmutationkata;
+package bny.codekatas.pitestmutationkata;
 
 import java.util.Objects;
 
diff --git a/pitest-mutation-kata-solutions/src/test/java/bnymellon/codekatas/pitestmutationkata/PositionTest.java b/pitest-mutation-kata-solutions/src/test/java/bny/codekatas/pitestmutationkata/PositionTest.java
similarity index 96%
rename from pitest-mutation-kata-solutions/src/test/java/bnymellon/codekatas/pitestmutationkata/PositionTest.java
rename to pitest-mutation-kata-solutions/src/test/java/bny/codekatas/pitestmutationkata/PositionTest.java
index f9f5354b..92cb58f8 100644
--- a/pitest-mutation-kata-solutions/src/test/java/bnymellon/codekatas/pitestmutationkata/PositionTest.java
+++ b/pitest-mutation-kata-solutions/src/test/java/bny/codekatas/pitestmutationkata/PositionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.pitestmutationkata;
+package bny.codekatas.pitestmutationkata;
 
 import org.eclipse.collections.impl.test.Verify;
 import org.junit.jupiter.api.Assertions;
diff --git a/pitest-mutation-kata/pom.xml b/pitest-mutation-kata/pom.xml
index ae7fe4fe..d67694be 100644
--- a/pitest-mutation-kata/pom.xml
+++ b/pitest-mutation-kata/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2023 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.codekatas</groupId>
+    <groupId>bny.codekatas</groupId>
     <version>1.0.0-SNAPSHOT</version>
     <artifactId>pitest-mutation-kata</artifactId>
     <name>Pitest Mutation Kata</name>
diff --git a/pitest-mutation-kata/src/main/java/bnymellon/codekatas/pitestmutationkata/Position.java b/pitest-mutation-kata/src/main/java/bny/codekatas/pitestmutationkata/Position.java
similarity index 97%
rename from pitest-mutation-kata/src/main/java/bnymellon/codekatas/pitestmutationkata/Position.java
rename to pitest-mutation-kata/src/main/java/bny/codekatas/pitestmutationkata/Position.java
index 037311d4..8ba734a8 100644
--- a/pitest-mutation-kata/src/main/java/bnymellon/codekatas/pitestmutationkata/Position.java
+++ b/pitest-mutation-kata/src/main/java/bny/codekatas/pitestmutationkata/Position.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.pitestmutationkata;
+package bny.codekatas.pitestmutationkata;
 
 import java.util.Objects;
 
diff --git a/pitest-mutation-kata/src/test/java/bnymellon/codekatas/pitestmutationkata/PositionTest.java b/pitest-mutation-kata/src/test/java/bny/codekatas/pitestmutationkata/PositionTest.java
similarity index 95%
rename from pitest-mutation-kata/src/test/java/bnymellon/codekatas/pitestmutationkata/PositionTest.java
rename to pitest-mutation-kata/src/test/java/bny/codekatas/pitestmutationkata/PositionTest.java
index 698d0307..37d69443 100644
--- a/pitest-mutation-kata/src/test/java/bnymellon/codekatas/pitestmutationkata/PositionTest.java
+++ b/pitest-mutation-kata/src/test/java/bny/codekatas/pitestmutationkata/PositionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package bnymellon.codekatas.pitestmutationkata;
+package bny.codekatas.pitestmutationkata;
 
 import org.eclipse.collections.impl.test.Verify;
 import org.junit.jupiter.api.Assertions;
diff --git a/pom.xml b/pom.xml
index ccb42025..13189110 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2022 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.codekatas</groupId>
+    <groupId>bny.codekatas</groupId>
     <artifactId>code-katas</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>