diff --git a/eventadmin.bridge.configuration/pom.xml b/eventadmin/bridge.configuration/pom.xml
similarity index 100%
rename from eventadmin.bridge.configuration/pom.xml
rename to eventadmin/bridge.configuration/pom.xml
diff --git a/eventadmin.bridge.configuration/src/main/java/org/apache/felix/eventadmin/bridge/configuration/Activator.java b/eventadmin/bridge.configuration/src/main/java/org/apache/felix/eventadmin/bridge/configuration/Activator.java
similarity index 100%
rename from eventadmin.bridge.configuration/src/main/java/org/apache/felix/eventadmin/bridge/configuration/Activator.java
rename to eventadmin/bridge.configuration/src/main/java/org/apache/felix/eventadmin/bridge/configuration/Activator.java
diff --git a/eventadmin.bridge.configuration/src/main/java/org/apache/felix/eventadmin/bridge/configuration/ConfigurationEventToEventAdminBridge.java b/eventadmin/bridge.configuration/src/main/java/org/apache/felix/eventadmin/bridge/configuration/ConfigurationEventToEventAdminBridge.java
similarity index 100%
rename from eventadmin.bridge.configuration/src/main/java/org/apache/felix/eventadmin/bridge/configuration/ConfigurationEventToEventAdminBridge.java
rename to eventadmin/bridge.configuration/src/main/java/org/apache/felix/eventadmin/bridge/configuration/ConfigurationEventToEventAdminBridge.java
diff --git a/eventadmin.bridge.configuration/src/main/resources/LICENSE b/eventadmin/bridge.configuration/src/main/resources/LICENSE
similarity index 100%
rename from eventadmin.bridge.configuration/src/main/resources/LICENSE
rename to eventadmin/bridge.configuration/src/main/resources/LICENSE
diff --git a/eventadmin.bridge.configuration/src/main/resources/NOTICE b/eventadmin/bridge.configuration/src/main/resources/NOTICE
similarity index 100%
rename from eventadmin.bridge.configuration/src/main/resources/NOTICE
rename to eventadmin/bridge.configuration/src/main/resources/NOTICE
diff --git a/eventadmin.bridge.upnp/pom.xml b/eventadmin/bridge.upnp/pom.xml
similarity index 100%
rename from eventadmin.bridge.upnp/pom.xml
rename to eventadmin/bridge.upnp/pom.xml
diff --git a/eventadmin.bridge.upnp/src/main/java/org/apache/felix/eventadmin/bridge/upnp/Activator.java b/eventadmin/bridge.upnp/src/main/java/org/apache/felix/eventadmin/bridge/upnp/Activator.java
similarity index 100%
rename from eventadmin.bridge.upnp/src/main/java/org/apache/felix/eventadmin/bridge/upnp/Activator.java
rename to eventadmin/bridge.upnp/src/main/java/org/apache/felix/eventadmin/bridge/upnp/Activator.java
diff --git a/eventadmin.bridge.upnp/src/main/java/org/apache/felix/eventadmin/bridge/upnp/UPnPEventToEventAdminBridge.java b/eventadmin/bridge.upnp/src/main/java/org/apache/felix/eventadmin/bridge/upnp/UPnPEventToEventAdminBridge.java
similarity index 100%
rename from eventadmin.bridge.upnp/src/main/java/org/apache/felix/eventadmin/bridge/upnp/UPnPEventToEventAdminBridge.java
rename to eventadmin/bridge.upnp/src/main/java/org/apache/felix/eventadmin/bridge/upnp/UPnPEventToEventAdminBridge.java
diff --git a/eventadmin.bridge.upnp/src/main/resources/LICENSE b/eventadmin/bridge.upnp/src/main/resources/LICENSE
similarity index 100%
rename from eventadmin.bridge.upnp/src/main/resources/LICENSE
rename to eventadmin/bridge.upnp/src/main/resources/LICENSE
diff --git a/eventadmin.bridge.upnp/src/main/resources/NOTICE b/eventadmin/bridge.upnp/src/main/resources/NOTICE
similarity index 100%
rename from eventadmin.bridge.upnp/src/main/resources/NOTICE
rename to eventadmin/bridge.upnp/src/main/resources/NOTICE
diff --git a/eventadmin.bridge.useradmin/pom.xml b/eventadmin/bridge.useradmin/pom.xml
similarity index 100%
rename from eventadmin.bridge.useradmin/pom.xml
rename to eventadmin/bridge.useradmin/pom.xml
diff --git a/eventadmin.bridge.useradmin/src/main/java/org/apache/felix/eventadmin/bridge/useradmin/Activator.java b/eventadmin/bridge.useradmin/src/main/java/org/apache/felix/eventadmin/bridge/useradmin/Activator.java
similarity index 100%
rename from eventadmin.bridge.useradmin/src/main/java/org/apache/felix/eventadmin/bridge/useradmin/Activator.java
rename to eventadmin/bridge.useradmin/src/main/java/org/apache/felix/eventadmin/bridge/useradmin/Activator.java
diff --git a/eventadmin.bridge.useradmin/src/main/java/org/apache/felix/eventadmin/bridge/useradmin/UserAdminEventToEventAdminBridge.java b/eventadmin/bridge.useradmin/src/main/java/org/apache/felix/eventadmin/bridge/useradmin/UserAdminEventToEventAdminBridge.java
similarity index 100%
rename from eventadmin.bridge.useradmin/src/main/java/org/apache/felix/eventadmin/bridge/useradmin/UserAdminEventToEventAdminBridge.java
rename to eventadmin/bridge.useradmin/src/main/java/org/apache/felix/eventadmin/bridge/useradmin/UserAdminEventToEventAdminBridge.java
diff --git a/eventadmin.bridge.useradmin/src/main/resources/LICENSE b/eventadmin/bridge.useradmin/src/main/resources/LICENSE
similarity index 100%
rename from eventadmin.bridge.useradmin/src/main/resources/LICENSE
rename to eventadmin/bridge.useradmin/src/main/resources/LICENSE
diff --git a/eventadmin.bridge.useradmin/src/main/resources/NOTICE b/eventadmin/bridge.useradmin/src/main/resources/NOTICE
similarity index 100%
rename from eventadmin.bridge.useradmin/src/main/resources/NOTICE
rename to eventadmin/bridge.useradmin/src/main/resources/NOTICE
diff --git a/eventadmin.bridge.wireadmin/pom.xml b/eventadmin/bridge.wireadmin/pom.xml
similarity index 100%
rename from eventadmin.bridge.wireadmin/pom.xml
rename to eventadmin/bridge.wireadmin/pom.xml
diff --git a/eventadmin.bridge.wireadmin/src/main/java/org/apache/felix/eventadmin/bridge/wireadmin/Activator.java b/eventadmin/bridge.wireadmin/src/main/java/org/apache/felix/eventadmin/bridge/wireadmin/Activator.java
similarity index 100%
rename from eventadmin.bridge.wireadmin/src/main/java/org/apache/felix/eventadmin/bridge/wireadmin/Activator.java
rename to eventadmin/bridge.wireadmin/src/main/java/org/apache/felix/eventadmin/bridge/wireadmin/Activator.java
diff --git a/eventadmin.bridge.wireadmin/src/main/java/org/apache/felix/eventadmin/bridge/wireadmin/WireAdminEventToEventAdminBridge.java b/eventadmin/bridge.wireadmin/src/main/java/org/apache/felix/eventadmin/bridge/wireadmin/WireAdminEventToEventAdminBridge.java
similarity index 100%
rename from eventadmin.bridge.wireadmin/src/main/java/org/apache/felix/eventadmin/bridge/wireadmin/WireAdminEventToEventAdminBridge.java
rename to eventadmin/bridge.wireadmin/src/main/java/org/apache/felix/eventadmin/bridge/wireadmin/WireAdminEventToEventAdminBridge.java
diff --git a/eventadmin.bridge.wireadmin/src/main/resources/LICENSE b/eventadmin/bridge.wireadmin/src/main/resources/LICENSE
similarity index 100%
rename from eventadmin.bridge.wireadmin/src/main/resources/LICENSE
rename to eventadmin/bridge.wireadmin/src/main/resources/LICENSE
diff --git a/eventadmin.bridge.wireadmin/src/main/resources/NOTICE b/eventadmin/bridge.wireadmin/src/main/resources/NOTICE
similarity index 100%
rename from eventadmin.bridge.wireadmin/src/main/resources/NOTICE
rename to eventadmin/bridge.wireadmin/src/main/resources/NOTICE
diff --git a/eventadmin/pom.xml b/eventadmin/impl/pom.xml
similarity index 100%
rename from eventadmin/pom.xml
rename to eventadmin/impl/pom.xml
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Activator.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Activator.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Activator.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Activator.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/EventAdminImpl.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/EventAdminImpl.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/EventAdminImpl.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/EventAdminImpl.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/FrameworkEventAdapter.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/adapter/FrameworkEventAdapter.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/FrameworkEventAdapter.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/adapter/FrameworkEventAdapter.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/LogEventAdapter.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/adapter/LogEventAdapter.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/LogEventAdapter.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/adapter/LogEventAdapter.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/ServiceEventAdapter.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/adapter/ServiceEventAdapter.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/ServiceEventAdapter.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/adapter/ServiceEventAdapter.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/CacheThreadPool.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/CacheThreadPool.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/CacheThreadPool.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/CacheThreadPool.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/DelayScheduler.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/DelayScheduler.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/DelayScheduler.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/DelayScheduler.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/Scheduler.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/Scheduler.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/Scheduler.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/Scheduler.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskHandler.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskHandler.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskHandler.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskHandler.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskProducer.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskProducer.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskProducer.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskProducer.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskQueue.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskQueue.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskQueue.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/TaskQueue.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/ThreadPool.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/ThreadPool.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/dispatch/ThreadPool.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/dispatch/ThreadPool.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/BlackList.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/handler/BlackList.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/BlackList.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/handler/BlackList.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/BlacklistingHandlerTasks.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/handler/BlacklistingHandlerTasks.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/BlacklistingHandlerTasks.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/handler/BlacklistingHandlerTasks.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/CacheFilters.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/handler/CacheFilters.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/CacheFilters.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/handler/CacheFilters.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/CacheTopicHandlerFilters.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/handler/CacheTopicHandlerFilters.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/CacheTopicHandlerFilters.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/handler/CacheTopicHandlerFilters.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/CleanBlackList.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/handler/CleanBlackList.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/CleanBlackList.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/handler/CleanBlackList.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/Filters.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/handler/Filters.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/Filters.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/handler/Filters.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/HandlerTasks.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/handler/HandlerTasks.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/HandlerTasks.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/handler/HandlerTasks.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/TopicHandlerFilters.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/handler/TopicHandlerFilters.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/TopicHandlerFilters.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/handler/TopicHandlerFilters.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/CacheTopicPermissions.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/security/CacheTopicPermissions.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/CacheTopicPermissions.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/security/CacheTopicPermissions.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/EventAdminSecurityDecorator.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/security/EventAdminSecurityDecorator.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/EventAdminSecurityDecorator.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/security/EventAdminSecurityDecorator.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/SecureEventAdminFactory.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/security/SecureEventAdminFactory.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/SecureEventAdminFactory.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/security/SecureEventAdminFactory.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/TopicPermissions.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/security/TopicPermissions.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/security/TopicPermissions.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/security/TopicPermissions.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/AsyncDeliverTasks.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/AsyncDeliverTasks.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/AsyncDeliverTasks.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/AsyncDeliverTasks.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/BlockTask.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/BlockTask.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/BlockTask.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/BlockTask.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/DeliverTask.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/DeliverTask.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/DeliverTask.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/DeliverTask.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/DeliverTasks.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/DeliverTasks.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/DeliverTasks.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/DeliverTasks.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/DispatchTask.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/DispatchTask.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/DispatchTask.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/DispatchTask.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTask.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTask.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTask.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTask.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTaskImpl.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTaskImpl.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTaskImpl.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTaskImpl.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandoverTask.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandoverTask.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandoverTask.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandoverTask.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/ResumeTask.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/ResumeTask.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/ResumeTask.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/ResumeTask.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/SyncDeliverTasks.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/SyncDeliverTasks.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/tasks/SyncDeliverTasks.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/SyncDeliverTasks.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/util/CacheMap.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/util/CacheMap.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/util/CacheMap.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/util/CacheMap.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/util/LeastRecentlyUsedCacheMap.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/util/LeastRecentlyUsedCacheMap.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/util/LeastRecentlyUsedCacheMap.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/util/LeastRecentlyUsedCacheMap.java
diff --git a/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/util/LogWrapper.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/util/LogWrapper.java
similarity index 100%
rename from eventadmin/src/main/java/org/apache/felix/eventadmin/impl/util/LogWrapper.java
rename to eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/util/LogWrapper.java
diff --git a/eventadmin/src/main/resources/LICENSE b/eventadmin/impl/src/main/resources/LICENSE
similarity index 100%
rename from eventadmin/src/main/resources/LICENSE
rename to eventadmin/impl/src/main/resources/LICENSE
diff --git a/eventadmin/src/main/resources/NOTICE b/eventadmin/impl/src/main/resources/NOTICE
similarity index 100%
rename from eventadmin/src/main/resources/NOTICE
rename to eventadmin/impl/src/main/resources/NOTICE
diff --git a/pom.xml b/pom.xml
index e68dee4..9a0d610 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,11 +133,12 @@
         <module>shell.tui</module>
         <module>bundlerepository</module>
         <module>log</module>
-        <module>eventadmin</module>
+<!--        <module>eventadmin</module>
         <module>eventadmin.bridge.upnp</module>
         <module>eventadmin.bridge.configuration</module>
         <module>eventadmin.bridge.useradmin</module>
         <module>eventadmin.bridge.wireadmin</module>
+-->
         <module>http.jetty</module>
         <module>scr</module>
         <module>configadmin</module>