diff --git a/core/src/it/java/org/seedstack/audit/internal/AuditedAnnotationIT.java b/core/src/it/java/org/seedstack/audit/internal/AuditedAnnotationIT.java
index 4c30e8c..daf0a40 100644
--- a/core/src/it/java/org/seedstack/audit/internal/AuditedAnnotationIT.java
+++ b/core/src/it/java/org/seedstack/audit/internal/AuditedAnnotationIT.java
@@ -12,11 +12,11 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.seedstack.audit.api.Audited;
+import org.seedstack.audit.Audited;
 import org.seedstack.seed.it.SeedITRunner;
-import org.seedstack.seed.it.api.ITBind;
-import org.seedstack.seed.security.api.WithUser;
-import org.seedstack.seed.security.api.exceptions.AuthorizationException;
+import org.seedstack.seed.it.ITBind;
+import org.seedstack.seed.security.WithUser;
+import org.seedstack.seed.security.AuthorizationException;
 
 import javax.inject.Inject;
 
diff --git a/core/src/it/java/org/seedstack/audit/internal/ConsoleTrailWriter.java b/core/src/it/java/org/seedstack/audit/internal/ConsoleTrailWriter.java
index c1da752..88e11f6 100644
--- a/core/src/it/java/org/seedstack/audit/internal/ConsoleTrailWriter.java
+++ b/core/src/it/java/org/seedstack/audit/internal/ConsoleTrailWriter.java
@@ -10,10 +10,10 @@
  */
 package org.seedstack.audit.internal;
 
-import org.seedstack.audit.api.AuditEvent;
+import org.seedstack.audit.AuditEvent;
 import org.seedstack.audit.spi.TrailWriter;
-import org.seedstack.seed.el.api.ELContextBuilder;
-import org.seedstack.seed.el.api.ELService;
+import org.seedstack.seed.el.ELContextBuilder;
+import org.seedstack.seed.el.ELService;
 
 import javax.el.ELContext;
 import javax.inject.Inject;
diff --git a/core/src/main/java/org/seedstack/audit/internal/AuditConfigurer.java b/core/src/main/java/org/seedstack/audit/internal/AuditConfigurer.java
index 6897f69..685cfc9 100644
--- a/core/src/main/java/org/seedstack/audit/internal/AuditConfigurer.java
+++ b/core/src/main/java/org/seedstack/audit/internal/AuditConfigurer.java
@@ -9,7 +9,7 @@
 
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.lang.ArrayUtils;
-import org.seedstack.audit.api.TrailExceptionHandler;
+import org.seedstack.audit.TrailExceptionHandler;
 import org.seedstack.audit.spi.TrailWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/org/seedstack/audit/internal/AuditContext.java b/core/src/main/java/org/seedstack/audit/internal/AuditContext.java
index 5d2682e..1a0fcd7 100644
--- a/core/src/main/java/org/seedstack/audit/internal/AuditContext.java
+++ b/core/src/main/java/org/seedstack/audit/internal/AuditContext.java
@@ -10,7 +10,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.seedstack.audit.api.Trail;
+import org.seedstack.audit.Trail;
 
 /**
  * Local thread context for audit interceptor
diff --git a/core/src/main/java/org/seedstack/audit/internal/AuditModule.java b/core/src/main/java/org/seedstack/audit/internal/AuditModule.java
index 82f8f2f..2bbda6b 100644
--- a/core/src/main/java/org/seedstack/audit/internal/AuditModule.java
+++ b/core/src/main/java/org/seedstack/audit/internal/AuditModule.java
@@ -15,9 +15,9 @@
 import com.google.inject.spi.InjectionListener;
 import com.google.inject.spi.TypeEncounter;
 import com.google.inject.spi.TypeListener;
-import org.seedstack.audit.api.AuditService;
-import org.seedstack.audit.api.Audited;
-import org.seedstack.audit.api.TrailExceptionHandler;
+import org.seedstack.audit.AuditService;
+import org.seedstack.audit.Audited;
+import org.seedstack.audit.TrailExceptionHandler;
 import org.seedstack.audit.spi.TrailWriter;
 
 import java.util.Set;
diff --git a/core/src/main/java/org/seedstack/audit/internal/AuditPlugin.java b/core/src/main/java/org/seedstack/audit/internal/AuditPlugin.java
index d6d44e1..a876ba4 100644
--- a/core/src/main/java/org/seedstack/audit/internal/AuditPlugin.java
+++ b/core/src/main/java/org/seedstack/audit/internal/AuditPlugin.java
@@ -13,7 +13,7 @@
 import io.nuun.kernel.api.plugin.request.ClasspathScanRequest;
 import io.nuun.kernel.core.AbstractPlugin;
 import org.apache.commons.configuration.Configuration;
-import org.seedstack.audit.api.TrailExceptionHandler;
+import org.seedstack.audit.TrailExceptionHandler;
 import org.seedstack.audit.spi.TrailWriter;
 import org.seedstack.seed.core.internal.application.ApplicationPlugin;
 
diff --git a/core/src/main/java/org/seedstack/audit/internal/AuditedInterceptor.java b/core/src/main/java/org/seedstack/audit/internal/AuditedInterceptor.java
index 8c0fba6..48a3ddb 100644
--- a/core/src/main/java/org/seedstack/audit/internal/AuditedInterceptor.java
+++ b/core/src/main/java/org/seedstack/audit/internal/AuditedInterceptor.java
@@ -16,13 +16,13 @@
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.apache.commons.lang.StringUtils;
-import org.seedstack.audit.api.AuditService;
-import org.seedstack.audit.api.Trail;
-import org.seedstack.audit.api.TrailExceptionHandler;
-import org.seedstack.audit.api.Audited;
-import org.seedstack.seed.el.api.ELContextBuilder;
-import org.seedstack.seed.el.api.ELContextBuilder.ELPropertyProvider;
-import org.seedstack.seed.el.api.ELService;
+import org.seedstack.audit.AuditService;
+import org.seedstack.audit.Trail;
+import org.seedstack.audit.TrailExceptionHandler;
+import org.seedstack.audit.Audited;
+import org.seedstack.seed.el.ELContextBuilder;
+import org.seedstack.seed.el.ELContextBuilder.ELPropertyProvider;
+import org.seedstack.seed.el.ELService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/core/src/main/java/org/seedstack/audit/internal/DefaultAuditService.java b/core/src/main/java/org/seedstack/audit/internal/DefaultAuditService.java
index c28d30e..be6f63d 100644
--- a/core/src/main/java/org/seedstack/audit/internal/DefaultAuditService.java
+++ b/core/src/main/java/org/seedstack/audit/internal/DefaultAuditService.java
@@ -7,12 +7,12 @@
  */
 package org.seedstack.audit.internal;
 
