diff --git a/audit-logback/src/it/resources/logback-test.xml b/audit-logback/src/it/resources/logback-test.xml
index d37c3790..e29f3fa2 100644
--- a/audit-logback/src/it/resources/logback-test.xml
+++ b/audit-logback/src/it/resources/logback-test.xml
@@ -26,7 +26,7 @@
-
+
\ No newline at end of file
diff --git a/audit/src/it/resources/logback-test.xml b/audit/src/it/resources/logback-test.xml
index 2c988d75..196adca6 100644
--- a/audit/src/it/resources/logback-test.xml
+++ b/audit/src/it/resources/logback-test.xml
@@ -21,7 +21,7 @@
-
+
\ No newline at end of file
diff --git a/audit/src/test/resources/logback-test.xml b/audit/src/test/resources/logback-test.xml
index 464cf602..7db11a54 100644
--- a/audit/src/test/resources/logback-test.xml
+++ b/audit/src/test/resources/logback-test.xml
@@ -16,7 +16,7 @@
%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-
+
\ No newline at end of file
diff --git a/core/src/it/resources/logback-test.xml b/core/src/it/resources/logback-test.xml
index b1217fe7..02e0cff9 100644
--- a/core/src/it/resources/logback-test.xml
+++ b/core/src/it/resources/logback-test.xml
@@ -20,7 +20,7 @@
-
+
\ No newline at end of file
diff --git a/core/src/main/java/org/seedstack/business/assertions/BusinessAssertions.java b/core/src/main/java/org/seedstack/business/assertions/BusinessAssertions.java
deleted file mode 100644
index a357e278..00000000
--- a/core/src/main/java/org/seedstack/business/assertions/BusinessAssertions.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright (c) 2013-2015 by The SeedStack authors. All rights reserved.
- *
- * This file is part of SeedStack, An enterprise-oriented full development stack.
- *
- * 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/.
- */
-package org.seedstack.business.assertions;
-
-/**
- * This class provides assertions for business core.
- *
- * @author epo.jemba@ext.mpsa.com
- */
-public final class BusinessAssertions {
-
- private BusinessAssertions() {
- }
-
- /**
- * @param actual class to check
- * @return the actual Assert
- */
- public static BusinessClassAssert assertThat(Class> actual) {
- return new BusinessClassAssert(actual);
- }
-}
diff --git a/core/src/main/java/org/seedstack/business/assertions/BusinessClassAssert.java b/core/src/main/java/org/seedstack/business/assertions/BusinessClassAssert.java
deleted file mode 100644
index 1fe66fee..00000000
--- a/core/src/main/java/org/seedstack/business/assertions/BusinessClassAssert.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * Copyright (c) 2013-2015 by The SeedStack authors. All rights reserved.
- *
- * This file is part of SeedStack, An enterprise-oriented full development stack.
- *
- * 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/.
- */
-package org.seedstack.business.assertions;
-
-import org.assertj.core.api.AssertionInfo;
-import org.assertj.core.internal.Objects;
-import org.seedstack.seed.core.assertions.CoreClassAssert;
-
-
-/**
- * This class provides business assertions.
- *
- * @author epo.jemba@ext.mpsa.com
- * @param parent class assert.
- */
-public class BusinessClassAssert> extends CoreClassAssert {
-
- /**
- * @param actual the class to test
- */
- public BusinessClassAssert(Class> actual) {
- super(actual,BusinessClassAssert.class);
- }
-
- /**
- * Checks if the class is a valid aggregate root.
- *
- * @return itself
- */
- public S isValidAggregateRootClass() {
- assertNotNull(info, actual);
-
- BusinessReflectionAsserts.assertAggregateRootClassIsValid(actual);
-
- return myself;
- }
-
- /**
- * Checks if the class is a valid value object.
- *
- * @return itself
- */
- public S isValidValueObjectClass() {
- assertNotNull(info, actual);
-
- BusinessReflectionAsserts.assertValueObjectClassIsValid(actual);
-
- return myself;
- }
-
- /**
- * Checks if the class is a valid entity.
- *
- * @return itself
- */
- public S isValidEntityClass() {
-
- assertNotNull(info, actual);
-
- BusinessReflectionAsserts.assertEntityClassIsValid(actual);
-
- return myself;
- }
-
- /**
- * Checks if the class is a valid repository.
- *
- * @return itself
- */
- public S isValidRepositoryInterfaceClass() {
- assertNotNull(info, actual);
-
- BusinessReflectionAsserts.assertRepositoryInterfaceClassIsValid(actual);
-
- return myself;
- }
-
- /**
- * Checks if the class is a valid factory interface.
- *
- * @return itself
- */
- public S isValidFactoryInterfaceClass() {
- assertNotNull(info, actual);
-
- BusinessReflectionAsserts.assertFactoryInterfaceClassIsValid(actual);
-
- return myself;
- }
-
- /**
- * Checks if the class is a valid domain service interface.
- *
- * @return itself
- */
- public S isValidDomainServiceInterfaceClass() {
-
- assertNotNull(info, actual);
-
- BusinessReflectionAsserts.assertDomainServiceInterfaceClassIsValid(actual);
-
- return myself;
- }
-
- /**
- * Checks if the class is a valid application service interface.
- *
- * @return itself
- */
- public S isValidApplicationServiceInterfaceClass() {
-
- assertNotNull(info, actual);
-
- BusinessReflectionAsserts.assertApplicationServiceInterfaceClassIsValid(actual);
-
- return myself;
- }
-
- private static void assertNotNull(AssertionInfo info, Class> actual) {
- Objects.instance().assertNotNull(info, actual);
- }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/seedstack/business/internal/BusinessCorePlugin.java b/core/src/main/java/org/seedstack/business/internal/BusinessCorePlugin.java
index d2f6429e..8bef61a0 100644
--- a/core/src/main/java/org/seedstack/business/internal/BusinessCorePlugin.java
+++ b/core/src/main/java/org/seedstack/business/internal/BusinessCorePlugin.java
@@ -26,7 +26,7 @@
import org.seedstack.business.api.domain.DomainObject;
import org.seedstack.business.api.domain.Factory;
import org.seedstack.business.api.domain.Repository;
-import org.seedstack.business.api.domain.meta.specifications.DomainSpecifications;
+import org.seedstack.business.api.specifications.DomainSpecifications;
import org.seedstack.business.api.interfaces.assembler.Assembler;
import org.seedstack.business.api.interfaces.assembler.DtoOf;
import org.seedstack.business.core.domain.FactoryInternal;
@@ -47,8 +47,8 @@
import java.lang.reflect.Type;
import java.util.*;
-import static org.seedstack.business.api.domain.meta.specifications.BaseClassSpecifications.classIsAbstract;
-import static org.seedstack.business.api.domain.meta.specifications.BaseClassSpecifications.classIsInterface;
+import static org.seedstack.business.api.specifications.BaseClassSpecifications.classIsAbstract;
+import static org.seedstack.business.api.specifications.BaseClassSpecifications.classIsInterface;
/**
* This plugin is a multi round plugin.
diff --git a/core/src/main/java/org/seedstack/business/internal/identity/IdentityPlugin.java b/core/src/main/java/org/seedstack/business/internal/identity/IdentityPlugin.java
index e95fd533..7c774884 100644
--- a/core/src/main/java/org/seedstack/business/internal/identity/IdentityPlugin.java
+++ b/core/src/main/java/org/seedstack/business/internal/identity/IdentityPlugin.java
@@ -18,7 +18,7 @@
import io.nuun.kernel.api.plugin.request.ClasspathScanRequest;
import io.nuun.kernel.core.AbstractPlugin;
import org.kametic.specifications.Specification;
-import org.seedstack.business.api.domain.meta.specifications.DomainSpecifications;
+import org.seedstack.business.api.specifications.DomainSpecifications;
import org.seedstack.seed.core.internal.application.ApplicationPlugin;
import java.util.ArrayList;
diff --git a/core/src/test/java/org/seedstack/business/internal/BusinessCorePluginTest.java b/core/src/test/java/org/seedstack/business/internal/BusinessCorePluginTest.java
index 7657b14f..c0c016e7 100644
--- a/core/src/test/java/org/seedstack/business/internal/BusinessCorePluginTest.java
+++ b/core/src/test/java/org/seedstack/business/internal/BusinessCorePluginTest.java
@@ -14,7 +14,7 @@
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import org.seedstack.business.api.domain.meta.specifications.DomainSpecifications;
+import org.seedstack.business.api.specifications.DomainSpecifications;
import org.seedstack.business.fixtures.domain.discount.Discount;
import static org.mockito.Mockito.mock;
diff --git a/core/src/test/resources/logback-test.xml b/core/src/test/resources/logback-test.xml
index f7e67518..7db11a54 100644
--- a/core/src/test/resources/logback-test.xml
+++ b/core/src/test/resources/logback-test.xml
@@ -16,7 +16,7 @@
%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-
+
\ No newline at end of file
diff --git a/jpa/src/it/resources/logback-test.xml b/jpa/src/it/resources/logback-test.xml
index 464cf602..7db11a54 100644
--- a/jpa/src/it/resources/logback-test.xml
+++ b/jpa/src/it/resources/logback-test.xml
@@ -16,7 +16,7 @@
%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-
+
\ No newline at end of file
diff --git a/jpa/src/main/java/org/seedstack/business/jpa/assertions/BusinessJpaAssertions.java b/jpa/src/main/java/org/seedstack/business/jpa/assertions/BusinessJpaAssertions.java
deleted file mode 100644
index e31dd1ca..00000000
--- a/jpa/src/main/java/org/seedstack/business/jpa/assertions/BusinessJpaAssertions.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright (c) 2013-2015 by The SeedStack authors. All rights reserved.
- *
- * This file is part of SeedStack, An enterprise-oriented full development stack.
- *
- * 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/.
- */
-package org.seedstack.business.jpa.assertions;
-
-import org.seedstack.seed.core.assertions.CoreObjectAssert;
-
-/**
- * This class provides business assertions on JPA.
- *
- * @author epo.jemba@ext.mpsa.com
- */
-public final class BusinessJpaAssertions {
-
- private BusinessJpaAssertions() {
- }
-
- /**
- * @param actual class to check
- * @return the actual Assert
- */
- public static BusinessJpaClassAssert assertThat(Class> actual) {
- return new BusinessJpaClassAssert(actual);
- }
-
- /**
- * Creates a new instance of {@link CoreObjectAssert}.
- *
- * @param actual the actual value.
- * @return the created assertion object.
- */
- public static CoreObjectAssert assertThat(Object actual) {
- return new BusinessJpaObjectAssert(actual);
- }
-}
diff --git a/jpa/src/main/java/org/seedstack/business/jpa/assertions/BusinessJpaClassAssert.java b/jpa/src/main/java/org/seedstack/business/jpa/assertions/BusinessJpaClassAssert.java
deleted file mode 100644
index 6920c641..00000000
--- a/jpa/src/main/java/org/seedstack/business/jpa/assertions/BusinessJpaClassAssert.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
- * Copyright (c) 2013-2015 by The SeedStack authors. All rights reserved.
- *
- * This file is part of SeedStack, An enterprise-oriented full development stack.
- *
- * 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/.
- */
-package org.seedstack.business.jpa.assertions;
-
-import org.assertj.core.api.AssertionInfo;
-import org.assertj.core.internal.Objects;
-import org.seedstack.business.assertions.BusinessReflectionAsserts;
-import org.seedstack.seed.core.assertions.CoreClassAssert;
-
-/**
- * This class provides assertions on JPA.
- *
- * @author epo.jemba@ext.mpsa.com
- */
-public class BusinessJpaClassAssert extends CoreClassAssert {
-
- /**
- * Constructor.
- *
- * @param actual the actual class to check
- */
- public BusinessJpaClassAssert(Class> actual) {
- super(actual, BusinessJpaClassAssert.class);
- }
-
- /**
- * Chains asserts.
- *
- * @return itself
- */
- public BusinessJpaClassAssert and() {
- return myself;
- }
-
-
- /**
- * Asserts that the candidate is a valid JPA repository class.
- *
- * @return itself
- */
- public BusinessJpaClassAssert isValidJpaRepositoryClass() {
- assertNotNull(info, actual);
-
- BusinessJpaReflectionAsserts.assertJpaRepositoryClassIsValid(actual);
-
- return myself;
- }
-
- /**
- * Asserts that the candidate is valid default factory.
- *
- * @return itself
- */
- public BusinessJpaClassAssert isValidFactoryDefaultClass() {
- assertNotNull(info, actual);
-
- BusinessJpaReflectionAsserts.assertDefaultFactoryClassIsValid(actual);
-
- return myself;
-
- }
-
- /**
- * Checks that the candidate is valid DomainServiceDefault class.
- *
- * @return itself
- */
- public BusinessJpaClassAssert isValidDomainServiceDefaultClass() {
- assertNotNull(info, actual);
-
- BusinessJpaReflectionAsserts.assertDefaultDomainServiceClassIsValid(actual);
-
- return myself;
- }
-
- /**
- * Checks that the candidate is valid DomainPolicyInternal class.
- *
- * @return itself
- */
- public BusinessJpaClassAssert isValidDomainPolicyInternalClass() {
- assertNotNull(info, actual);
-
- BusinessJpaReflectionAsserts.assertDomainPolicyInternalClassIsValid(actual);
-
- return myself;
- }
-
- /**
- * Checks that the candidate is valid ApplicationServiceInternal class.
- *
- * @return itself
- */
- public BusinessJpaClassAssert isValidApplicationServiceInternalClass() {
- assertNotNull(info, actual);
-
- BusinessJpaReflectionAsserts.assertDefaultApplicationServiceClassIsValid(actual);
-
- return myself;
- }
-
- /** Business Class Assert inheritance ***/
-
-
- /**
- * Checks that the candidate is a valid aggregate root.
- *
- * @return itself
- */
- public BusinessJpaClassAssert isValidAggregateRootClass() {
- assertNotNull(info, actual);
-
- BusinessReflectionAsserts.assertAggregateRootClassIsValid(actual);
-
- return myself;
- }
-
- /**
- * Asserts that the candidate is a valid ValueObject class.
- *
- * @return itself
- */
- public BusinessJpaClassAssert isValidValueObjectClass() {
- assertNotNull(info, actual);
-
- BusinessReflectionAsserts.assertValueObjectClassIsValid(actual);
-
- return myself;
- }
-
- /**
- * Asserts that the candidate is a valid Entity class.
- *
- * @return itself
- */
- public BusinessJpaClassAssert isValidEntityClass() {
-
- assertNotNull(info, actual);
-
- BusinessReflectionAsserts.assertEntityClassIsValid(actual);
-
- return myself;
- }
-
- /**
- * Asserts that the candidate is a valid RepositoryInterface class.
- *
- * @return itself
- */
- public BusinessJpaClassAssert isValidRepositoryInterfaceClass() {
- assertNotNull(info, actual);
-
- BusinessReflectionAsserts.assertRepositoryInterfaceClassIsValid(actual);
-
- return myself;
- }
-
-
- /**
- * Asserts that the candidate is a valid FactoryInterface class.
- *
- * @return itself
- */
- public BusinessJpaClassAssert isValidFactoryInterfaceClass() {
- assertNotNull(info, actual);
-
- BusinessReflectionAsserts.assertFactoryInterfaceClassIsValid(actual);
-
- return myself;
-
- }
-
- /**
- * Asserts that the candidate is a valid DomainServiceInterface class.
- *
- * @return itself
- */
- public BusinessJpaClassAssert isValidDomainServiceInterfaceClass() {
-
- assertNotNull(info, actual);
-
- BusinessReflectionAsserts.assertDomainServiceInterfaceClassIsValid(actual);
-
- return myself;
-
- }
-
- /**
- * Asserts that the candidate is a valid ApplicationServiceInterface class.
- *
- * @return itself
- */
- public BusinessJpaClassAssert isValidApplicationServiceInterfaceClass() {
-
- assertNotNull(info, actual);
-
- BusinessReflectionAsserts.assertApplicationServiceInterfaceClassIsValid(actual);
-
- return myself;
-
- }
-
- /**
- * Asserts that the candidate is a valid DomainPolicyInterface class.
- *
- * @return itself
- */
- public BusinessJpaClassAssert isValidDomainPolicyInterfaceClass() {
- assertNotNull(info, actual);
-
- BusinessReflectionAsserts.assertDomainPolicyInterfaceClassIsValid(actual);
-
- return myself;
- }
-
- private static void assertNotNull(AssertionInfo info, Class> actual) {
- Objects.instance().assertNotNull(info, actual);
- }
-}
diff --git a/jpa/src/main/java/org/seedstack/business/jpa/assertions/BusinessJpaObjectAssert.java b/jpa/src/main/java/org/seedstack/business/jpa/assertions/BusinessJpaObjectAssert.java
deleted file mode 100644
index f09ccf54..00000000
--- a/jpa/src/main/java/org/seedstack/business/jpa/assertions/BusinessJpaObjectAssert.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) 2013-2015 by The SeedStack authors. All rights reserved.
- *
- * This file is part of SeedStack, An enterprise-oriented full development stack.
- *
- * 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/.
- */
-package org.seedstack.business.jpa.assertions;
-
-
-import org.seedstack.seed.core.assertions.CoreObjectAssert;
-
-/**
- * @author epo.jemba@ext.mpsa.com
- */
-public class BusinessJpaObjectAssert extends CoreObjectAssert