diff --git a/pom.xml b/pom.xml
index 93d7bbb..6a55a81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,8 +41,6 @@
     </scm>
 
     <properties>
-        <!-- SLING-11355: delete after release has been created -->
-        <bnd.baseline.diffpackages>!*.announcement.*, !*.ping.*, *</bnd.baseline.diffpackages>
         <jackrabbit.version>2.14.3</jackrabbit.version>
         <!-- by default Slow tests are excluded - use -PincludeSlowTests to include them -->
         <sling.excluded.surefire.groups>org.apache.sling.commons.testing.junit.categories.Slow</sling.excluded.surefire.groups>
diff --git a/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java b/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java
index 344a718..d6f15f4 100644
--- a/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java
+++ b/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java
@@ -35,7 +35,6 @@
 import javax.json.JsonObjectBuilder;
 import javax.json.JsonReaderFactory;
 import javax.json.JsonValue;
-import javax.json.JsonValue.ValueType;
 
 import org.apache.sling.api.resource.ModifiableValueMap;
 import org.apache.sling.api.resource.PersistenceException;
diff --git a/src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistry.java b/src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistry.java
index 05c0610..fb8b2c1 100644
--- a/src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistry.java
+++ b/src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistry.java
@@ -22,7 +22,6 @@
 
 import org.apache.sling.discovery.ClusterView;
 import org.apache.sling.discovery.InstanceDescription;
-import org.apache.sling.discovery.base.connectors.announcement.impl.CachedAnnouncement;
 
 /**
  * The announcement registry keeps track of all the announcement that this
diff --git a/src/main/java/org/apache/sling/discovery/base/connectors/announcement/impl/AnnouncementRegistryImpl.java b/src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImpl.java
similarity index 98%
rename from src/main/java/org/apache/sling/discovery/base/connectors/announcement/impl/AnnouncementRegistryImpl.java
rename to src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImpl.java
index 5b275eb..40a03ca 100644
--- a/src/main/java/org/apache/sling/discovery/base/connectors/announcement/impl/AnnouncementRegistryImpl.java
+++ b/src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.discovery.base.connectors.announcement.impl;
+package org.apache.sling.discovery.base.connectors.announcement;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -36,9 +36,6 @@
 import org.apache.sling.discovery.ClusterView;
 import org.apache.sling.discovery.InstanceDescription;
 import org.apache.sling.discovery.base.connectors.BaseConfig;
-import org.apache.sling.discovery.base.connectors.announcement.Announcement;
-import org.apache.sling.discovery.base.connectors.announcement.AnnouncementFilter;
-import org.apache.sling.discovery.base.connectors.announcement.AnnouncementRegistry;
 import org.apache.sling.discovery.commons.providers.util.ResourceHelper;
 import org.apache.sling.settings.SlingSettingsService;
 import org.osgi.service.component.annotations.Activate;
diff --git a/src/main/java/org/apache/sling/discovery/base/connectors/announcement/impl/CachedAnnouncement.java b/src/main/java/org/apache/sling/discovery/base/connectors/announcement/CachedAnnouncement.java
similarity index 96%
rename from src/main/java/org/apache/sling/discovery/base/connectors/announcement/impl/CachedAnnouncement.java
rename to src/main/java/org/apache/sling/discovery/base/connectors/announcement/CachedAnnouncement.java
index e1a7042..426c63f 100644
--- a/src/main/java/org/apache/sling/discovery/base/connectors/announcement/impl/CachedAnnouncement.java
+++ b/src/main/java/org/apache/sling/discovery/base/connectors/announcement/CachedAnnouncement.java
@@ -16,10 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.discovery.base.connectors.announcement.impl;
+package org.apache.sling.discovery.base.connectors.announcement;
 
 import org.apache.sling.discovery.base.connectors.BaseConfig;
-import org.apache.sling.discovery.base.connectors.announcement.Announcement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/apache/sling/discovery/base/connectors/announcement/package-info.java b/src/main/java/org/apache/sling/discovery/base/connectors/announcement/package-info.java
index 2c89e07..48d3809 100644
--- a/src/main/java/org/apache/sling/discovery/base/connectors/announcement/package-info.java
+++ b/src/main/java/org/apache/sling/discovery/base/connectors/announcement/package-info.java
@@ -23,7 +23,7 @@
  *
  * @version 1.1.2
  */
-@Version("2.0.1")
+@Version("3.0.0")
 package org.apache.sling.discovery.base.connectors.announcement;
 
-import org.osgi.annotation.versioning.Version;
\ No newline at end of file
+import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/discovery/base/connectors/ping/impl/ConnectorRegistryImpl.java b/src/main/java/org/apache/sling/discovery/base/connectors/ping/ConnectorRegistryImpl.java
similarity index 96%
rename from src/main/java/org/apache/sling/discovery/base/connectors/ping/impl/ConnectorRegistryImpl.java
rename to src/main/java/org/apache/sling/discovery/base/connectors/ping/ConnectorRegistryImpl.java
index 2baa8db..9592967 100644
--- a/src/main/java/org/apache/sling/discovery/base/connectors/ping/impl/ConnectorRegistryImpl.java
+++ b/src/main/java/org/apache/sling/discovery/base/connectors/ping/ConnectorRegistryImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.discovery.base.connectors.ping.impl;
+package org.apache.sling.discovery.base.connectors.ping;
 
 import java.net.InetAddress;
 import java.net.URL;
@@ -31,8 +31,6 @@
 import org.apache.sling.discovery.base.commons.ClusterViewService;
 import org.apache.sling.discovery.base.connectors.BaseConfig;
 import org.apache.sling.discovery.base.connectors.announcement.AnnouncementRegistry;