-import org.seedstack.audit.api.*;
+import org.seedstack.audit.*;
 import org.seedstack.audit.spi.TrailWriter;
-import org.seedstack.seed.core.api.Application;
-import org.seedstack.seed.security.api.SecuritySupport;
-import org.seedstack.seed.security.api.principals.Principals;
-import org.seedstack.seed.security.api.principals.SimplePrincipalProvider;
+import org.seedstack.seed.Application;
+import org.seedstack.seed.security.SecuritySupport;
+import org.seedstack.seed.security.principals.Principals;
+import org.seedstack.seed.security.principals.SimplePrincipalProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/core/src/main/java/org/seedstack/audit/internal/SecurityTrailExceptionHandler.java b/core/src/main/java/org/seedstack/audit/internal/SecurityTrailExceptionHandler.java
index da0097e..2fe14a1 100644
--- a/core/src/main/java/org/seedstack/audit/internal/SecurityTrailExceptionHandler.java
+++ b/core/src/main/java/org/seedstack/audit/internal/SecurityTrailExceptionHandler.java
@@ -7,8 +7,8 @@
  */
 package org.seedstack.audit.internal;
 
-import org.seedstack.audit.api.TrailExceptionHandler;
-import org.seedstack.seed.security.api.exceptions.AuthorizationException;
+import org.seedstack.audit.TrailExceptionHandler;
+import org.seedstack.seed.security.AuthorizationException;
 
 /**
  * The implementation of trail exception handler for the security.
diff --git a/core/src/test/java/org/seedstack/audit/api/HostTest.java b/core/src/test/java/org/seedstack/audit/api/HostTest.java
deleted file mode 100644
index e574809..0000000
--- a/core/src/test/java/org/seedstack/audit/api/HostTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-/*
- * Creation : 23 juil. 2014
- */
-package org.seedstack.audit.api;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.Test;
-import org.seedstack.audit.api.Host;
-
-public class HostTest {
-
-    @Test
-    public void hostTest_unknownHost() {
-        final String id = "id";
-        final String name = "name";
-        Host host = new Host(id, name, "dummy");
-        assertThat(host.getId()).isEqualTo(id);
-        assertThat(host.getName()).isEqualTo(name);
-        assertThat(host.getAddress()).isNull();
-    }
-
-    @Test
-    public void hostTest_knownHost() {
-        final String id = "id";
-        final String name = "name";
-        Host host = new Host(id, name, "localhost");
-        assertThat(host.getId()).isEqualTo(id);
-        assertThat(host.getName()).isEqualTo(name);
-        assertThat(host.getAddress()).isNotNull();
-    }
-
-    @Test
-    public void hostTest_localhost() {
-        final String id = "id";
-        final String name = "name";
-        Host host = new Host(id, name);
-        assertThat(host.getId()).isEqualTo(id);
-        assertThat(host.getName()).isEqualTo(name);
-        assertThat(host.getAddress()).isNotNull();
-    }
-}
diff --git a/core/src/test/java/org/seedstack/audit/api/TrailTest.java b/core/src/test/java/org/seedstack/audit/api/TrailTest.java
deleted file mode 100644
index 891eb46..0000000
--- a/core/src/test/java/org/seedstack/audit/api/TrailTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-/*
- * Creation : 23 juil. 2014
- */
-package org.seedstack.audit.api;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-import org.junit.Test;
-import org.seedstack.audit.api.Host;
-import org.seedstack.audit.api.Initiator;
-import org.seedstack.audit.api.Trail;
-
-public class TrailTest {
-
-    @Test
-    public void testTrail() {
-        final long id = 36;
-        Initiator initiator = mock(Initiator.class);
-        Host host = mock(Host.class);
-        Trail trail = new Trail(id, initiator, host);
-        assertThat(trail.getId()).isEqualTo(id);
-        assertThat(trail.getInitiator()).isEqualTo(initiator);
-        assertThat(trail.getHost()).isEqualTo(host);
-
-        assertThat(trail.equals(trail)).isTrue();
-        assertThat(trail.equals(null)).isFalse();
-
-        Trail trail2 = new Trail(id, null, null);
-        assertThat(trail).isEqualTo(trail2);
-        assertThat(trail.hashCode()).isEqualTo(trail2.hashCode());
-
-        Trail trail3 = new Trail(12, null, null);
-        assertThat(trail).isNotEqualTo(trail3);
-
-        assertThat(trail.equals(new Object())).isFalse();
-    }
-}
diff --git a/core/src/test/java/org/seedstack/audit/internal/AuditConfigurerTest.java b/core/src/test/java/org/seedstack/audit/internal/AuditConfigurerTest.java
index 5dcb9db..473dc35 100644
--- a/core/src/test/java/org/seedstack/audit/internal/AuditConfigurerTest.java
+++ b/core/src/test/java/org/seedstack/audit/internal/AuditConfigurerTest.java
@@ -23,10 +23,8 @@
 import org.apache.commons.configuration.Configuration;
 import org.junit.Before;
 import org.junit.Test;
