diff --git a/build.gradle b/build.gradle
index 1806f637407..25340f0a9ee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1027,34 +1027,6 @@ project(':server') {
   }
 }
 
-project(':share') {
-  base {
-    archivesName = "kafka-share"
-  }
-
-  dependencies {
-    implementation project(':server-common')
-    implementation libs.slf4jApi
-
-    testImplementation project(':clients').sourceSets.test.output
-    testImplementation project(':server-common').sourceSets.test.output
-
-    testImplementation libs.junitJupiter
-    testImplementation libs.mockitoCore
-    testImplementation testLog4j2Libs
-
-    testRuntimeOnly runtimeTestLibs
-  }
-
-  checkstyle {
-    configProperties = checkstyleConfigProperties("import-control-share.xml")
-  }
-
-  javadoc {
-    enabled = false
-  }
-}
-
 project(':core') {
   apply plugin: 'scala'
 
@@ -1106,7 +1078,6 @@ project(':core') {
     implementation project(':storage')
     implementation project(':server')
     implementation project(':coordinator-common')
-    implementation project(':share')
     implementation project(':share-coordinator')
 
     implementation libs.argparse4j
@@ -1131,7 +1102,6 @@ project(':core') {
     testImplementation project(':server-common').sourceSets.test.output
     testImplementation project(':storage:storage-api').sourceSets.test.output
     testImplementation project(':server').sourceSets.test.output
-    testImplementation project(':share').sourceSets.test.output
     testImplementation project(':test-common')
     testImplementation project(':test-common:test-common-api')
     testImplementation libs.bcpkix
@@ -1769,7 +1739,6 @@ project(':share-coordinator') {
     implementation project(':coordinator-common')
     implementation project(':metadata')
     implementation project(':server-common')
-    implementation project(':share')
     implementation libs.metrics
     implementation libs.slf4jApi
 
@@ -2467,7 +2436,6 @@ project(':tools') {
     implementation project(':group-coordinator')
     implementation project(':coordinator-common')
     implementation project(':share-coordinator')
-    implementation project(':share')
     implementation libs.argparse4j
     implementation libs.jacksonDatabind
     implementation libs.jacksonDataformatCsv
diff --git a/checkstyle/import-control-server-common.xml b/checkstyle/import-control-server-common.xml
index c576ea76f9a..ac870668661 100644
--- a/checkstyle/import-control-server-common.xml
+++ b/checkstyle/import-control-server-common.xml
@@ -98,6 +98,15 @@
             <allow pkg="org.apache.kafka.server.util" />
         </subpackage>
 
+        <subpackage name="share">
+          <allow pkg="org.apache.kafka.server.share" />
+          <subpackage name="persister">
+            <allow pkg="org.apache.kafka.clients" />
+            <allow pkg="org.apache.kafka.server.util" />
+            <allow pkg="org.apache.kafka.test" />
+          </subpackage>
+        </subpackage>
+
         <subpackage name="util">
             <!-- InterBrokerSendThread uses some clients classes that are not part of the public -->
             <!-- API but are still relatively common -->
diff --git a/checkstyle/import-control-share.xml b/checkstyle/import-control-share.xml
deleted file mode 100644
index 8abc1b9f7b7..00000000000
--- a/checkstyle/import-control-share.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE import-control PUBLIC
-        "-//Puppy Crawl//DTD Import Control 1.1//EN"
-        "http://www.puppycrawl.com/dtds/import_control_1_1.dtd">
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<import-control pkg="org.apache.kafka">
-
-  <!-- THINK HARD ABOUT THE LAYERING OF THE PROJECT BEFORE CHANGING THIS FILE -->
-
-  <!-- common library dependencies -->
-  <allow pkg="java" />
-  <allow pkg="org.slf4j" />
-  <allow pkg="org.junit" />
-  <allow pkg="org.mockito" />
-
-  <!-- no one depends on the server -->
-  <disallow pkg="kafka" />
-
-  <!-- anyone can use public classes -->
-  <allow pkg="org.apache.kafka.common" exact-match="true" />
-  <allow pkg="org.apache.kafka.common.utils" />
-  <allow pkg="org.apache.kafka.common.annotation" />
-
-  <!-- protocol, records and request/response utilities -->
-  <allow pkg="org.apache.kafka.common.message" />
-  <allow pkg="org.apache.kafka.common.protocol" />
-  <allow pkg="org.apache.kafka.common.requests" />
-
-  <subpackage name="server">
-    <subpackage name="share">
-      <allow pkg="org.apache.kafka.server.share" />
-
-      <subpackage name="fetch">
-        <allow pkg="org.apache.kafka.server.purgatory" />
-        <allow class="org.apache.kafka.server.storage.log.FetchParams"/>
-      </subpackage>
-
-      <subpackage name="persister">
-        <allow pkg="org.apache.kafka.clients" />
-        <allow pkg="org.apache.kafka.common.internals" />
-        <allow pkg="org.apache.kafka.server.util" />
-        <allow pkg="org.apache.kafka.test" />
-      </subpackage>
-    </subpackage>
-  </subpackage>
-
-</import-control>
diff --git a/share/src/main/java/org/apache/kafka/server/share/SharePartitionKey.java b/server-common/src/main/java/org/apache/kafka/server/share/SharePartitionKey.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/SharePartitionKey.java
rename to server-common/src/main/java/org/apache/kafka/server/share/SharePartitionKey.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/DefaultStatePersister.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/DefaultStatePersister.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/DefaultStatePersister.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/DefaultStatePersister.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/DeleteShareGroupStateParameters.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/DeleteShareGroupStateParameters.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/DeleteShareGroupStateParameters.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/DeleteShareGroupStateParameters.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/DeleteShareGroupStateResult.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/DeleteShareGroupStateResult.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/DeleteShareGroupStateResult.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/DeleteShareGroupStateResult.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/GroupTopicPartitionData.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/GroupTopicPartitionData.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/GroupTopicPartitionData.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/GroupTopicPartitionData.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/InitializeShareGroupStateParameters.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/InitializeShareGroupStateParameters.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/InitializeShareGroupStateParameters.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/InitializeShareGroupStateParameters.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/InitializeShareGroupStateResult.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/InitializeShareGroupStateResult.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/InitializeShareGroupStateResult.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/InitializeShareGroupStateResult.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/NoOpShareStatePersister.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/NoOpShareStatePersister.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/NoOpShareStatePersister.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/NoOpShareStatePersister.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/PartitionAllData.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/PartitionAllData.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/PartitionAllData.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/PartitionAllData.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/PartitionData.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/PartitionData.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/PartitionData.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/PartitionData.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/PartitionErrorData.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/PartitionErrorData.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/PartitionErrorData.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/PartitionErrorData.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/PartitionFactory.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/PartitionFactory.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/PartitionFactory.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/PartitionFactory.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/PartitionIdData.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/PartitionIdData.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/PartitionIdData.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/PartitionIdData.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/PartitionIdLeaderEpochData.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/PartitionIdLeaderEpochData.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/PartitionIdLeaderEpochData.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/PartitionIdLeaderEpochData.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/PartitionInfoData.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/PartitionInfoData.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/PartitionInfoData.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/PartitionInfoData.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/PartitionStateBatchData.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/PartitionStateBatchData.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/PartitionStateBatchData.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/PartitionStateBatchData.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/PartitionStateData.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/PartitionStateData.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/PartitionStateData.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/PartitionStateData.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/PartitionStateErrorData.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/PartitionStateErrorData.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/PartitionStateErrorData.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/PartitionStateErrorData.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/Persister.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/Persister.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/Persister.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/Persister.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/PersisterParameters.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/PersisterParameters.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/PersisterParameters.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/PersisterParameters.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/PersisterResult.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/PersisterResult.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/PersisterResult.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/PersisterResult.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/PersisterStateBatch.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/PersisterStateBatch.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/PersisterStateBatch.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/PersisterStateBatch.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/PersisterStateManager.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/PersisterStateManager.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/PersisterStateManager.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/PersisterStateManager.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateParameters.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateParameters.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateParameters.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateParameters.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateResult.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateResult.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateResult.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateResult.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateSummaryParameters.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateSummaryParameters.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateSummaryParameters.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateSummaryParameters.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateSummaryResult.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateSummaryResult.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateSummaryResult.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateSummaryResult.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/ShareCoordinatorMetadataCacheHelper.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/ShareCoordinatorMetadataCacheHelper.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/ShareCoordinatorMetadataCacheHelper.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/ShareCoordinatorMetadataCacheHelper.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/TopicData.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/TopicData.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/TopicData.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/TopicData.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/WriteShareGroupStateParameters.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/WriteShareGroupStateParameters.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/WriteShareGroupStateParameters.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/WriteShareGroupStateParameters.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/persister/WriteShareGroupStateResult.java b/server-common/src/main/java/org/apache/kafka/server/share/persister/WriteShareGroupStateResult.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/persister/WriteShareGroupStateResult.java
rename to server-common/src/main/java/org/apache/kafka/server/share/persister/WriteShareGroupStateResult.java
diff --git a/share/src/test/java/org/apache/kafka/server/share/persister/DefaultStatePersisterTest.java b/server-common/src/test/java/org/apache/kafka/server/share/persister/DefaultStatePersisterTest.java
similarity index 100%
rename from share/src/test/java/org/apache/kafka/server/share/persister/DefaultStatePersisterTest.java
rename to server-common/src/test/java/org/apache/kafka/server/share/persister/DefaultStatePersisterTest.java
diff --git a/share/src/test/java/org/apache/kafka/server/share/persister/PersisterStateManagerTest.java b/server-common/src/test/java/org/apache/kafka/server/share/persister/PersisterStateManagerTest.java
similarity index 100%
rename from share/src/test/java/org/apache/kafka/server/share/persister/PersisterStateManagerTest.java
rename to server-common/src/test/java/org/apache/kafka/server/share/persister/PersisterStateManagerTest.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/CachedSharePartition.java b/server/src/main/java/org/apache/kafka/server/share/CachedSharePartition.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/CachedSharePartition.java
rename to server/src/main/java/org/apache/kafka/server/share/CachedSharePartition.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/ErroneousAndValidPartitionData.java b/server/src/main/java/org/apache/kafka/server/share/ErroneousAndValidPartitionData.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/ErroneousAndValidPartitionData.java
rename to server/src/main/java/org/apache/kafka/server/share/ErroneousAndValidPartitionData.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/acknowledge/ShareAcknowledgementBatch.java b/server/src/main/java/org/apache/kafka/server/share/acknowledge/ShareAcknowledgementBatch.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/acknowledge/ShareAcknowledgementBatch.java
rename to server/src/main/java/org/apache/kafka/server/share/acknowledge/ShareAcknowledgementBatch.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/context/FinalContext.java b/server/src/main/java/org/apache/kafka/server/share/context/FinalContext.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/context/FinalContext.java
rename to server/src/main/java/org/apache/kafka/server/share/context/FinalContext.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/context/ShareFetchContext.java b/server/src/main/java/org/apache/kafka/server/share/context/ShareFetchContext.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/context/ShareFetchContext.java
rename to server/src/main/java/org/apache/kafka/server/share/context/ShareFetchContext.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/context/ShareSessionContext.java b/server/src/main/java/org/apache/kafka/server/share/context/ShareSessionContext.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/context/ShareSessionContext.java
rename to server/src/main/java/org/apache/kafka/server/share/context/ShareSessionContext.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/fetch/DelayedShareFetchGroupKey.java b/server/src/main/java/org/apache/kafka/server/share/fetch/DelayedShareFetchGroupKey.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/fetch/DelayedShareFetchGroupKey.java
rename to server/src/main/java/org/apache/kafka/server/share/fetch/DelayedShareFetchGroupKey.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/fetch/DelayedShareFetchKey.java b/server/src/main/java/org/apache/kafka/server/share/fetch/DelayedShareFetchKey.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/fetch/DelayedShareFetchKey.java
rename to server/src/main/java/org/apache/kafka/server/share/fetch/DelayedShareFetchKey.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/fetch/DelayedShareFetchPartitionKey.java b/server/src/main/java/org/apache/kafka/server/share/fetch/DelayedShareFetchPartitionKey.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/fetch/DelayedShareFetchPartitionKey.java
rename to server/src/main/java/org/apache/kafka/server/share/fetch/DelayedShareFetchPartitionKey.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/fetch/PartitionMaxBytesStrategy.java b/server/src/main/java/org/apache/kafka/server/share/fetch/PartitionMaxBytesStrategy.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/fetch/PartitionMaxBytesStrategy.java
rename to server/src/main/java/org/apache/kafka/server/share/fetch/PartitionMaxBytesStrategy.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/fetch/ShareAcquiredRecords.java b/server/src/main/java/org/apache/kafka/server/share/fetch/ShareAcquiredRecords.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/fetch/ShareAcquiredRecords.java
rename to server/src/main/java/org/apache/kafka/server/share/fetch/ShareAcquiredRecords.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/fetch/ShareFetch.java b/server/src/main/java/org/apache/kafka/server/share/fetch/ShareFetch.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/fetch/ShareFetch.java
rename to server/src/main/java/org/apache/kafka/server/share/fetch/ShareFetch.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/session/LastUsedKey.java b/server/src/main/java/org/apache/kafka/server/share/session/LastUsedKey.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/session/LastUsedKey.java
rename to server/src/main/java/org/apache/kafka/server/share/session/LastUsedKey.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/session/ShareSession.java b/server/src/main/java/org/apache/kafka/server/share/session/ShareSession.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/session/ShareSession.java
rename to server/src/main/java/org/apache/kafka/server/share/session/ShareSession.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/session/ShareSessionCache.java b/server/src/main/java/org/apache/kafka/server/share/session/ShareSessionCache.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/session/ShareSessionCache.java
rename to server/src/main/java/org/apache/kafka/server/share/session/ShareSessionCache.java
diff --git a/share/src/main/java/org/apache/kafka/server/share/session/ShareSessionKey.java b/server/src/main/java/org/apache/kafka/server/share/session/ShareSessionKey.java
similarity index 100%
rename from share/src/main/java/org/apache/kafka/server/share/session/ShareSessionKey.java
rename to server/src/main/java/org/apache/kafka/server/share/session/ShareSessionKey.java
diff --git a/share/src/test/java/org/apache/kafka/server/share/CachedSharePartitionTest.java b/server/src/test/java/org/apache/kafka/server/share/CachedSharePartitionTest.java
similarity index 100%
rename from share/src/test/java/org/apache/kafka/server/share/CachedSharePartitionTest.java
rename to server/src/test/java/org/apache/kafka/server/share/CachedSharePartitionTest.java
diff --git a/share/src/test/java/org/apache/kafka/server/share/fetch/DelayedShareFetchKeyTest.java b/server/src/test/java/org/apache/kafka/server/share/fetch/DelayedShareFetchKeyTest.java
similarity index 100%
rename from share/src/test/java/org/apache/kafka/server/share/fetch/DelayedShareFetchKeyTest.java
rename to server/src/test/java/org/apache/kafka/server/share/fetch/DelayedShareFetchKeyTest.java
diff --git a/share/src/test/java/org/apache/kafka/server/share/fetch/PartitionMaxBytesStrategyTest.java b/server/src/test/java/org/apache/kafka/server/share/fetch/PartitionMaxBytesStrategyTest.java
similarity index 100%
rename from share/src/test/java/org/apache/kafka/server/share/fetch/PartitionMaxBytesStrategyTest.java
rename to server/src/test/java/org/apache/kafka/server/share/fetch/PartitionMaxBytesStrategyTest.java
diff --git a/share/src/test/java/org/apache/kafka/server/share/fetch/ShareFetchTest.java b/server/src/test/java/org/apache/kafka/server/share/fetch/ShareFetchTest.java
similarity index 100%
rename from share/src/test/java/org/apache/kafka/server/share/fetch/ShareFetchTest.java
rename to server/src/test/java/org/apache/kafka/server/share/fetch/ShareFetchTest.java
diff --git a/share/src/test/java/org/apache/kafka/server/share/session/ShareSessionCacheTest.java b/server/src/test/java/org/apache/kafka/server/share/session/ShareSessionCacheTest.java
similarity index 100%
rename from share/src/test/java/org/apache/kafka/server/share/session/ShareSessionCacheTest.java
rename to server/src/test/java/org/apache/kafka/server/share/session/ShareSessionCacheTest.java
diff --git a/share/src/test/java/org/apache/kafka/server/share/session/ShareSessionTest.java b/server/src/test/java/org/apache/kafka/server/share/session/ShareSessionTest.java
similarity index 100%
rename from share/src/test/java/org/apache/kafka/server/share/session/ShareSessionTest.java
rename to server/src/test/java/org/apache/kafka/server/share/session/ShareSessionTest.java