-import org.apache.sling.discovery.base.connectors.ping.ConnectorRegistry;
-import org.apache.sling.discovery.base.connectors.ping.TopologyConnectorClientInformation;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/src/main/java/org/apache/sling/discovery/base/connectors/ping/impl/TopologyConnectorClient.java b/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyConnectorClient.java
similarity index 98%
rename from src/main/java/org/apache/sling/discovery/base/connectors/ping/impl/TopologyConnectorClient.java
rename to src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyConnectorClient.java
index e3a27c0..fc6d124 100644
--- a/src/main/java/org/apache/sling/discovery/base/connectors/ping/impl/TopologyConnectorClient.java
+++ b/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyConnectorClient.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.discovery.base.connectors.ping.impl;
+package org.apache.sling.discovery.base.connectors.ping;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -53,8 +53,6 @@
 import org.apache.sling.discovery.base.connectors.announcement.Announcement;
 import org.apache.sling.discovery.base.connectors.announcement.AnnouncementFilter;
 import org.apache.sling.discovery.base.connectors.announcement.AnnouncementRegistry;
-import org.apache.sling.discovery.base.connectors.ping.TopologyConnectorClientInformation;
-import org.apache.sling.discovery.base.connectors.ping.TopologyRequestValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/apache/sling/discovery/base/connectors/ping/package-info.java b/src/main/java/org/apache/sling/discovery/base/connectors/ping/package-info.java
index 2732bd1..4529c15 100644
--- a/src/main/java/org/apache/sling/discovery/base/connectors/ping/package-info.java
+++ b/src/main/java/org/apache/sling/discovery/base/connectors/ping/package-info.java
@@ -23,7 +23,7 @@
  *
  * @version 1.0.0
  */
-@Version("1.0.1")
+@Version("2.0.0")
 package org.apache.sling.discovery.base.connectors.ping;
 
-import org.osgi.annotation.versioning.Version;
\ No newline at end of file
+import org.osgi.annotation.versioning.Version;
diff --git a/src/test/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImplTest.java b/src/test/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImplTest.java
index bd8bf74..3706d6e 100644
--- a/src/test/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImplTest.java
+++ b/src/test/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImplTest.java
@@ -35,7 +35,6 @@
 import org.apache.sling.discovery.ClusterView;
 import org.apache.sling.discovery.InstanceDescription;
 import org.apache.sling.discovery.base.connectors.BaseConfig;
-import org.apache.sling.discovery.base.connectors.announcement.impl.AnnouncementRegistryImpl;
 import org.apache.sling.discovery.base.its.setup.TopologyHelper;
 import org.apache.sling.discovery.base.its.setup.VirtualInstanceHelper;
 import org.apache.sling.discovery.base.its.setup.mock.MockFactory;
diff --git a/src/test/java/org/apache/sling/discovery/base/connectors/ping/ConnectorRegistryImplTest.java b/src/test/java/org/apache/sling/discovery/base/connectors/ping/ConnectorRegistryImplTest.java
index 0d6ee31..f743418 100644
--- a/src/test/java/org/apache/sling/discovery/base/connectors/ping/ConnectorRegistryImplTest.java
+++ b/src/test/java/org/apache/sling/discovery/base/connectors/ping/ConnectorRegistryImplTest.java
@@ -26,8 +26,7 @@
 import org.apache.sling.discovery.base.commons.ClusterViewService;
 import org.apache.sling.discovery.base.connectors.BaseConfig;
 import org.apache.sling.discovery.base.connectors.DummyVirtualInstanceBuilder;
-import org.apache.sling.discovery.base.connectors.announcement.impl.AnnouncementRegistryImpl;
-import org.apache.sling.discovery.base.connectors.ping.impl.ConnectorRegistryImpl;
+import org.apache.sling.discovery.base.connectors.announcement.AnnouncementRegistryImpl;
 import org.apache.sling.discovery.base.its.setup.VirtualInstance;
 import org.apache.sling.discovery.base.its.setup.VirtualInstanceBuilder;
 import org.apache.sling.discovery.base.its.setup.mock.MockFactory;
diff --git a/src/test/java/org/apache/sling/discovery/base/its/setup/VirtualInstanceBuilder.java b/src/test/java/org/apache/sling/discovery/base/its/setup/VirtualInstanceBuilder.java
index 7925258..15eee4b 100644
--- a/src/test/java/org/apache/sling/discovery/base/its/setup/VirtualInstanceBuilder.java
+++ b/src/test/java/org/apache/sling/discovery/base/its/setup/VirtualInstanceBuilder.java
@@ -26,9 +26,9 @@
 import org.apache.sling.discovery.base.commons.ClusterViewService;
 import org.apache.sling.discovery.base.commons.ViewChecker;
 import org.apache.sling.discovery.base.connectors.announcement.AnnouncementRegistry;
-import org.apache.sling.discovery.base.connectors.announcement.impl.AnnouncementRegistryImpl;
+import org.apache.sling.discovery.base.connectors.announcement.AnnouncementRegistryImpl;
 import org.apache.sling.discovery.base.connectors.ping.ConnectorRegistry;
-import org.apache.sling.discovery.base.connectors.ping.impl.ConnectorRegistryImpl;
+import org.apache.sling.discovery.base.connectors.ping.ConnectorRegistryImpl;
 import org.apache.sling.discovery.base.its.setup.mock.ArtificialDelay;
 import org.apache.sling.discovery.base.its.setup.mock.FailingScheduler;
 import org.apache.sling.discovery.commons.providers.base.DummyScheduler;