-import org.seedstack.audit.api.AuditEvent;
-import org.seedstack.audit.api.TrailExceptionHandler;
-import org.seedstack.audit.internal.AuditConfigurer;
-import org.seedstack.audit.internal.SecurityTrailExceptionHandler;
+import org.seedstack.audit.AuditEvent;
+import org.seedstack.audit.TrailExceptionHandler;
 import org.seedstack.audit.spi.TrailWriter;
 
 public class AuditConfigurerTest {
diff --git a/core/src/test/java/org/seedstack/audit/internal/AuditContextTest.java b/core/src/test/java/org/seedstack/audit/internal/AuditContextTest.java
index e109268..7313081 100644
--- a/core/src/test/java/org/seedstack/audit/internal/AuditContextTest.java
+++ b/core/src/test/java/org/seedstack/audit/internal/AuditContextTest.java
@@ -14,8 +14,7 @@
 import static org.mockito.Mockito.mock;
 
 import org.junit.Test;
-import org.seedstack.audit.api.Trail;
-import org.seedstack.audit.internal.AuditContext;
+import org.seedstack.audit.Trail;
 
 public class AuditContextTest {
 
diff --git a/core/src/test/java/org/seedstack/audit/internal/AuditModuleTest.java b/core/src/test/java/org/seedstack/audit/internal/AuditModuleTest.java
index 9a71215..ec59a85 100644
--- a/core/src/test/java/org/seedstack/audit/internal/AuditModuleTest.java
+++ b/core/src/test/java/org/seedstack/audit/internal/AuditModuleTest.java
@@ -20,11 +20,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.internal.util.reflection.Whitebox;
-import org.seedstack.audit.api.AuditEvent;
-import org.seedstack.audit.api.TrailExceptionHandler;
-import org.seedstack.audit.internal.AuditConfigurer;
-import org.seedstack.audit.internal.AuditModule;
-import org.seedstack.audit.internal.SecurityTrailExceptionHandler;
+import org.seedstack.audit.AuditEvent;
+import org.seedstack.audit.TrailExceptionHandler;
 import org.seedstack.audit.spi.TrailWriter;
 
 import com.google.inject.Binder;
diff --git a/core/src/test/java/org/seedstack/audit/internal/AuditedInterceptorTest.java b/core/src/test/java/org/seedstack/audit/internal/AuditedInterceptorTest.java
index d42a9b6..f45b11f 100644
--- a/core/src/test/java/org/seedstack/audit/internal/AuditedInterceptorTest.java
+++ b/core/src/test/java/org/seedstack/audit/internal/AuditedInterceptorTest.java
@@ -23,13 +23,12 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.internal.util.reflection.Whitebox;
-import org.seedstack.audit.api.AuditService;
-import org.seedstack.audit.api.TrailExceptionHandler;
-import org.seedstack.audit.api.Audited;
-import org.seedstack.audit.internal.AuditedInterceptor;
-import org.seedstack.seed.el.api.ELContextBuilder;
-import org.seedstack.seed.el.api.ELContextBuilder.ELPropertyProvider;
-import org.seedstack.seed.el.api.ELService;
+import org.seedstack.audit.AuditService;
+import org.seedstack.audit.TrailExceptionHandler;
+import org.seedstack.audit.Audited;
+import org.seedstack.seed.el.ELContextBuilder;
+import org.seedstack.seed.el.ELContextBuilder.ELPropertyProvider;
+import org.seedstack.seed.el.ELService;
 
 public class AuditedInterceptorTest {
 
diff --git a/core/src/test/java/org/seedstack/audit/internal/DefaultAuditServiceTest.java b/core/src/test/java/org/seedstack/audit/internal/DefaultAuditServiceTest.java
index 7c1d172..89c120c 100644
--- a/core/src/test/java/org/seedstack/audit/internal/DefaultAuditServiceTest.java
+++ b/core/src/test/java/org/seedstack/audit/internal/DefaultAuditServiceTest.java
@@ -22,14 +22,13 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.internal.util.reflection.Whitebox;
-import org.seedstack.audit.api.AuditEvent;
-import org.seedstack.audit.api.Host;
-import org.seedstack.audit.api.Trail;
-import org.seedstack.audit.internal.DefaultAuditService;
+import org.seedstack.audit.AuditEvent;
+import org.seedstack.audit.Host;
+import org.seedstack.audit.Trail;
 import org.seedstack.audit.spi.TrailWriter;
-import org.seedstack.seed.core.api.Application;
-import org.seedstack.seed.security.api.SecuritySupport;
-import org.seedstack.seed.security.api.principals.Principals;
+import org.seedstack.seed.Application;
+import org.seedstack.seed.security.SecuritySupport;
+import org.seedstack.seed.security.principals.Principals;
 
 public class DefaultAuditServiceTest {
 
diff --git a/logback/src/it/java/org/seedstack/business/audit/IntegrationTest.java b/logback/src/it/java/org/seedstack/business/audit/IntegrationTest.java
index 61151aa..1dacb6e 100644
--- a/logback/src/it/java/org/seedstack/business/audit/IntegrationTest.java
+++ b/logback/src/it/java/org/seedstack/business/audit/IntegrationTest.java
@@ -14,10 +14,10 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.seedstack.audit.api.Audited;
+import org.seedstack.audit.Audited;
 import org.seedstack.seed.it.SeedITRunner;
-import org.seedstack.seed.it.api.ITBind;
-import org.seedstack.seed.security.api.WithUser;
+import org.seedstack.seed.it.ITBind;
+import org.seedstack.seed.security.WithUser;
 
 @RunWith(SeedITRunner.class)
 public class IntegrationTest {
diff --git a/logback/src/it/resources/logback-test.xml b/logback/src/it/resources/logback-test.xml
index 416d1b2..54ee140 100644
--- a/logback/src/it/resources/logback-test.xml
+++ b/logback/src/it/resources/logback-test.xml
@@ -16,7 +16,7 @@
     </appender>
     <appender name="AUDIT_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.seedstack.audit.infrastructure.logback.AuditLogbackLayout" />
+            <layout class="org.seedstack.audit.logback.AuditLogbackLayout" />
         </encoder>
     </appender>
 
diff --git a/logback/src/main/java/org/seedstack/audit/infrastructure/logback/AuditLogbackLayout.java b/logback/src/main/java/org/seedstack/audit/logback/AuditLogbackLayout.java
similarity index 85%
rename from logback/src/main/java/org/seedstack/audit/infrastructure/logback/AuditLogbackLayout.java
rename to logback/src/main/java/org/seedstack/audit/logback/AuditLogbackLayout.java
index 0b035ee..e35eb0c 100644
--- a/logback/src/main/java/org/seedstack/audit/infrastructure/logback/AuditLogbackLayout.java
+++ b/logback/src/main/java/org/seedstack/audit/logback/AuditLogbackLayout.java
@@ -5,15 +5,15 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.audit.infrastructure.logback;
+package org.seedstack.audit.logback;
 
 import javax.el.ELContext;
 import javax.inject.Inject;
 
-import org.seedstack.audit.api.AuditEvent;
-import org.seedstack.seed.core.api.Configuration;
-import org.seedstack.seed.el.api.ELContextBuilder;
-import org.seedstack.seed.el.api.ELService;
+import org.seedstack.audit.AuditEvent;
+import org.seedstack.seed.Configuration;
+import org.seedstack.seed.el.ELContextBuilder;
+import org.seedstack.seed.el.ELService;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.CoreConstants;
diff --git a/logback/src/main/java/org/seedstack/audit/infrastructure/logback/LogbackTrailWriter.java b/logback/src/main/java/org/seedstack/audit/logback/LogbackTrailWriter.java
similarity index 87%
rename from logback/src/main/java/org/seedstack/audit/infrastructure/logback/LogbackTrailWriter.java
rename to logback/src/main/java/org/seedstack/audit/logback/LogbackTrailWriter.java
index 3922586..64ea64d 100644
--- a/logback/src/main/java/org/seedstack/audit/infrastructure/logback/LogbackTrailWriter.java
+++ b/logback/src/main/java/org/seedstack/audit/logback/LogbackTrailWriter.java
@@ -5,9 +5,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.audit.infrastructure.logback;
+package org.seedstack.audit.logback;
 
-import org.seedstack.audit.api.AuditEvent;
+import org.seedstack.audit.AuditEvent;
 import org.seedstack.audit.spi.TrailWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/logback/src/main/java/org/seedstack/audit/internal/logback/AuditLogbackModule.java b/logback/src/main/java/org/seedstack/audit/logback/internal/AuditLogbackModule.java
similarity index 95%
rename from logback/src/main/java/org/seedstack/audit/internal/logback/AuditLogbackModule.java
rename to logback/src/main/java/org/seedstack/audit/logback/internal/AuditLogbackModule.java
index 1d517f1..4a75a94 100644
--- a/logback/src/main/java/org/seedstack/audit/internal/logback/AuditLogbackModule.java
+++ b/logback/src/main/java/org/seedstack/audit/logback/internal/AuditLogbackModule.java
@@ -5,9 +5,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.audit.internal.logback;
+package org.seedstack.audit.logback.internal;
 
-import org.seedstack.audit.infrastructure.logback.AuditLogbackLayout;
+import org.seedstack.audit.logback.AuditLogbackLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/logback/src/main/java/org/seedstack/audit/internal/logback/AuditLogbackPlugin.java b/logback/src/main/java/org/seedstack/audit/logback/internal/AuditLogbackPlugin.java
similarity index 93%
rename from logback/src/main/java/org/seedstack/audit/internal/logback/AuditLogbackPlugin.java
rename to logback/src/main/java/org/seedstack/audit/logback/internal/AuditLogbackPlugin.java
index 914eb95..57cef6b 100644
--- a/logback/src/main/java/org/seedstack/audit/internal/logback/AuditLogbackPlugin.java
+++ b/logback/src/main/java/org/seedstack/audit/logback/internal/AuditLogbackPlugin.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.audit.internal.logback;
+package org.seedstack.audit.logback.internal;
 
 
 import io.nuun.kernel.core.AbstractPlugin;
diff --git a/specs/src/main/java/org/seedstack/audit/api/package-info.java b/logback/src/main/java/org/seedstack/audit/logback/package-info.java
similarity index 76%
rename from specs/src/main/java/org/seedstack/audit/api/package-info.java
rename to logback/src/main/java/org/seedstack/audit/logback/package-info.java
index ec22ea7..2604dc1 100644
--- a/specs/src/main/java/org/seedstack/audit/api/package-info.java
+++ b/logback/src/main/java/org/seedstack/audit/logback/package-info.java
@@ -5,9 +5,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
+
 /**
- * Provides classes for auditing the functional behavior of an application.
+ * Provides a audit implementation with logback.
  *
  * @author pierre.thirouin@ext.mpsa.com (Pierre Thirouin)
  */
-package org.seedstack.audit.api;
\ No newline at end of file
+package org.seedstack.audit.logback;
\ No newline at end of file
diff --git a/logback/src/main/resources/META-INF/services/io.nuun.kernel.api.Plugin b/logback/src/main/resources/META-INF/services/io.nuun.kernel.api.Plugin
index fa97a2d..1e8bb9c 100644
--- a/logback/src/main/resources/META-INF/services/io.nuun.kernel.api.Plugin
+++ b/logback/src/main/resources/META-INF/services/io.nuun.kernel.api.Plugin
@@ -1 +1 @@
-org.seedstack.audit.internal.logback.AuditLogbackPlugin
\ No newline at end of file
+org.seedstack.audit.logback.internal.AuditLogbackPlugin
\ No newline at end of file
diff --git a/logback/src/test/java/org/seedstack/audit/infrastructure/logback/AuditLogbackLayoutTest.java b/logback/src/test/java/org/seedstack/audit/logback/AuditLogbackLayoutTest.java
similarity index 86%
rename from logback/src/test/java/org/seedstack/audit/infrastructure/logback/AuditLogbackLayoutTest.java
rename to logback/src/test/java/org/seedstack/audit/logback/AuditLogbackLayoutTest.java
index 52a7c42..9bfa1bd 100644
--- a/logback/src/test/java/org/seedstack/audit/infrastructure/logback/AuditLogbackLayoutTest.java
+++ b/logback/src/test/java/org/seedstack/audit/logback/AuditLogbackLayoutTest.java
@@ -8,7 +8,7 @@
 /*
  * Creation : 23 juil. 2014
  */
-package org.seedstack.audit.infrastructure.logback;
+package org.seedstack.audit.logback;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.RETURNS_MOCKS;
@@ -18,10 +18,10 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.internal.util.reflection.Whitebox;
-import org.seedstack.audit.api.AuditEvent;
-import org.seedstack.audit.infrastructure.logback.AuditLogbackLayout;
-import org.seedstack.seed.el.api.ELContextBuilder;
-import org.seedstack.seed.el.api.ELService;
+import org.seedstack.audit.AuditEvent;
+import org.seedstack.audit.logback.AuditLogbackLayout;
+import org.seedstack.seed.el.ELContextBuilder;
+import org.seedstack.seed.el.ELService;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
 
diff --git a/logback/src/test/java/org/seedstack/audit/infrastructure/logback/LogbackTrailWriterTest.java b/logback/src/test/java/org/seedstack/audit/logback/LogbackTrailWriterTest.java
similarity index 78%
rename from logback/src/test/java/org/seedstack/audit/infrastructure/logback/LogbackTrailWriterTest.java
rename to logback/src/test/java/org/seedstack/audit/logback/LogbackTrailWriterTest.java
index 84acbe5..a8755f2 100644
--- a/logback/src/test/java/org/seedstack/audit/infrastructure/logback/LogbackTrailWriterTest.java
+++ b/logback/src/test/java/org/seedstack/audit/logback/LogbackTrailWriterTest.java
@@ -8,13 +8,13 @@
 /*
  * Creation : 23 juil. 2014
  */
-package org.seedstack.audit.infrastructure.logback;
+package org.seedstack.audit.logback;
 
 import static org.mockito.Mockito.mock;
 
 import org.junit.Test;
-import org.seedstack.audit.api.AuditEvent;
-import org.seedstack.audit.infrastructure.logback.LogbackTrailWriter;
+import org.seedstack.audit.AuditEvent;
+import org.seedstack.audit.logback.LogbackTrailWriter;
 
 public class LogbackTrailWriterTest {
 
diff --git a/pom.xml b/pom.xml
index a898b41..c256a07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,8 +24,7 @@
     <properties>
         <seed.version>2.1.0-M1-SNAPSHOT</seed.version>
 
-        <compatibility.groupId>org.seedstack.functions.audit</compatibility.groupId>
-        <compatibility.version>2.0.0</compatibility.version>
+        <compatibility.skip>true</compatibility.skip>
     </properties>
 
     <modules>
diff --git a/specs/pom.xml b/specs/pom.xml
index 86c85f5..16a115a 100644
--- a/specs/pom.xml
+++ b/specs/pom.xml
@@ -25,10 +25,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
-            <scope>provided</scope>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.seedstack.seed</groupId>
+            <artifactId>seed-testing</artifactId>
+            <version>${seed.version}</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/specs/src/main/java/org/seedstack/audit/api/Address.java b/specs/src/main/java/org/seedstack/audit/Address.java
similarity index 97%
rename from specs/src/main/java/org/seedstack/audit/api/Address.java
rename to specs/src/main/java/org/seedstack/audit/Address.java
index b8619bf..5dfa810 100644
--- a/specs/src/main/java/org/seedstack/audit/api/Address.java
+++ b/specs/src/main/java/org/seedstack/audit/Address.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.audit.api;
+package org.seedstack.audit;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/specs/src/main/java/org/seedstack/audit/api/AuditEvent.java b/specs/src/main/java/org/seedstack/audit/AuditEvent.java
similarity index 97%
rename from specs/src/main/java/org/seedstack/audit/api/AuditEvent.java
rename to specs/src/main/java/org/seedstack/audit/AuditEvent.java
index 750e2a2..c5c2ce5 100644
--- a/specs/src/main/java/org/seedstack/audit/api/AuditEvent.java
+++ b/specs/src/main/java/org/seedstack/audit/AuditEvent.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.audit.api;
+package org.seedstack.audit;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/specs/src/main/java/org/seedstack/audit/api/AuditService.java b/specs/src/main/java/org/seedstack/audit/AuditService.java
similarity index 95%
rename from specs/src/main/java/org/seedstack/audit/api/AuditService.java
rename to specs/src/main/java/org/seedstack/audit/AuditService.java
index f63207b..03d25cd 100644
--- a/specs/src/main/java/org/seedstack/audit/api/AuditService.java
+++ b/specs/src/main/java/org/seedstack/audit/AuditService.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.audit.api;
+package org.seedstack.audit;
 
 
 /**
diff --git a/specs/src/main/java/org/seedstack/audit/api/Audited.java b/specs/src/main/java/org/seedstack/audit/Audited.java
similarity index 97%
rename from specs/src/main/java/org/seedstack/audit/api/Audited.java
rename to specs/src/main/java/org/seedstack/audit/Audited.java
index bb12685..8f31f06 100644
--- a/specs/src/main/java/org/seedstack/audit/api/Audited.java
+++ b/specs/src/main/java/org/seedstack/audit/Audited.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.audit.api;
+package org.seedstack.audit;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/specs/src/main/java/org/seedstack/audit/api/Host.java b/specs/src/main/java/org/seedstack/audit/Host.java
similarity index 98%
rename from specs/src/main/java/org/seedstack/audit/api/Host.java
rename to specs/src/main/java/org/seedstack/audit/Host.java
index 11e7747..992d684 100644
--- a/specs/src/main/java/org/seedstack/audit/api/Host.java
+++ b/specs/src/main/java/org/seedstack/audit/Host.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.audit.api;
+package org.seedstack.audit;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/specs/src/main/java/org/seedstack/audit/api/Initiator.java b/specs/src/main/java/org/seedstack/audit/Initiator.java
similarity index 97%
rename from specs/src/main/java/org/seedstack/audit/api/Initiator.java
rename to specs/src/main/java/org/seedstack/audit/Initiator.java
index 02654ed..94face6 100644
--- a/specs/src/main/java/org/seedstack/audit/api/Initiator.java
+++ b/specs/src/main/java/org/seedstack/audit/Initiator.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.audit.api;
+package org.seedstack.audit;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/specs/src/main/java/org/seedstack/audit/api/Trail.java b/specs/src/main/java/org/seedstack/audit/Trail.java
similarity index 97%
rename from specs/src/main/java/org/seedstack/audit/api/Trail.java
rename to specs/src/main/java/org/seedstack/audit/Trail.java
index b2bb65a..67c8782 100644
--- a/specs/src/main/java/org/seedstack/audit/api/Trail.java
+++ b/specs/src/main/java/org/seedstack/audit/Trail.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.audit.api;
+package org.seedstack.audit;
 
 /**
  * A Trail regroups several events for one user action.
diff --git a/specs/src/main/java/org/seedstack/audit/api/TrailExceptionHandler.java b/specs/src/main/java/org/seedstack/audit/TrailExceptionHandler.java
similarity index 95%
rename from specs/src/main/java/org/seedstack/audit/api/TrailExceptionHandler.java
rename to specs/src/main/java/org/seedstack/audit/TrailExceptionHandler.java
index 89d9655..8d0e404 100644
--- a/specs/src/main/java/org/seedstack/audit/api/TrailExceptionHandler.java
+++ b/specs/src/main/java/org/seedstack/audit/TrailExceptionHandler.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.audit.api;
+package org.seedstack.audit;
 
 /**
  * Allows to describe an event in case of a certain exception.
diff --git a/logback/src/main/java/org/seedstack/audit/infrastructure/logback/package-info.java b/specs/src/main/java/org/seedstack/audit/package-info.java
similarity index 76%
rename from logback/src/main/java/org/seedstack/audit/infrastructure/logback/package-info.java
rename to specs/src/main/java/org/seedstack/audit/package-info.java
index 023e061..8208c67 100644
--- a/logback/src/main/java/org/seedstack/audit/infrastructure/logback/package-info.java
+++ b/specs/src/main/java/org/seedstack/audit/package-info.java
@@ -6,8 +6,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 /**
- * Provides a Logback implementation of the audit feature.
+ * Provides classes for auditing applications functional behavior.
  *
  * @author pierre.thirouin@ext.mpsa.com (Pierre Thirouin)
  */
-package org.seedstack.audit.infrastructure.logback;
\ No newline at end of file
+package org.seedstack.audit;
\ No newline at end of file
diff --git a/specs/src/main/java/org/seedstack/audit/spi/TrailWriter.java b/specs/src/main/java/org/seedstack/audit/spi/TrailWriter.java
index 64b3b61..298f386 100644
--- a/specs/src/main/java/org/seedstack/audit/spi/TrailWriter.java
+++ b/specs/src/main/java/org/seedstack/audit/spi/TrailWriter.java
@@ -7,7 +7,7 @@
  */
 package org.seedstack.audit.spi;
 
-import org.seedstack.audit.api.AuditEvent;
+import org.seedstack.audit.AuditEvent;
 
 /**
  * Interface used to write an event in its final form (log, bdd...)
diff --git a/core/src/test/java/org/seedstack/audit/api/AddressTest.java b/specs/src/test/java/org/seedstack/audit/AddressTest.java
similarity index 73%
rename from core/src/test/java/org/seedstack/audit/api/AddressTest.java
rename to specs/src/test/java/org/seedstack/audit/AddressTest.java
index 9d0e5c4..b4178b4 100644
--- a/core/src/test/java/org/seedstack/audit/api/AddressTest.java
+++ b/specs/src/test/java/org/seedstack/audit/AddressTest.java
@@ -8,14 +8,13 @@
 /*
  * Creation : 22 juil. 2014
  */
-package org.seedstack.audit.api;
+package org.seedstack.audit;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.net.UnknownHostException;
 
+import org.assertj.core.api.Assertions;
 import org.junit.Test;
-import org.seedstack.audit.api.Address;
+
+import java.net.UnknownHostException;
 
 public class AddressTest {
 
@@ -27,7 +26,7 @@ public void testAddress_unknownHost() throws UnknownHostException {
     @Test
     public void testAddress_localhost() throws UnknownHostException {
         Address address = new Address("localhost");
-        assertThat(address.getIpAddress()).isEqualTo("127.0.0.1");
-        assertThat(address.getDnsName()).isEqualTo("localhost");
+        Assertions.assertThat(address.getIpAddress()).isEqualTo("127.0.0.1");
+        Assertions.assertThat(address.getDnsName()).isEqualTo("localhost");
     }
 }
diff --git a/core/src/test/java/org/seedstack/audit/api/AuditEventTest.java b/specs/src/test/java/org/seedstack/audit/AuditEventTest.java
similarity index 52%
rename from core/src/test/java/org/seedstack/audit/api/AuditEventTest.java
rename to specs/src/test/java/org/seedstack/audit/AuditEventTest.java
index de3d7ae..ddc4b21 100644
--- a/core/src/test/java/org/seedstack/audit/api/AuditEventTest.java
+++ b/specs/src/test/java/org/seedstack/audit/AuditEventTest.java
@@ -8,26 +8,23 @@
 /*
  * Creation : 23 juil. 2014
  */
-package org.seedstack.audit.api;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
+package org.seedstack.audit;
 
+import org.assertj.core.api.Assertions;
 import org.junit.Test;
-import org.seedstack.audit.api.AuditEvent;
-import org.seedstack.audit.api.Trail;
+import org.mockito.Mockito;
 
 public class AuditEventTest {
 
     @Test
     public void testAuditEvent() {
         final String message = "message";
-        Trail trail = mock(Trail.class);
+        Trail trail = Mockito.mock(Trail.class);
         AuditEvent underTest = new AuditEvent(message, trail);
-        assertThat(underTest.getMessage()).isEqualTo(message);
-        assertThat(underTest.getTrail()).isEqualTo(trail);
+        Assertions.assertThat(underTest.getMessage()).isEqualTo(message);
+        Assertions.assertThat(underTest.getTrail()).isEqualTo(trail);
 
-        assertThat(underTest.getDate()).isNotNull();
-        assertThat(underTest.getFormattedDate("y")).isNotNull();
+        Assertions.assertThat(underTest.getDate()).isNotNull();
+        Assertions.assertThat(underTest.getFormattedDate("y")).isNotNull();
     }
 }
diff --git a/specs/src/test/java/org/seedstack/audit/HostTest.java b/specs/src/test/java/org/seedstack/audit/HostTest.java
new file mode 100644
index 0000000..baf36a2
--- /dev/null
+++ b/specs/src/test/java/org/seedstack/audit/HostTest.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+/*
+ * Creation : 23 juil. 2014
+ */
+package org.seedstack.audit;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+public class HostTest {
+    final String id = "id";
+    final String name = "name";
+
+    @Test
+    public void hostTest_unknownHost() {
+        Host host = new Host(id, name, "dummy");
+
+        Assertions.assertThat(host.getId()).isEqualTo(id);
+        Assertions.assertThat(host.getName()).isEqualTo(name);
+        Assertions.assertThat(host.getAddress()).isNull();
+    }
+
+    @Test
+    public void hostTest_knownHost() {
+        Host host = new Host(id, name, "localhost");
+
+        assertHost(host);
+    }
+
+    @Test
+    public void hostTest_localhost() {
+        Host host = new Host(id, name);
+
+        assertHost(host);
+    }
+
+    private void assertHost(Host host) {
+        Assertions.assertThat(host.getId()).isEqualTo(id);
+        Assertions.assertThat(host.getName()).isEqualTo(name);
+        Assertions.assertThat(host.getAddress()).isNotNull();
+    }
+
+}
diff --git a/core/src/test/java/org/seedstack/audit/api/InitiatorTest.java b/specs/src/test/java/org/seedstack/audit/InitiatorTest.java
similarity index 64%
rename from core/src/test/java/org/seedstack/audit/api/InitiatorTest.java
rename to specs/src/test/java/org/seedstack/audit/InitiatorTest.java
index b7d8046..9a9d49f 100644
--- a/core/src/test/java/org/seedstack/audit/api/InitiatorTest.java
+++ b/specs/src/test/java/org/seedstack/audit/InitiatorTest.java
@@ -8,12 +8,10 @@
 /*
  * Creation : 23 juil. 2014
  */
-package org.seedstack.audit.api;
-
-import static org.assertj.core.api.Assertions.assertThat;
+package org.seedstack.audit;
 
+import org.assertj.core.api.Assertions;
 import org.junit.Test;
-import org.seedstack.audit.api.Initiator;
 
 public class InitiatorTest {
 
@@ -23,9 +21,9 @@ public void testInitiator_localhost() {
         final String name = "name";
         String ipAddress = "127.0.0.1";
         Initiator initiator = new Initiator(id, name, ipAddress);
-        assertThat(initiator.getId()).isEqualTo(id);
-        assertThat(initiator.getName()).isEqualTo(name);
-        assertThat(initiator.getAddress()).isNotNull();
+        Assertions.assertThat(initiator.getId()).isEqualTo(id);
+        Assertions.assertThat(initiator.getName()).isEqualTo(name);
+        Assertions.assertThat(initiator.getAddress()).isNotNull();
     }
 
     @Test
@@ -34,8 +32,8 @@ public void testInitiator_unknownHost() {
         final String name = "name";
         String ipAddress = "dummy";
         Initiator initiator = new Initiator(id, name, ipAddress);
-        assertThat(initiator.getId()).isEqualTo(id);
-        assertThat(initiator.getName()).isEqualTo(name);
-        assertThat(initiator.getAddress()).isNull();
+        Assertions.assertThat(initiator.getId()).isEqualTo(id);
+        Assertions.assertThat(initiator.getName()).isEqualTo(name);
+        Assertions.assertThat(initiator.getAddress()).isNull();
     }
 }
diff --git a/specs/src/test/java/org/seedstack/audit/TrailTest.java b/specs/src/test/java/org/seedstack/audit/TrailTest.java
new file mode 100644
index 0000000..98edb95
--- /dev/null
+++ b/specs/src/test/java/org/seedstack/audit/TrailTest.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2013-2015, The SeedStack authors <http://seedstack.org>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+/*
+ * Creation : 23 juil. 2014
+ */
+package org.seedstack.audit;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class TrailTest {
+
+    @Test
+    public void testTrail() {
+        final long id = 36;
+        Initiator initiator = Mockito.mock(Initiator.class);
+        Host host = Mockito.mock(Host.class);
+        Trail trail = new Trail(id, initiator, host);
+        Assertions.assertThat(trail.getId()).isEqualTo(id);
+        Assertions.assertThat(trail.getInitiator()).isEqualTo(initiator);
+        Assertions.assertThat(trail.getHost()).isEqualTo(host);
+
+        Assertions.assertThat(trail.equals(trail)).isTrue();
+        Assertions.assertThat(trail.equals(null)).isFalse();
+
+        Trail trail2 = new Trail(id, null, null);
+        Assertions.assertThat(trail).isEqualTo(trail2);
+        Assertions.assertThat(trail.hashCode()).isEqualTo(trail2.hashCode());
+
+        Trail trail3 = new Trail(12, null, null);
+        Assertions.assertThat(trail).isNotEqualTo(trail3);
+
+        Assertions.assertThat(trail.equals(new Object())).isFalse();
+    }
+}