diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 85ad5e8288..bc0e2914b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,7 +94,7 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: - files: build/reports/jacoco/mockitoCoverage/mockitoCoverage.xml + files: mockito-core/build/reports/jacoco/mockitoCoverage/mockitoCoverage.xml fail_ci_if_error: true # diff --git a/build.gradle b/build.gradle index 0761047d5d..1bd757823e 100644 --- a/build.gradle +++ b/build.gradle @@ -21,31 +21,14 @@ buildscript { plugins { id 'com.diffplug.spotless' version '6.25.0' - id 'eclipse' id 'com.github.ben-manes.versions' version '0.51.0' - id 'biz.aQute.bnd.builder' version '7.0.0' - id 'ru.vyarus.animalsniffer' version '1.7.1' } -description = 'Mockito mock objects library core API and implementation' +apply from: "$rootDir/gradle/shipkit.gradle" +apply from: "$rootDir/gradle/root/ide.gradle" +apply from: "$rootDir/gradle/license.gradle" -apply plugin: 'base' -base.archivesName = 'mockito-core' - -apply from: 'gradle/shipkit.gradle' - -apply from: 'gradle/root/ide.gradle' -apply from: 'gradle/root/gradle-fix.gradle' -apply from: 'gradle/java-library.gradle' -apply from: 'gradle/license.gradle' -apply from: 'gradle/root/coverage.gradle' - -apply from: 'gradle/mockito-core/inline-mock.gradle' -apply from: 'gradle/mockito-core/osgi.gradle' -apply from: 'gradle/mockito-core/javadoc.gradle' -apply from: 'gradle/mockito-core/testing.gradle' - -allprojects { proj -> +subprojects { proj -> repositories { mavenCentral() google() @@ -79,40 +62,3 @@ allprojects { proj -> configFile = rootProject.file('config/checkstyle/checkstyle.xml') } } - -configurations { - testUtil //TODO move to separate project - // Putting 'provided' dependencies on test compile and runtime classpath. - testCompileOnly.extendsFrom(compileOnly) - testRuntimeOnly.extendsFrom(compileOnly) -} - -dependencies { - api libs.bytebuddy, libs.bytebuddy.agent - - compileOnly libs.junit4, libs.hamcrest, libs.opentest4j - implementation libs.objenesis - - testImplementation libs.assertj - testImplementation libs.junit.jupiter.api - testImplementation libs.junit.jupiter.params - - testUtil sourceSets.test.output - - signature 'org.codehaus.mojo.signature:java18:1.0@signature' - signature 'net.sf.androidscents.signature:android-api-level-26:8.0.0_r2@signature' -} - -animalsniffer { - sourceSets = [sourceSets.main] - annotation = 'org.mockito.internal.SuppressSignatureCheck' - // See please https://github.com/mojohaus/animal-sniffer/issues/172 - ignore += [ - 'java.lang.instrument.Instrumentation', - 'java.lang.invoke.MethodHandle', - 'java.lang.invoke.MethodHandles$Lookup', - 'java.lang.StackWalker', - 'java.lang.StackWalker$StackFrame', - 'java.lang.StackWalker$Option' - ] -} diff --git a/gradle/root/coverage.gradle b/gradle/coverage.gradle similarity index 96% rename from gradle/root/coverage.gradle rename to gradle/coverage.gradle index 4cac5119eb..5f5012e5c9 100644 --- a/gradle/root/coverage.gradle +++ b/gradle/coverage.gradle @@ -1,4 +1,4 @@ -allprojects { Project project -> +rootProject.subprojects { Project project -> plugins.withId("java") { project.apply plugin: "jacoco" project.jacoco { @@ -9,7 +9,7 @@ allprojects { Project project -> def mockitoCoverage = tasks.register("mockitoCoverage", JacocoReport) { mockitoCoverage -> group = LifecycleBasePlugin.VERIFICATION_GROUP - allprojects { Project currentProject -> + rootProject.subprojects { Project currentProject -> plugins.withId("jacoco") { plugins.withId("java") { // JacocoReport.sourceSets() appends both sourceDirectories and classDirectories. diff --git a/gradle/mockito-core/javadoc.gradle b/gradle/mockito-core/javadoc.gradle index 060c00a4a3..7a05887259 100644 --- a/gradle/mockito-core/javadoc.gradle +++ b/gradle/mockito-core/javadoc.gradle @@ -1,6 +1,6 @@ //It seems the gradle javadoc task works file by file and as such disable some features of javadoc tool //such as link to packages, https://groups.google.com/d/msg/gradle-dev/R83dy_6PHMc/bgw0cUTMFAAJ -def javaDocsDir = 'gradle/java-docs' +def jdkDocsDir = "$rootDir/gradle/java-docs" tasks.named("javadoc", Javadoc) { inputs.dir("src/main/javadoc") @@ -15,7 +15,7 @@ tasks.named("javadoc", Javadoc) { title = "Mockito ${project.version} API" options.addBooleanOption('-allow-script-in-comments', true) - options.addFileOption('-add-stylesheet', rootProject.file("src/main/javadoc/mockito-theme.css")) + options.addFileOption('-add-stylesheet', project(":mockito-core").file("src/main/javadoc/mockito-theme.css")) options.addStringOption('Xwerror', '-quiet') options.bottom(""" @@ -28,7 +28,7 @@ tasks.named("javadoc", Javadoc) { options.encoding = 'UTF-8' options.group("Main package", ["org.mockito"]) options.links('https://junit.org/junit4/javadoc/4.13.2/') - options.linksOffline('https://docs.oracle.com/en/java/javase/11/docs/api/', javaDocsDir) + options.linksOffline('https://docs.oracle.com/en/java/javase/11/docs/api/', jdkDocsDir) options.memberLevel = JavadocMemberLevel.PROTECTED options.outputLevel = JavadocOutputLevel.QUIET options.splitIndex = true diff --git a/gradle/mockito-junit-jupiter/javadoc.gradle b/gradle/mockito-junit-jupiter/javadoc.gradle index 2b2f642a20..0748ff6968 100644 --- a/gradle/mockito-junit-jupiter/javadoc.gradle +++ b/gradle/mockito-junit-jupiter/javadoc.gradle @@ -1,9 +1,9 @@ //It seems the gradle javadoc task works file by file and as such disable some features of javadoc tool //such as link to packages, https://groups.google.com/d/msg/gradle-dev/R83dy_6PHMc/bgw0cUTMFAAJ -def javaDocsDir = "$rootDir/gradle/java-docs" +def jdkDocsDir = "$rootDir/gradle/java-docs" tasks.named("javadoc", Javadoc) { - inputs.dir("$rootDir/src/main/javadoc") + inputs.dir(project(":mockito-core").file("src/main/javadoc")) description "Creates javadoc html for Mockito JUnit Jupiter." @@ -15,7 +15,7 @@ tasks.named("javadoc", Javadoc) { title = "Mockito JUnit Jupiter ${project.version} API" options.addBooleanOption('-allow-script-in-comments', true) - options.addFileOption('-add-stylesheet', rootProject.file("$rootDir/src/main/javadoc/mockito-theme.css")) + options.addFileOption('-add-stylesheet', project(":mockito-core").file("src/main/javadoc/mockito-theme.css")) options.addStringOption('Xwerror', '-quiet') options.bottom(""" @@ -27,7 +27,7 @@ tasks.named("javadoc", Javadoc) { options.docTitle = """

Mockito JUnit Jupiter ${project.version} API.

""" options.encoding = 'UTF-8' options.group("Main package", ["org.mockito.junit.jupiter"]) - options.linksOffline('https://docs.oracle.com/en/java/javase/11/docs/api/', javaDocsDir) + options.linksOffline('https://docs.oracle.com/en/java/javase/11/docs/api/', jdkDocsDir) options.memberLevel = JavadocMemberLevel.PROTECTED options.outputLevel = JavadocOutputLevel.QUIET options.splitIndex = true diff --git a/mockito-bom/build.gradle b/mockito-bom/build.gradle index cc0c821abd..24ff65bb10 100644 --- a/mockito-bom/build.gradle +++ b/mockito-bom/build.gradle @@ -12,7 +12,7 @@ apply from: "$rootDir/gradle/java-publication.gradle" dependencies { constraints { - api(project.rootProject) + api(project(":mockito-core")) project(":mockito-extensions").subprojects.forEach { api(it) diff --git a/mockito-core/build.gradle b/mockito-core/build.gradle new file mode 100644 index 0000000000..5b58fa2025 --- /dev/null +++ b/mockito-core/build.gradle @@ -0,0 +1,54 @@ + +plugins { + id 'base' + id 'biz.aQute.bnd.builder' version '7.0.0' + id 'ru.vyarus.animalsniffer' version '1.7.1' +} + +description = 'Mockito mock objects library core API and implementation' +base.archivesName = 'mockito-core' + + +apply from: "$rootDir/gradle/java-library.gradle" +apply from: "$rootDir/gradle/coverage.gradle" +apply from: "$rootDir/gradle/mockito-core/inline-mock.gradle" +apply from: "$rootDir/gradle/mockito-core/osgi.gradle" +apply from: "$rootDir/gradle/mockito-core/javadoc.gradle" +apply from: "$rootDir/gradle/mockito-core/testing.gradle" + +configurations { + testUtil //TODO move to separate project + // Putting 'provided' dependencies on test compile and runtime classpath. + testCompileOnly.extendsFrom(compileOnly) + testRuntimeOnly.extendsFrom(compileOnly) +} + +dependencies { + api libs.bytebuddy, libs.bytebuddy.agent + + compileOnly libs.junit4, libs.hamcrest, libs.opentest4j + implementation libs.objenesis + + testImplementation libs.assertj + testImplementation libs.junit.jupiter.api + testImplementation libs.junit.jupiter.params + + testUtil sourceSets.test.output + + signature 'org.codehaus.mojo.signature:java18:1.0@signature' + signature 'net.sf.androidscents.signature:android-api-level-26:8.0.0_r2@signature' +} + +animalsniffer { + sourceSets = [sourceSets.main] + annotation = 'org.mockito.internal.SuppressSignatureCheck' + // See please https://github.com/mojohaus/animal-sniffer/issues/172 + ignore += [ + 'java.lang.instrument.Instrumentation', + 'java.lang.invoke.MethodHandle', + 'java.lang.invoke.MethodHandles$Lookup', + 'java.lang.StackWalker', + 'java.lang.StackWalker$StackFrame', + 'java.lang.StackWalker$Option' + ] +} diff --git a/src/conf/pmd-rules.xml b/mockito-core/src/conf/pmd-rules.xml similarity index 100% rename from src/conf/pmd-rules.xml rename to mockito-core/src/conf/pmd-rules.xml diff --git a/src/main/java/org/mockito/AdditionalAnswers.java b/mockito-core/src/main/java/org/mockito/AdditionalAnswers.java similarity index 100% rename from src/main/java/org/mockito/AdditionalAnswers.java rename to mockito-core/src/main/java/org/mockito/AdditionalAnswers.java diff --git a/src/main/java/org/mockito/AdditionalMatchers.java b/mockito-core/src/main/java/org/mockito/AdditionalMatchers.java similarity index 100% rename from src/main/java/org/mockito/AdditionalMatchers.java rename to mockito-core/src/main/java/org/mockito/AdditionalMatchers.java diff --git a/src/main/java/org/mockito/Answers.java b/mockito-core/src/main/java/org/mockito/Answers.java similarity index 100% rename from src/main/java/org/mockito/Answers.java rename to mockito-core/src/main/java/org/mockito/Answers.java diff --git a/src/main/java/org/mockito/ArgumentCaptor.java b/mockito-core/src/main/java/org/mockito/ArgumentCaptor.java similarity index 100% rename from src/main/java/org/mockito/ArgumentCaptor.java rename to mockito-core/src/main/java/org/mockito/ArgumentCaptor.java diff --git a/src/main/java/org/mockito/ArgumentMatcher.java b/mockito-core/src/main/java/org/mockito/ArgumentMatcher.java similarity index 100% rename from src/main/java/org/mockito/ArgumentMatcher.java rename to mockito-core/src/main/java/org/mockito/ArgumentMatcher.java diff --git a/src/main/java/org/mockito/ArgumentMatchers.java b/mockito-core/src/main/java/org/mockito/ArgumentMatchers.java similarity index 100% rename from src/main/java/org/mockito/ArgumentMatchers.java rename to mockito-core/src/main/java/org/mockito/ArgumentMatchers.java diff --git a/src/main/java/org/mockito/BDDMockito.java b/mockito-core/src/main/java/org/mockito/BDDMockito.java similarity index 100% rename from src/main/java/org/mockito/BDDMockito.java rename to mockito-core/src/main/java/org/mockito/BDDMockito.java diff --git a/src/main/java/org/mockito/Captor.java b/mockito-core/src/main/java/org/mockito/Captor.java similarity index 100% rename from src/main/java/org/mockito/Captor.java rename to mockito-core/src/main/java/org/mockito/Captor.java diff --git a/src/main/java/org/mockito/CheckReturnValue.java b/mockito-core/src/main/java/org/mockito/CheckReturnValue.java similarity index 100% rename from src/main/java/org/mockito/CheckReturnValue.java rename to mockito-core/src/main/java/org/mockito/CheckReturnValue.java diff --git a/src/main/java/org/mockito/DoNotMock.java b/mockito-core/src/main/java/org/mockito/DoNotMock.java similarity index 100% rename from src/main/java/org/mockito/DoNotMock.java rename to mockito-core/src/main/java/org/mockito/DoNotMock.java diff --git a/src/main/java/org/mockito/InOrder.java b/mockito-core/src/main/java/org/mockito/InOrder.java similarity index 100% rename from src/main/java/org/mockito/InOrder.java rename to mockito-core/src/main/java/org/mockito/InOrder.java diff --git a/src/main/java/org/mockito/Incubating.java b/mockito-core/src/main/java/org/mockito/Incubating.java similarity index 100% rename from src/main/java/org/mockito/Incubating.java rename to mockito-core/src/main/java/org/mockito/Incubating.java diff --git a/src/main/java/org/mockito/InjectMocks.java b/mockito-core/src/main/java/org/mockito/InjectMocks.java similarity index 100% rename from src/main/java/org/mockito/InjectMocks.java rename to mockito-core/src/main/java/org/mockito/InjectMocks.java diff --git a/src/main/java/org/mockito/Mock.java b/mockito-core/src/main/java/org/mockito/Mock.java similarity index 100% rename from src/main/java/org/mockito/Mock.java rename to mockito-core/src/main/java/org/mockito/Mock.java diff --git a/src/main/java/org/mockito/MockMakers.java b/mockito-core/src/main/java/org/mockito/MockMakers.java similarity index 100% rename from src/main/java/org/mockito/MockMakers.java rename to mockito-core/src/main/java/org/mockito/MockMakers.java diff --git a/src/main/java/org/mockito/MockSettings.java b/mockito-core/src/main/java/org/mockito/MockSettings.java similarity index 100% rename from src/main/java/org/mockito/MockSettings.java rename to mockito-core/src/main/java/org/mockito/MockSettings.java diff --git a/src/main/java/org/mockito/MockedConstruction.java b/mockito-core/src/main/java/org/mockito/MockedConstruction.java similarity index 100% rename from src/main/java/org/mockito/MockedConstruction.java rename to mockito-core/src/main/java/org/mockito/MockedConstruction.java diff --git a/src/main/java/org/mockito/MockedStatic.java b/mockito-core/src/main/java/org/mockito/MockedStatic.java similarity index 100% rename from src/main/java/org/mockito/MockedStatic.java rename to mockito-core/src/main/java/org/mockito/MockedStatic.java diff --git a/src/main/java/org/mockito/MockingDetails.java b/mockito-core/src/main/java/org/mockito/MockingDetails.java similarity index 100% rename from src/main/java/org/mockito/MockingDetails.java rename to mockito-core/src/main/java/org/mockito/MockingDetails.java diff --git a/src/main/java/org/mockito/Mockito.java b/mockito-core/src/main/java/org/mockito/Mockito.java similarity index 100% rename from src/main/java/org/mockito/Mockito.java rename to mockito-core/src/main/java/org/mockito/Mockito.java diff --git a/src/main/java/org/mockito/MockitoAnnotations.java b/mockito-core/src/main/java/org/mockito/MockitoAnnotations.java similarity index 100% rename from src/main/java/org/mockito/MockitoAnnotations.java rename to mockito-core/src/main/java/org/mockito/MockitoAnnotations.java diff --git a/src/main/java/org/mockito/MockitoFramework.java b/mockito-core/src/main/java/org/mockito/MockitoFramework.java similarity index 100% rename from src/main/java/org/mockito/MockitoFramework.java rename to mockito-core/src/main/java/org/mockito/MockitoFramework.java diff --git a/src/main/java/org/mockito/MockitoSession.java b/mockito-core/src/main/java/org/mockito/MockitoSession.java similarity index 100% rename from src/main/java/org/mockito/MockitoSession.java rename to mockito-core/src/main/java/org/mockito/MockitoSession.java diff --git a/src/main/java/org/mockito/NotExtensible.java b/mockito-core/src/main/java/org/mockito/NotExtensible.java similarity index 100% rename from src/main/java/org/mockito/NotExtensible.java rename to mockito-core/src/main/java/org/mockito/NotExtensible.java diff --git a/src/main/java/org/mockito/ScopedMock.java b/mockito-core/src/main/java/org/mockito/ScopedMock.java similarity index 100% rename from src/main/java/org/mockito/ScopedMock.java rename to mockito-core/src/main/java/org/mockito/ScopedMock.java diff --git a/src/main/java/org/mockito/Spy.java b/mockito-core/src/main/java/org/mockito/Spy.java similarity index 100% rename from src/main/java/org/mockito/Spy.java rename to mockito-core/src/main/java/org/mockito/Spy.java diff --git a/src/main/java/org/mockito/ThrowingConsumer.java b/mockito-core/src/main/java/org/mockito/ThrowingConsumer.java similarity index 100% rename from src/main/java/org/mockito/ThrowingConsumer.java rename to mockito-core/src/main/java/org/mockito/ThrowingConsumer.java diff --git a/src/main/java/org/mockito/codegen/InjectionBase.java b/mockito-core/src/main/java/org/mockito/codegen/InjectionBase.java similarity index 100% rename from src/main/java/org/mockito/codegen/InjectionBase.java rename to mockito-core/src/main/java/org/mockito/codegen/InjectionBase.java diff --git a/src/main/java/org/mockito/configuration/DefaultMockitoConfiguration.java b/mockito-core/src/main/java/org/mockito/configuration/DefaultMockitoConfiguration.java similarity index 100% rename from src/main/java/org/mockito/configuration/DefaultMockitoConfiguration.java rename to mockito-core/src/main/java/org/mockito/configuration/DefaultMockitoConfiguration.java diff --git a/src/main/java/org/mockito/configuration/IMockitoConfiguration.java b/mockito-core/src/main/java/org/mockito/configuration/IMockitoConfiguration.java similarity index 100% rename from src/main/java/org/mockito/configuration/IMockitoConfiguration.java rename to mockito-core/src/main/java/org/mockito/configuration/IMockitoConfiguration.java diff --git a/src/main/java/org/mockito/configuration/package-info.java b/mockito-core/src/main/java/org/mockito/configuration/package-info.java similarity index 100% rename from src/main/java/org/mockito/configuration/package-info.java rename to mockito-core/src/main/java/org/mockito/configuration/package-info.java diff --git a/src/main/java/org/mockito/creation/instance/InstantiationException.java b/mockito-core/src/main/java/org/mockito/creation/instance/InstantiationException.java similarity index 100% rename from src/main/java/org/mockito/creation/instance/InstantiationException.java rename to mockito-core/src/main/java/org/mockito/creation/instance/InstantiationException.java diff --git a/src/main/java/org/mockito/creation/instance/Instantiator.java b/mockito-core/src/main/java/org/mockito/creation/instance/Instantiator.java similarity index 100% rename from src/main/java/org/mockito/creation/instance/Instantiator.java rename to mockito-core/src/main/java/org/mockito/creation/instance/Instantiator.java diff --git a/src/main/java/org/mockito/exceptions/base/MockitoAssertionError.java b/mockito-core/src/main/java/org/mockito/exceptions/base/MockitoAssertionError.java similarity index 100% rename from src/main/java/org/mockito/exceptions/base/MockitoAssertionError.java rename to mockito-core/src/main/java/org/mockito/exceptions/base/MockitoAssertionError.java diff --git a/src/main/java/org/mockito/exceptions/base/MockitoException.java b/mockito-core/src/main/java/org/mockito/exceptions/base/MockitoException.java similarity index 100% rename from src/main/java/org/mockito/exceptions/base/MockitoException.java rename to mockito-core/src/main/java/org/mockito/exceptions/base/MockitoException.java diff --git a/src/main/java/org/mockito/exceptions/base/MockitoInitializationException.java b/mockito-core/src/main/java/org/mockito/exceptions/base/MockitoInitializationException.java similarity index 100% rename from src/main/java/org/mockito/exceptions/base/MockitoInitializationException.java rename to mockito-core/src/main/java/org/mockito/exceptions/base/MockitoInitializationException.java diff --git a/src/main/java/org/mockito/exceptions/base/MockitoSerializationIssue.java b/mockito-core/src/main/java/org/mockito/exceptions/base/MockitoSerializationIssue.java similarity index 100% rename from src/main/java/org/mockito/exceptions/base/MockitoSerializationIssue.java rename to mockito-core/src/main/java/org/mockito/exceptions/base/MockitoSerializationIssue.java diff --git a/src/main/java/org/mockito/exceptions/base/package-info.java b/mockito-core/src/main/java/org/mockito/exceptions/base/package-info.java similarity index 100% rename from src/main/java/org/mockito/exceptions/base/package-info.java rename to mockito-core/src/main/java/org/mockito/exceptions/base/package-info.java diff --git a/src/main/java/org/mockito/exceptions/misusing/CannotStubVoidMethodWithReturnValue.java b/mockito-core/src/main/java/org/mockito/exceptions/misusing/CannotStubVoidMethodWithReturnValue.java similarity index 100% rename from src/main/java/org/mockito/exceptions/misusing/CannotStubVoidMethodWithReturnValue.java rename to mockito-core/src/main/java/org/mockito/exceptions/misusing/CannotStubVoidMethodWithReturnValue.java diff --git a/src/main/java/org/mockito/exceptions/misusing/CannotVerifyStubOnlyMock.java b/mockito-core/src/main/java/org/mockito/exceptions/misusing/CannotVerifyStubOnlyMock.java similarity index 100% rename from src/main/java/org/mockito/exceptions/misusing/CannotVerifyStubOnlyMock.java rename to mockito-core/src/main/java/org/mockito/exceptions/misusing/CannotVerifyStubOnlyMock.java diff --git a/src/main/java/org/mockito/exceptions/misusing/DisabledMockException.java b/mockito-core/src/main/java/org/mockito/exceptions/misusing/DisabledMockException.java similarity index 100% rename from src/main/java/org/mockito/exceptions/misusing/DisabledMockException.java rename to mockito-core/src/main/java/org/mockito/exceptions/misusing/DisabledMockException.java diff --git a/src/main/java/org/mockito/exceptions/misusing/DoNotMockException.java b/mockito-core/src/main/java/org/mockito/exceptions/misusing/DoNotMockException.java similarity index 100% rename from src/main/java/org/mockito/exceptions/misusing/DoNotMockException.java rename to mockito-core/src/main/java/org/mockito/exceptions/misusing/DoNotMockException.java diff --git a/src/main/java/org/mockito/exceptions/misusing/FriendlyReminderException.java b/mockito-core/src/main/java/org/mockito/exceptions/misusing/FriendlyReminderException.java similarity index 100% rename from src/main/java/org/mockito/exceptions/misusing/FriendlyReminderException.java rename to mockito-core/src/main/java/org/mockito/exceptions/misusing/FriendlyReminderException.java diff --git a/src/main/java/org/mockito/exceptions/misusing/InjectMocksException.java b/mockito-core/src/main/java/org/mockito/exceptions/misusing/InjectMocksException.java similarity index 100% rename from src/main/java/org/mockito/exceptions/misusing/InjectMocksException.java rename to mockito-core/src/main/java/org/mockito/exceptions/misusing/InjectMocksException.java diff --git a/src/main/java/org/mockito/exceptions/misusing/InvalidUseOfMatchersException.java b/mockito-core/src/main/java/org/mockito/exceptions/misusing/InvalidUseOfMatchersException.java similarity index 100% rename from src/main/java/org/mockito/exceptions/misusing/InvalidUseOfMatchersException.java rename to mockito-core/src/main/java/org/mockito/exceptions/misusing/InvalidUseOfMatchersException.java diff --git a/src/main/java/org/mockito/exceptions/misusing/MissingMethodInvocationException.java b/mockito-core/src/main/java/org/mockito/exceptions/misusing/MissingMethodInvocationException.java similarity index 100% rename from src/main/java/org/mockito/exceptions/misusing/MissingMethodInvocationException.java rename to mockito-core/src/main/java/org/mockito/exceptions/misusing/MissingMethodInvocationException.java diff --git a/src/main/java/org/mockito/exceptions/misusing/MockitoConfigurationException.java b/mockito-core/src/main/java/org/mockito/exceptions/misusing/MockitoConfigurationException.java similarity index 100% rename from src/main/java/org/mockito/exceptions/misusing/MockitoConfigurationException.java rename to mockito-core/src/main/java/org/mockito/exceptions/misusing/MockitoConfigurationException.java diff --git a/src/main/java/org/mockito/exceptions/misusing/NotAMockException.java b/mockito-core/src/main/java/org/mockito/exceptions/misusing/NotAMockException.java similarity index 100% rename from src/main/java/org/mockito/exceptions/misusing/NotAMockException.java rename to mockito-core/src/main/java/org/mockito/exceptions/misusing/NotAMockException.java diff --git a/src/main/java/org/mockito/exceptions/misusing/NullInsteadOfMockException.java b/mockito-core/src/main/java/org/mockito/exceptions/misusing/NullInsteadOfMockException.java similarity index 100% rename from src/main/java/org/mockito/exceptions/misusing/NullInsteadOfMockException.java rename to mockito-core/src/main/java/org/mockito/exceptions/misusing/NullInsteadOfMockException.java diff --git a/src/main/java/org/mockito/exceptions/misusing/PotentialStubbingProblem.java b/mockito-core/src/main/java/org/mockito/exceptions/misusing/PotentialStubbingProblem.java similarity index 100% rename from src/main/java/org/mockito/exceptions/misusing/PotentialStubbingProblem.java rename to mockito-core/src/main/java/org/mockito/exceptions/misusing/PotentialStubbingProblem.java diff --git a/src/main/java/org/mockito/exceptions/misusing/RedundantListenerException.java b/mockito-core/src/main/java/org/mockito/exceptions/misusing/RedundantListenerException.java similarity index 100% rename from src/main/java/org/mockito/exceptions/misusing/RedundantListenerException.java rename to mockito-core/src/main/java/org/mockito/exceptions/misusing/RedundantListenerException.java diff --git a/src/main/java/org/mockito/exceptions/misusing/UnfinishedMockingSessionException.java b/mockito-core/src/main/java/org/mockito/exceptions/misusing/UnfinishedMockingSessionException.java similarity index 100% rename from src/main/java/org/mockito/exceptions/misusing/UnfinishedMockingSessionException.java rename to mockito-core/src/main/java/org/mockito/exceptions/misusing/UnfinishedMockingSessionException.java diff --git a/src/main/java/org/mockito/exceptions/misusing/UnfinishedStubbingException.java b/mockito-core/src/main/java/org/mockito/exceptions/misusing/UnfinishedStubbingException.java similarity index 100% rename from src/main/java/org/mockito/exceptions/misusing/UnfinishedStubbingException.java rename to mockito-core/src/main/java/org/mockito/exceptions/misusing/UnfinishedStubbingException.java diff --git a/src/main/java/org/mockito/exceptions/misusing/UnfinishedVerificationException.java b/mockito-core/src/main/java/org/mockito/exceptions/misusing/UnfinishedVerificationException.java similarity index 100% rename from src/main/java/org/mockito/exceptions/misusing/UnfinishedVerificationException.java rename to mockito-core/src/main/java/org/mockito/exceptions/misusing/UnfinishedVerificationException.java diff --git a/src/main/java/org/mockito/exceptions/misusing/UnnecessaryStubbingException.java b/mockito-core/src/main/java/org/mockito/exceptions/misusing/UnnecessaryStubbingException.java similarity index 100% rename from src/main/java/org/mockito/exceptions/misusing/UnnecessaryStubbingException.java rename to mockito-core/src/main/java/org/mockito/exceptions/misusing/UnnecessaryStubbingException.java diff --git a/src/main/java/org/mockito/exceptions/misusing/WrongTypeOfReturnValue.java b/mockito-core/src/main/java/org/mockito/exceptions/misusing/WrongTypeOfReturnValue.java similarity index 100% rename from src/main/java/org/mockito/exceptions/misusing/WrongTypeOfReturnValue.java rename to mockito-core/src/main/java/org/mockito/exceptions/misusing/WrongTypeOfReturnValue.java diff --git a/src/main/java/org/mockito/exceptions/misusing/package-info.java b/mockito-core/src/main/java/org/mockito/exceptions/misusing/package-info.java similarity index 100% rename from src/main/java/org/mockito/exceptions/misusing/package-info.java rename to mockito-core/src/main/java/org/mockito/exceptions/misusing/package-info.java diff --git a/src/main/java/org/mockito/exceptions/package-info.java b/mockito-core/src/main/java/org/mockito/exceptions/package-info.java similarity index 100% rename from src/main/java/org/mockito/exceptions/package-info.java rename to mockito-core/src/main/java/org/mockito/exceptions/package-info.java diff --git a/src/main/java/org/mockito/exceptions/stacktrace/StackTraceCleaner.java b/mockito-core/src/main/java/org/mockito/exceptions/stacktrace/StackTraceCleaner.java similarity index 100% rename from src/main/java/org/mockito/exceptions/stacktrace/StackTraceCleaner.java rename to mockito-core/src/main/java/org/mockito/exceptions/stacktrace/StackTraceCleaner.java diff --git a/src/main/java/org/mockito/exceptions/stacktrace/package-info.java b/mockito-core/src/main/java/org/mockito/exceptions/stacktrace/package-info.java similarity index 100% rename from src/main/java/org/mockito/exceptions/stacktrace/package-info.java rename to mockito-core/src/main/java/org/mockito/exceptions/stacktrace/package-info.java diff --git a/src/main/java/org/mockito/exceptions/verification/ArgumentsAreDifferent.java b/mockito-core/src/main/java/org/mockito/exceptions/verification/ArgumentsAreDifferent.java similarity index 100% rename from src/main/java/org/mockito/exceptions/verification/ArgumentsAreDifferent.java rename to mockito-core/src/main/java/org/mockito/exceptions/verification/ArgumentsAreDifferent.java diff --git a/src/main/java/org/mockito/exceptions/verification/MoreThanAllowedActualInvocations.java b/mockito-core/src/main/java/org/mockito/exceptions/verification/MoreThanAllowedActualInvocations.java similarity index 100% rename from src/main/java/org/mockito/exceptions/verification/MoreThanAllowedActualInvocations.java rename to mockito-core/src/main/java/org/mockito/exceptions/verification/MoreThanAllowedActualInvocations.java diff --git a/src/main/java/org/mockito/exceptions/verification/NeverWantedButInvoked.java b/mockito-core/src/main/java/org/mockito/exceptions/verification/NeverWantedButInvoked.java similarity index 100% rename from src/main/java/org/mockito/exceptions/verification/NeverWantedButInvoked.java rename to mockito-core/src/main/java/org/mockito/exceptions/verification/NeverWantedButInvoked.java diff --git a/src/main/java/org/mockito/exceptions/verification/NoInteractionsWanted.java b/mockito-core/src/main/java/org/mockito/exceptions/verification/NoInteractionsWanted.java similarity index 100% rename from src/main/java/org/mockito/exceptions/verification/NoInteractionsWanted.java rename to mockito-core/src/main/java/org/mockito/exceptions/verification/NoInteractionsWanted.java diff --git a/src/main/java/org/mockito/exceptions/verification/SmartNullPointerException.java b/mockito-core/src/main/java/org/mockito/exceptions/verification/SmartNullPointerException.java similarity index 100% rename from src/main/java/org/mockito/exceptions/verification/SmartNullPointerException.java rename to mockito-core/src/main/java/org/mockito/exceptions/verification/SmartNullPointerException.java diff --git a/src/main/java/org/mockito/exceptions/verification/TooFewActualInvocations.java b/mockito-core/src/main/java/org/mockito/exceptions/verification/TooFewActualInvocations.java similarity index 100% rename from src/main/java/org/mockito/exceptions/verification/TooFewActualInvocations.java rename to mockito-core/src/main/java/org/mockito/exceptions/verification/TooFewActualInvocations.java diff --git a/src/main/java/org/mockito/exceptions/verification/TooManyActualInvocations.java b/mockito-core/src/main/java/org/mockito/exceptions/verification/TooManyActualInvocations.java similarity index 100% rename from src/main/java/org/mockito/exceptions/verification/TooManyActualInvocations.java rename to mockito-core/src/main/java/org/mockito/exceptions/verification/TooManyActualInvocations.java diff --git a/src/main/java/org/mockito/exceptions/verification/VerificationInOrderFailure.java b/mockito-core/src/main/java/org/mockito/exceptions/verification/VerificationInOrderFailure.java similarity index 100% rename from src/main/java/org/mockito/exceptions/verification/VerificationInOrderFailure.java rename to mockito-core/src/main/java/org/mockito/exceptions/verification/VerificationInOrderFailure.java diff --git a/src/main/java/org/mockito/exceptions/verification/WantedButNotInvoked.java b/mockito-core/src/main/java/org/mockito/exceptions/verification/WantedButNotInvoked.java similarity index 100% rename from src/main/java/org/mockito/exceptions/verification/WantedButNotInvoked.java rename to mockito-core/src/main/java/org/mockito/exceptions/verification/WantedButNotInvoked.java diff --git a/src/main/java/org/mockito/exceptions/verification/junit/ArgumentsAreDifferent.java b/mockito-core/src/main/java/org/mockito/exceptions/verification/junit/ArgumentsAreDifferent.java similarity index 100% rename from src/main/java/org/mockito/exceptions/verification/junit/ArgumentsAreDifferent.java rename to mockito-core/src/main/java/org/mockito/exceptions/verification/junit/ArgumentsAreDifferent.java diff --git a/src/main/java/org/mockito/exceptions/verification/junit/package-info.java b/mockito-core/src/main/java/org/mockito/exceptions/verification/junit/package-info.java similarity index 100% rename from src/main/java/org/mockito/exceptions/verification/junit/package-info.java rename to mockito-core/src/main/java/org/mockito/exceptions/verification/junit/package-info.java diff --git a/src/main/java/org/mockito/exceptions/verification/opentest4j/ArgumentsAreDifferent.java b/mockito-core/src/main/java/org/mockito/exceptions/verification/opentest4j/ArgumentsAreDifferent.java similarity index 100% rename from src/main/java/org/mockito/exceptions/verification/opentest4j/ArgumentsAreDifferent.java rename to mockito-core/src/main/java/org/mockito/exceptions/verification/opentest4j/ArgumentsAreDifferent.java diff --git a/src/main/java/org/mockito/exceptions/verification/opentest4j/package-info.java b/mockito-core/src/main/java/org/mockito/exceptions/verification/opentest4j/package-info.java similarity index 100% rename from src/main/java/org/mockito/exceptions/verification/opentest4j/package-info.java rename to mockito-core/src/main/java/org/mockito/exceptions/verification/opentest4j/package-info.java diff --git a/src/main/java/org/mockito/exceptions/verification/package-info.java b/mockito-core/src/main/java/org/mockito/exceptions/verification/package-info.java similarity index 100% rename from src/main/java/org/mockito/exceptions/verification/package-info.java rename to mockito-core/src/main/java/org/mockito/exceptions/verification/package-info.java diff --git a/src/main/java/org/mockito/hamcrest/MockitoHamcrest.java b/mockito-core/src/main/java/org/mockito/hamcrest/MockitoHamcrest.java similarity index 100% rename from src/main/java/org/mockito/hamcrest/MockitoHamcrest.java rename to mockito-core/src/main/java/org/mockito/hamcrest/MockitoHamcrest.java diff --git a/src/main/java/org/mockito/hamcrest/package-info.java b/mockito-core/src/main/java/org/mockito/hamcrest/package-info.java similarity index 100% rename from src/main/java/org/mockito/hamcrest/package-info.java rename to mockito-core/src/main/java/org/mockito/hamcrest/package-info.java diff --git a/src/main/java/org/mockito/internal/InOrderImpl.java b/mockito-core/src/main/java/org/mockito/internal/InOrderImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/InOrderImpl.java rename to mockito-core/src/main/java/org/mockito/internal/InOrderImpl.java diff --git a/src/main/java/org/mockito/internal/MockedConstructionImpl.java b/mockito-core/src/main/java/org/mockito/internal/MockedConstructionImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/MockedConstructionImpl.java rename to mockito-core/src/main/java/org/mockito/internal/MockedConstructionImpl.java diff --git a/src/main/java/org/mockito/internal/MockedStaticImpl.java b/mockito-core/src/main/java/org/mockito/internal/MockedStaticImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/MockedStaticImpl.java rename to mockito-core/src/main/java/org/mockito/internal/MockedStaticImpl.java diff --git a/src/main/java/org/mockito/internal/MockitoCore.java b/mockito-core/src/main/java/org/mockito/internal/MockitoCore.java similarity index 100% rename from src/main/java/org/mockito/internal/MockitoCore.java rename to mockito-core/src/main/java/org/mockito/internal/MockitoCore.java diff --git a/src/main/java/org/mockito/internal/PremainAttach.java b/mockito-core/src/main/java/org/mockito/internal/PremainAttach.java similarity index 100% rename from src/main/java/org/mockito/internal/PremainAttach.java rename to mockito-core/src/main/java/org/mockito/internal/PremainAttach.java diff --git a/src/main/java/org/mockito/internal/SuppressSignatureCheck.java b/mockito-core/src/main/java/org/mockito/internal/SuppressSignatureCheck.java similarity index 100% rename from src/main/java/org/mockito/internal/SuppressSignatureCheck.java rename to mockito-core/src/main/java/org/mockito/internal/SuppressSignatureCheck.java diff --git a/src/main/java/org/mockito/internal/configuration/CaptorAnnotationProcessor.java b/mockito-core/src/main/java/org/mockito/internal/configuration/CaptorAnnotationProcessor.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/CaptorAnnotationProcessor.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/CaptorAnnotationProcessor.java diff --git a/src/main/java/org/mockito/internal/configuration/ClassPathLoader.java b/mockito-core/src/main/java/org/mockito/internal/configuration/ClassPathLoader.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/ClassPathLoader.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/ClassPathLoader.java diff --git a/src/main/java/org/mockito/internal/configuration/DefaultDoNotMockEnforcer.java b/mockito-core/src/main/java/org/mockito/internal/configuration/DefaultDoNotMockEnforcer.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/DefaultDoNotMockEnforcer.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/DefaultDoNotMockEnforcer.java diff --git a/src/main/java/org/mockito/internal/configuration/DefaultInjectionEngine.java b/mockito-core/src/main/java/org/mockito/internal/configuration/DefaultInjectionEngine.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/DefaultInjectionEngine.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/DefaultInjectionEngine.java diff --git a/src/main/java/org/mockito/internal/configuration/FieldAnnotationProcessor.java b/mockito-core/src/main/java/org/mockito/internal/configuration/FieldAnnotationProcessor.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/FieldAnnotationProcessor.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/FieldAnnotationProcessor.java diff --git a/src/main/java/org/mockito/internal/configuration/GlobalConfiguration.java b/mockito-core/src/main/java/org/mockito/internal/configuration/GlobalConfiguration.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/GlobalConfiguration.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/GlobalConfiguration.java diff --git a/src/main/java/org/mockito/internal/configuration/IndependentAnnotationEngine.java b/mockito-core/src/main/java/org/mockito/internal/configuration/IndependentAnnotationEngine.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/IndependentAnnotationEngine.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/IndependentAnnotationEngine.java diff --git a/src/main/java/org/mockito/internal/configuration/InjectingAnnotationEngine.java b/mockito-core/src/main/java/org/mockito/internal/configuration/InjectingAnnotationEngine.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/InjectingAnnotationEngine.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/InjectingAnnotationEngine.java diff --git a/src/main/java/org/mockito/internal/configuration/MockAnnotationProcessor.java b/mockito-core/src/main/java/org/mockito/internal/configuration/MockAnnotationProcessor.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/MockAnnotationProcessor.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/MockAnnotationProcessor.java diff --git a/src/main/java/org/mockito/internal/configuration/SpyAnnotationEngine.java b/mockito-core/src/main/java/org/mockito/internal/configuration/SpyAnnotationEngine.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/SpyAnnotationEngine.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/SpyAnnotationEngine.java diff --git a/src/main/java/org/mockito/internal/configuration/injection/ConstructorInjection.java b/mockito-core/src/main/java/org/mockito/internal/configuration/injection/ConstructorInjection.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/injection/ConstructorInjection.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/injection/ConstructorInjection.java diff --git a/src/main/java/org/mockito/internal/configuration/injection/MockInjection.java b/mockito-core/src/main/java/org/mockito/internal/configuration/injection/MockInjection.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/injection/MockInjection.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/injection/MockInjection.java diff --git a/src/main/java/org/mockito/internal/configuration/injection/MockInjectionStrategy.java b/mockito-core/src/main/java/org/mockito/internal/configuration/injection/MockInjectionStrategy.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/injection/MockInjectionStrategy.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/injection/MockInjectionStrategy.java diff --git a/src/main/java/org/mockito/internal/configuration/injection/PropertyAndSetterInjection.java b/mockito-core/src/main/java/org/mockito/internal/configuration/injection/PropertyAndSetterInjection.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/injection/PropertyAndSetterInjection.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/injection/PropertyAndSetterInjection.java diff --git a/src/main/java/org/mockito/internal/configuration/injection/SpyOnInjectedFieldsHandler.java b/mockito-core/src/main/java/org/mockito/internal/configuration/injection/SpyOnInjectedFieldsHandler.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/injection/SpyOnInjectedFieldsHandler.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/injection/SpyOnInjectedFieldsHandler.java diff --git a/src/main/java/org/mockito/internal/configuration/injection/filter/MockCandidateFilter.java b/mockito-core/src/main/java/org/mockito/internal/configuration/injection/filter/MockCandidateFilter.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/injection/filter/MockCandidateFilter.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/injection/filter/MockCandidateFilter.java diff --git a/src/main/java/org/mockito/internal/configuration/injection/filter/NameBasedCandidateFilter.java b/mockito-core/src/main/java/org/mockito/internal/configuration/injection/filter/NameBasedCandidateFilter.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/injection/filter/NameBasedCandidateFilter.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/injection/filter/NameBasedCandidateFilter.java diff --git a/src/main/java/org/mockito/internal/configuration/injection/filter/OngoingInjector.java b/mockito-core/src/main/java/org/mockito/internal/configuration/injection/filter/OngoingInjector.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/injection/filter/OngoingInjector.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/injection/filter/OngoingInjector.java diff --git a/src/main/java/org/mockito/internal/configuration/injection/filter/TerminalMockCandidateFilter.java b/mockito-core/src/main/java/org/mockito/internal/configuration/injection/filter/TerminalMockCandidateFilter.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/injection/filter/TerminalMockCandidateFilter.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/injection/filter/TerminalMockCandidateFilter.java diff --git a/src/main/java/org/mockito/internal/configuration/injection/filter/TypeBasedCandidateFilter.java b/mockito-core/src/main/java/org/mockito/internal/configuration/injection/filter/TypeBasedCandidateFilter.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/injection/filter/TypeBasedCandidateFilter.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/injection/filter/TypeBasedCandidateFilter.java diff --git a/src/main/java/org/mockito/internal/configuration/injection/package-info.java b/mockito-core/src/main/java/org/mockito/internal/configuration/injection/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/injection/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/injection/package-info.java diff --git a/src/main/java/org/mockito/internal/configuration/injection/scanner/InjectMocksScanner.java b/mockito-core/src/main/java/org/mockito/internal/configuration/injection/scanner/InjectMocksScanner.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/injection/scanner/InjectMocksScanner.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/injection/scanner/InjectMocksScanner.java diff --git a/src/main/java/org/mockito/internal/configuration/injection/scanner/MockScanner.java b/mockito-core/src/main/java/org/mockito/internal/configuration/injection/scanner/MockScanner.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/injection/scanner/MockScanner.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/injection/scanner/MockScanner.java diff --git a/src/main/java/org/mockito/internal/configuration/package-info.java b/mockito-core/src/main/java/org/mockito/internal/configuration/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/package-info.java diff --git a/src/main/java/org/mockito/internal/configuration/plugins/DefaultMockitoPlugins.java b/mockito-core/src/main/java/org/mockito/internal/configuration/plugins/DefaultMockitoPlugins.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/plugins/DefaultMockitoPlugins.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/plugins/DefaultMockitoPlugins.java diff --git a/src/main/java/org/mockito/internal/configuration/plugins/DefaultPluginSwitch.java b/mockito-core/src/main/java/org/mockito/internal/configuration/plugins/DefaultPluginSwitch.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/plugins/DefaultPluginSwitch.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/plugins/DefaultPluginSwitch.java diff --git a/src/main/java/org/mockito/internal/configuration/plugins/PluginFileReader.java b/mockito-core/src/main/java/org/mockito/internal/configuration/plugins/PluginFileReader.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/plugins/PluginFileReader.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/plugins/PluginFileReader.java diff --git a/src/main/java/org/mockito/internal/configuration/plugins/PluginFinder.java b/mockito-core/src/main/java/org/mockito/internal/configuration/plugins/PluginFinder.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/plugins/PluginFinder.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/plugins/PluginFinder.java diff --git a/src/main/java/org/mockito/internal/configuration/plugins/PluginInitializer.java b/mockito-core/src/main/java/org/mockito/internal/configuration/plugins/PluginInitializer.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/plugins/PluginInitializer.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/plugins/PluginInitializer.java diff --git a/src/main/java/org/mockito/internal/configuration/plugins/PluginLoader.java b/mockito-core/src/main/java/org/mockito/internal/configuration/plugins/PluginLoader.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/plugins/PluginLoader.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/plugins/PluginLoader.java diff --git a/src/main/java/org/mockito/internal/configuration/plugins/PluginRegistry.java b/mockito-core/src/main/java/org/mockito/internal/configuration/plugins/PluginRegistry.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/plugins/PluginRegistry.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/plugins/PluginRegistry.java diff --git a/src/main/java/org/mockito/internal/configuration/plugins/Plugins.java b/mockito-core/src/main/java/org/mockito/internal/configuration/plugins/Plugins.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/plugins/Plugins.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/plugins/Plugins.java diff --git a/src/main/java/org/mockito/internal/configuration/plugins/package-info.java b/mockito-core/src/main/java/org/mockito/internal/configuration/plugins/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/configuration/plugins/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/configuration/plugins/package-info.java diff --git a/src/main/java/org/mockito/internal/creation/DelegatingMethod.java b/mockito-core/src/main/java/org/mockito/internal/creation/DelegatingMethod.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/DelegatingMethod.java rename to mockito-core/src/main/java/org/mockito/internal/creation/DelegatingMethod.java diff --git a/src/main/java/org/mockito/internal/creation/MockSettingsImpl.java b/mockito-core/src/main/java/org/mockito/internal/creation/MockSettingsImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/MockSettingsImpl.java rename to mockito-core/src/main/java/org/mockito/internal/creation/MockSettingsImpl.java diff --git a/src/main/java/org/mockito/internal/creation/SuspendMethod.java b/mockito-core/src/main/java/org/mockito/internal/creation/SuspendMethod.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/SuspendMethod.java rename to mockito-core/src/main/java/org/mockito/internal/creation/SuspendMethod.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyCrossClassLoaderSerializationSupport.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyCrossClassLoaderSerializationSupport.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyCrossClassLoaderSerializationSupport.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyCrossClassLoaderSerializationSupport.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyMockMaker.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyMockMaker.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyMockMaker.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyMockMaker.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/BytecodeGenerator.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/BytecodeGenerator.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/BytecodeGenerator.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/BytecodeGenerator.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/ClassCreatingMockMaker.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/ClassCreatingMockMaker.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/ClassCreatingMockMaker.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/ClassCreatingMockMaker.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/ConstructionCallback.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/ConstructionCallback.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/ConstructionCallback.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/ConstructionCallback.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/InlineByteBuddyMockMaker.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/InlineByteBuddyMockMaker.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/InlineByteBuddyMockMaker.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/InlineByteBuddyMockMaker.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/InlineDelegateByteBuddyMockMaker.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/InlineDelegateByteBuddyMockMaker.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/InlineDelegateByteBuddyMockMaker.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/InlineDelegateByteBuddyMockMaker.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/MockAccess.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/MockAccess.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/MockAccess.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/MockAccess.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/MockFeatures.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/MockFeatures.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/MockFeatures.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/MockFeatures.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodInterceptor.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodInterceptor.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodInterceptor.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodInterceptor.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/ModuleHandler.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/ModuleHandler.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/ModuleHandler.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/ModuleHandler.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/PlatformUtils.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/PlatformUtils.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/PlatformUtils.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/PlatformUtils.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/StackTraceChecker.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/StackTraceChecker.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/StackTraceChecker.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/StackTraceChecker.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/StackWalkerChecker.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/StackWalkerChecker.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/StackWalkerChecker.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/StackWalkerChecker.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/SubclassByteBuddyMockMaker.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/SubclassByteBuddyMockMaker.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/SubclassByteBuddyMockMaker.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/SubclassByteBuddyMockMaker.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/SubclassBytecodeGenerator.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/SubclassBytecodeGenerator.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/SubclassBytecodeGenerator.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/SubclassBytecodeGenerator.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/SubclassInjectionLoader.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/SubclassInjectionLoader.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/SubclassInjectionLoader.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/SubclassInjectionLoader.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/SubclassLoader.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/SubclassLoader.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/SubclassLoader.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/SubclassLoader.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/TypeCachingBytecodeGenerator.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/TypeCachingBytecodeGenerator.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/TypeCachingBytecodeGenerator.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/TypeCachingBytecodeGenerator.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/TypeSupport.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/TypeSupport.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/TypeSupport.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/TypeSupport.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/inject/package-info.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/inject/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/inject/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/inject/package-info.java diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/package-info.java b/mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/bytebuddy/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/creation/bytebuddy/package-info.java diff --git a/src/main/java/org/mockito/internal/creation/instance/ConstructorInstantiator.java b/mockito-core/src/main/java/org/mockito/internal/creation/instance/ConstructorInstantiator.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/instance/ConstructorInstantiator.java rename to mockito-core/src/main/java/org/mockito/internal/creation/instance/ConstructorInstantiator.java diff --git a/src/main/java/org/mockito/internal/creation/instance/DefaultInstantiatorProvider.java b/mockito-core/src/main/java/org/mockito/internal/creation/instance/DefaultInstantiatorProvider.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/instance/DefaultInstantiatorProvider.java rename to mockito-core/src/main/java/org/mockito/internal/creation/instance/DefaultInstantiatorProvider.java diff --git a/src/main/java/org/mockito/internal/creation/instance/ObjenesisInstantiator.java b/mockito-core/src/main/java/org/mockito/internal/creation/instance/ObjenesisInstantiator.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/instance/ObjenesisInstantiator.java rename to mockito-core/src/main/java/org/mockito/internal/creation/instance/ObjenesisInstantiator.java diff --git a/src/main/java/org/mockito/internal/creation/package-info.java b/mockito-core/src/main/java/org/mockito/internal/creation/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/creation/package-info.java diff --git a/src/main/java/org/mockito/internal/creation/proxy/InvokeDefaultProxy.java b/mockito-core/src/main/java/org/mockito/internal/creation/proxy/InvokeDefaultProxy.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/proxy/InvokeDefaultProxy.java rename to mockito-core/src/main/java/org/mockito/internal/creation/proxy/InvokeDefaultProxy.java diff --git a/src/main/java/org/mockito/internal/creation/proxy/MethodHandleProxy.java b/mockito-core/src/main/java/org/mockito/internal/creation/proxy/MethodHandleProxy.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/proxy/MethodHandleProxy.java rename to mockito-core/src/main/java/org/mockito/internal/creation/proxy/MethodHandleProxy.java diff --git a/src/main/java/org/mockito/internal/creation/proxy/ProxyMockMaker.java b/mockito-core/src/main/java/org/mockito/internal/creation/proxy/ProxyMockMaker.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/proxy/ProxyMockMaker.java rename to mockito-core/src/main/java/org/mockito/internal/creation/proxy/ProxyMockMaker.java diff --git a/src/main/java/org/mockito/internal/creation/proxy/ProxyRealMethod.java b/mockito-core/src/main/java/org/mockito/internal/creation/proxy/ProxyRealMethod.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/proxy/ProxyRealMethod.java rename to mockito-core/src/main/java/org/mockito/internal/creation/proxy/ProxyRealMethod.java diff --git a/src/main/java/org/mockito/internal/creation/proxy/package-info.java b/mockito-core/src/main/java/org/mockito/internal/creation/proxy/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/proxy/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/creation/proxy/package-info.java diff --git a/src/main/java/org/mockito/internal/creation/settings/CreationSettings.java b/mockito-core/src/main/java/org/mockito/internal/creation/settings/CreationSettings.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/settings/CreationSettings.java rename to mockito-core/src/main/java/org/mockito/internal/creation/settings/CreationSettings.java diff --git a/src/main/java/org/mockito/internal/creation/util/MockitoMethodProxy.java b/mockito-core/src/main/java/org/mockito/internal/creation/util/MockitoMethodProxy.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/util/MockitoMethodProxy.java rename to mockito-core/src/main/java/org/mockito/internal/creation/util/MockitoMethodProxy.java diff --git a/src/main/java/org/mockito/internal/creation/util/package-info.java b/mockito-core/src/main/java/org/mockito/internal/creation/util/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/creation/util/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/creation/util/package-info.java diff --git a/src/main/java/org/mockito/internal/debugging/FindingsListener.java b/mockito-core/src/main/java/org/mockito/internal/debugging/FindingsListener.java similarity index 100% rename from src/main/java/org/mockito/internal/debugging/FindingsListener.java rename to mockito-core/src/main/java/org/mockito/internal/debugging/FindingsListener.java diff --git a/src/main/java/org/mockito/internal/debugging/InvocationsPrinter.java b/mockito-core/src/main/java/org/mockito/internal/debugging/InvocationsPrinter.java similarity index 100% rename from src/main/java/org/mockito/internal/debugging/InvocationsPrinter.java rename to mockito-core/src/main/java/org/mockito/internal/debugging/InvocationsPrinter.java diff --git a/src/main/java/org/mockito/internal/debugging/Java8LocationImpl.java b/mockito-core/src/main/java/org/mockito/internal/debugging/Java8LocationImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/debugging/Java8LocationImpl.java rename to mockito-core/src/main/java/org/mockito/internal/debugging/Java8LocationImpl.java diff --git a/src/main/java/org/mockito/internal/debugging/Localized.java b/mockito-core/src/main/java/org/mockito/internal/debugging/Localized.java similarity index 100% rename from src/main/java/org/mockito/internal/debugging/Localized.java rename to mockito-core/src/main/java/org/mockito/internal/debugging/Localized.java diff --git a/src/main/java/org/mockito/internal/debugging/LocationFactory.java b/mockito-core/src/main/java/org/mockito/internal/debugging/LocationFactory.java similarity index 100% rename from src/main/java/org/mockito/internal/debugging/LocationFactory.java rename to mockito-core/src/main/java/org/mockito/internal/debugging/LocationFactory.java diff --git a/src/main/java/org/mockito/internal/debugging/LocationImpl.java b/mockito-core/src/main/java/org/mockito/internal/debugging/LocationImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/debugging/LocationImpl.java rename to mockito-core/src/main/java/org/mockito/internal/debugging/LocationImpl.java diff --git a/src/main/java/org/mockito/internal/debugging/LoggingListener.java b/mockito-core/src/main/java/org/mockito/internal/debugging/LoggingListener.java similarity index 100% rename from src/main/java/org/mockito/internal/debugging/LoggingListener.java rename to mockito-core/src/main/java/org/mockito/internal/debugging/LoggingListener.java diff --git a/src/main/java/org/mockito/internal/debugging/VerboseMockInvocationLogger.java b/mockito-core/src/main/java/org/mockito/internal/debugging/VerboseMockInvocationLogger.java similarity index 100% rename from src/main/java/org/mockito/internal/debugging/VerboseMockInvocationLogger.java rename to mockito-core/src/main/java/org/mockito/internal/debugging/VerboseMockInvocationLogger.java diff --git a/src/main/java/org/mockito/internal/debugging/WarningsFinder.java b/mockito-core/src/main/java/org/mockito/internal/debugging/WarningsFinder.java similarity index 100% rename from src/main/java/org/mockito/internal/debugging/WarningsFinder.java rename to mockito-core/src/main/java/org/mockito/internal/debugging/WarningsFinder.java diff --git a/src/main/java/org/mockito/internal/debugging/WarningsPrinterImpl.java b/mockito-core/src/main/java/org/mockito/internal/debugging/WarningsPrinterImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/debugging/WarningsPrinterImpl.java rename to mockito-core/src/main/java/org/mockito/internal/debugging/WarningsPrinterImpl.java diff --git a/src/main/java/org/mockito/internal/debugging/package-info.java b/mockito-core/src/main/java/org/mockito/internal/debugging/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/debugging/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/debugging/package-info.java diff --git a/src/main/java/org/mockito/internal/exceptions/ExceptionIncludingMockitoWarnings.java b/mockito-core/src/main/java/org/mockito/internal/exceptions/ExceptionIncludingMockitoWarnings.java similarity index 100% rename from src/main/java/org/mockito/internal/exceptions/ExceptionIncludingMockitoWarnings.java rename to mockito-core/src/main/java/org/mockito/internal/exceptions/ExceptionIncludingMockitoWarnings.java diff --git a/src/main/java/org/mockito/internal/exceptions/Reporter.java b/mockito-core/src/main/java/org/mockito/internal/exceptions/Reporter.java similarity index 100% rename from src/main/java/org/mockito/internal/exceptions/Reporter.java rename to mockito-core/src/main/java/org/mockito/internal/exceptions/Reporter.java diff --git a/src/main/java/org/mockito/internal/exceptions/VerificationAwareInvocation.java b/mockito-core/src/main/java/org/mockito/internal/exceptions/VerificationAwareInvocation.java similarity index 100% rename from src/main/java/org/mockito/internal/exceptions/VerificationAwareInvocation.java rename to mockito-core/src/main/java/org/mockito/internal/exceptions/VerificationAwareInvocation.java diff --git a/src/main/java/org/mockito/internal/exceptions/stacktrace/ConditionalStackTraceFilter.java b/mockito-core/src/main/java/org/mockito/internal/exceptions/stacktrace/ConditionalStackTraceFilter.java similarity index 100% rename from src/main/java/org/mockito/internal/exceptions/stacktrace/ConditionalStackTraceFilter.java rename to mockito-core/src/main/java/org/mockito/internal/exceptions/stacktrace/ConditionalStackTraceFilter.java diff --git a/src/main/java/org/mockito/internal/exceptions/stacktrace/DefaultStackTraceCleaner.java b/mockito-core/src/main/java/org/mockito/internal/exceptions/stacktrace/DefaultStackTraceCleaner.java similarity index 100% rename from src/main/java/org/mockito/internal/exceptions/stacktrace/DefaultStackTraceCleaner.java rename to mockito-core/src/main/java/org/mockito/internal/exceptions/stacktrace/DefaultStackTraceCleaner.java diff --git a/src/main/java/org/mockito/internal/exceptions/stacktrace/DefaultStackTraceCleanerProvider.java b/mockito-core/src/main/java/org/mockito/internal/exceptions/stacktrace/DefaultStackTraceCleanerProvider.java similarity index 100% rename from src/main/java/org/mockito/internal/exceptions/stacktrace/DefaultStackTraceCleanerProvider.java rename to mockito-core/src/main/java/org/mockito/internal/exceptions/stacktrace/DefaultStackTraceCleanerProvider.java diff --git a/src/main/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilter.java b/mockito-core/src/main/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilter.java similarity index 100% rename from src/main/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilter.java rename to mockito-core/src/main/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilter.java diff --git a/src/main/java/org/mockito/internal/exceptions/stacktrace/package-info.java b/mockito-core/src/main/java/org/mockito/internal/exceptions/stacktrace/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/exceptions/stacktrace/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/exceptions/stacktrace/package-info.java diff --git a/src/main/java/org/mockito/internal/exceptions/util/ScenarioPrinter.java b/mockito-core/src/main/java/org/mockito/internal/exceptions/util/ScenarioPrinter.java similarity index 100% rename from src/main/java/org/mockito/internal/exceptions/util/ScenarioPrinter.java rename to mockito-core/src/main/java/org/mockito/internal/exceptions/util/ScenarioPrinter.java diff --git a/src/main/java/org/mockito/internal/framework/DefaultMockitoFramework.java b/mockito-core/src/main/java/org/mockito/internal/framework/DefaultMockitoFramework.java similarity index 100% rename from src/main/java/org/mockito/internal/framework/DefaultMockitoFramework.java rename to mockito-core/src/main/java/org/mockito/internal/framework/DefaultMockitoFramework.java diff --git a/src/main/java/org/mockito/internal/framework/DefaultMockitoSession.java b/mockito-core/src/main/java/org/mockito/internal/framework/DefaultMockitoSession.java similarity index 100% rename from src/main/java/org/mockito/internal/framework/DefaultMockitoSession.java rename to mockito-core/src/main/java/org/mockito/internal/framework/DefaultMockitoSession.java diff --git a/src/main/java/org/mockito/internal/framework/DisabledMockHandler.java b/mockito-core/src/main/java/org/mockito/internal/framework/DisabledMockHandler.java similarity index 100% rename from src/main/java/org/mockito/internal/framework/DisabledMockHandler.java rename to mockito-core/src/main/java/org/mockito/internal/framework/DisabledMockHandler.java diff --git a/src/main/java/org/mockito/internal/hamcrest/HamcrestArgumentMatcher.java b/mockito-core/src/main/java/org/mockito/internal/hamcrest/HamcrestArgumentMatcher.java similarity index 100% rename from src/main/java/org/mockito/internal/hamcrest/HamcrestArgumentMatcher.java rename to mockito-core/src/main/java/org/mockito/internal/hamcrest/HamcrestArgumentMatcher.java diff --git a/src/main/java/org/mockito/internal/hamcrest/MatcherGenericTypeExtractor.java b/mockito-core/src/main/java/org/mockito/internal/hamcrest/MatcherGenericTypeExtractor.java similarity index 100% rename from src/main/java/org/mockito/internal/hamcrest/MatcherGenericTypeExtractor.java rename to mockito-core/src/main/java/org/mockito/internal/hamcrest/MatcherGenericTypeExtractor.java diff --git a/src/main/java/org/mockito/internal/handler/InvocationNotifierHandler.java b/mockito-core/src/main/java/org/mockito/internal/handler/InvocationNotifierHandler.java similarity index 100% rename from src/main/java/org/mockito/internal/handler/InvocationNotifierHandler.java rename to mockito-core/src/main/java/org/mockito/internal/handler/InvocationNotifierHandler.java diff --git a/src/main/java/org/mockito/internal/handler/MockHandlerFactory.java b/mockito-core/src/main/java/org/mockito/internal/handler/MockHandlerFactory.java similarity index 100% rename from src/main/java/org/mockito/internal/handler/MockHandlerFactory.java rename to mockito-core/src/main/java/org/mockito/internal/handler/MockHandlerFactory.java diff --git a/src/main/java/org/mockito/internal/handler/MockHandlerImpl.java b/mockito-core/src/main/java/org/mockito/internal/handler/MockHandlerImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/handler/MockHandlerImpl.java rename to mockito-core/src/main/java/org/mockito/internal/handler/MockHandlerImpl.java diff --git a/src/main/java/org/mockito/internal/handler/NotifiedMethodInvocationReport.java b/mockito-core/src/main/java/org/mockito/internal/handler/NotifiedMethodInvocationReport.java similarity index 100% rename from src/main/java/org/mockito/internal/handler/NotifiedMethodInvocationReport.java rename to mockito-core/src/main/java/org/mockito/internal/handler/NotifiedMethodInvocationReport.java diff --git a/src/main/java/org/mockito/internal/handler/NullResultGuardian.java b/mockito-core/src/main/java/org/mockito/internal/handler/NullResultGuardian.java similarity index 100% rename from src/main/java/org/mockito/internal/handler/NullResultGuardian.java rename to mockito-core/src/main/java/org/mockito/internal/handler/NullResultGuardian.java diff --git a/src/main/java/org/mockito/internal/invocation/AbstractAwareMethod.java b/mockito-core/src/main/java/org/mockito/internal/invocation/AbstractAwareMethod.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/AbstractAwareMethod.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/AbstractAwareMethod.java diff --git a/src/main/java/org/mockito/internal/invocation/ArgumentMatcherAction.java b/mockito-core/src/main/java/org/mockito/internal/invocation/ArgumentMatcherAction.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/ArgumentMatcherAction.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/ArgumentMatcherAction.java diff --git a/src/main/java/org/mockito/internal/invocation/ArgumentsProcessor.java b/mockito-core/src/main/java/org/mockito/internal/invocation/ArgumentsProcessor.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/ArgumentsProcessor.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/ArgumentsProcessor.java diff --git a/src/main/java/org/mockito/internal/invocation/DefaultInvocationFactory.java b/mockito-core/src/main/java/org/mockito/internal/invocation/DefaultInvocationFactory.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/DefaultInvocationFactory.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/DefaultInvocationFactory.java diff --git a/src/main/java/org/mockito/internal/invocation/InterceptedInvocation.java b/mockito-core/src/main/java/org/mockito/internal/invocation/InterceptedInvocation.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/InterceptedInvocation.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/InterceptedInvocation.java diff --git a/src/main/java/org/mockito/internal/invocation/InvocationComparator.java b/mockito-core/src/main/java/org/mockito/internal/invocation/InvocationComparator.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/InvocationComparator.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/InvocationComparator.java diff --git a/src/main/java/org/mockito/internal/invocation/InvocationMarker.java b/mockito-core/src/main/java/org/mockito/internal/invocation/InvocationMarker.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/InvocationMarker.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/InvocationMarker.java diff --git a/src/main/java/org/mockito/internal/invocation/InvocationMatcher.java b/mockito-core/src/main/java/org/mockito/internal/invocation/InvocationMatcher.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/InvocationMatcher.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/InvocationMatcher.java diff --git a/src/main/java/org/mockito/internal/invocation/InvocationsFinder.java b/mockito-core/src/main/java/org/mockito/internal/invocation/InvocationsFinder.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/InvocationsFinder.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/InvocationsFinder.java diff --git a/src/main/java/org/mockito/internal/invocation/MatcherApplicationStrategy.java b/mockito-core/src/main/java/org/mockito/internal/invocation/MatcherApplicationStrategy.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/MatcherApplicationStrategy.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/MatcherApplicationStrategy.java diff --git a/src/main/java/org/mockito/internal/invocation/MatchersBinder.java b/mockito-core/src/main/java/org/mockito/internal/invocation/MatchersBinder.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/MatchersBinder.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/MatchersBinder.java diff --git a/src/main/java/org/mockito/internal/invocation/MockitoMethod.java b/mockito-core/src/main/java/org/mockito/internal/invocation/MockitoMethod.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/MockitoMethod.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/MockitoMethod.java diff --git a/src/main/java/org/mockito/internal/invocation/RealMethod.java b/mockito-core/src/main/java/org/mockito/internal/invocation/RealMethod.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/RealMethod.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/RealMethod.java diff --git a/src/main/java/org/mockito/internal/invocation/SerializableMethod.java b/mockito-core/src/main/java/org/mockito/internal/invocation/SerializableMethod.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/SerializableMethod.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/SerializableMethod.java diff --git a/src/main/java/org/mockito/internal/invocation/StubInfoImpl.java b/mockito-core/src/main/java/org/mockito/internal/invocation/StubInfoImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/StubInfoImpl.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/StubInfoImpl.java diff --git a/src/main/java/org/mockito/internal/invocation/TypeSafeMatching.java b/mockito-core/src/main/java/org/mockito/internal/invocation/TypeSafeMatching.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/TypeSafeMatching.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/TypeSafeMatching.java diff --git a/src/main/java/org/mockito/internal/invocation/finder/AllInvocationsFinder.java b/mockito-core/src/main/java/org/mockito/internal/invocation/finder/AllInvocationsFinder.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/finder/AllInvocationsFinder.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/finder/AllInvocationsFinder.java diff --git a/src/main/java/org/mockito/internal/invocation/finder/VerifiableInvocationsFinder.java b/mockito-core/src/main/java/org/mockito/internal/invocation/finder/VerifiableInvocationsFinder.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/finder/VerifiableInvocationsFinder.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/finder/VerifiableInvocationsFinder.java diff --git a/src/main/java/org/mockito/internal/invocation/mockref/MockReference.java b/mockito-core/src/main/java/org/mockito/internal/invocation/mockref/MockReference.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/mockref/MockReference.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/mockref/MockReference.java diff --git a/src/main/java/org/mockito/internal/invocation/mockref/MockStrongReference.java b/mockito-core/src/main/java/org/mockito/internal/invocation/mockref/MockStrongReference.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/mockref/MockStrongReference.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/mockref/MockStrongReference.java diff --git a/src/main/java/org/mockito/internal/invocation/mockref/MockWeakReference.java b/mockito-core/src/main/java/org/mockito/internal/invocation/mockref/MockWeakReference.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/mockref/MockWeakReference.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/mockref/MockWeakReference.java diff --git a/src/main/java/org/mockito/internal/invocation/package-info.java b/mockito-core/src/main/java/org/mockito/internal/invocation/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/invocation/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/invocation/package-info.java diff --git a/src/main/java/org/mockito/internal/junit/ArgMismatchFinder.java b/mockito-core/src/main/java/org/mockito/internal/junit/ArgMismatchFinder.java similarity index 100% rename from src/main/java/org/mockito/internal/junit/ArgMismatchFinder.java rename to mockito-core/src/main/java/org/mockito/internal/junit/ArgMismatchFinder.java diff --git a/src/main/java/org/mockito/internal/junit/DefaultStubbingLookupListener.java b/mockito-core/src/main/java/org/mockito/internal/junit/DefaultStubbingLookupListener.java similarity index 100% rename from src/main/java/org/mockito/internal/junit/DefaultStubbingLookupListener.java rename to mockito-core/src/main/java/org/mockito/internal/junit/DefaultStubbingLookupListener.java diff --git a/src/main/java/org/mockito/internal/junit/DefaultTestFinishedEvent.java b/mockito-core/src/main/java/org/mockito/internal/junit/DefaultTestFinishedEvent.java similarity index 100% rename from src/main/java/org/mockito/internal/junit/DefaultTestFinishedEvent.java rename to mockito-core/src/main/java/org/mockito/internal/junit/DefaultTestFinishedEvent.java diff --git a/src/main/java/org/mockito/internal/junit/ExceptionFactory.java b/mockito-core/src/main/java/org/mockito/internal/junit/ExceptionFactory.java similarity index 100% rename from src/main/java/org/mockito/internal/junit/ExceptionFactory.java rename to mockito-core/src/main/java/org/mockito/internal/junit/ExceptionFactory.java diff --git a/src/main/java/org/mockito/internal/junit/JUnitRule.java b/mockito-core/src/main/java/org/mockito/internal/junit/JUnitRule.java similarity index 100% rename from src/main/java/org/mockito/internal/junit/JUnitRule.java rename to mockito-core/src/main/java/org/mockito/internal/junit/JUnitRule.java diff --git a/src/main/java/org/mockito/internal/junit/JUnitSessionStore.java b/mockito-core/src/main/java/org/mockito/internal/junit/JUnitSessionStore.java similarity index 100% rename from src/main/java/org/mockito/internal/junit/JUnitSessionStore.java rename to mockito-core/src/main/java/org/mockito/internal/junit/JUnitSessionStore.java diff --git a/src/main/java/org/mockito/internal/junit/JUnitTestRule.java b/mockito-core/src/main/java/org/mockito/internal/junit/JUnitTestRule.java similarity index 100% rename from src/main/java/org/mockito/internal/junit/JUnitTestRule.java rename to mockito-core/src/main/java/org/mockito/internal/junit/JUnitTestRule.java diff --git a/src/main/java/org/mockito/internal/junit/MismatchReportingTestListener.java b/mockito-core/src/main/java/org/mockito/internal/junit/MismatchReportingTestListener.java similarity index 100% rename from src/main/java/org/mockito/internal/junit/MismatchReportingTestListener.java rename to mockito-core/src/main/java/org/mockito/internal/junit/MismatchReportingTestListener.java diff --git a/src/main/java/org/mockito/internal/junit/MockitoTestListener.java b/mockito-core/src/main/java/org/mockito/internal/junit/MockitoTestListener.java similarity index 100% rename from src/main/java/org/mockito/internal/junit/MockitoTestListener.java rename to mockito-core/src/main/java/org/mockito/internal/junit/MockitoTestListener.java diff --git a/src/main/java/org/mockito/internal/junit/NoOpTestListener.java b/mockito-core/src/main/java/org/mockito/internal/junit/NoOpTestListener.java similarity index 100% rename from src/main/java/org/mockito/internal/junit/NoOpTestListener.java rename to mockito-core/src/main/java/org/mockito/internal/junit/NoOpTestListener.java diff --git a/src/main/java/org/mockito/internal/junit/StrictStubsRunnerTestListener.java b/mockito-core/src/main/java/org/mockito/internal/junit/StrictStubsRunnerTestListener.java similarity index 100% rename from src/main/java/org/mockito/internal/junit/StrictStubsRunnerTestListener.java rename to mockito-core/src/main/java/org/mockito/internal/junit/StrictStubsRunnerTestListener.java diff --git a/src/main/java/org/mockito/internal/junit/StubbingArgMismatches.java b/mockito-core/src/main/java/org/mockito/internal/junit/StubbingArgMismatches.java similarity index 100% rename from src/main/java/org/mockito/internal/junit/StubbingArgMismatches.java rename to mockito-core/src/main/java/org/mockito/internal/junit/StubbingArgMismatches.java diff --git a/src/main/java/org/mockito/internal/junit/StubbingHint.java b/mockito-core/src/main/java/org/mockito/internal/junit/StubbingHint.java similarity index 100% rename from src/main/java/org/mockito/internal/junit/StubbingHint.java rename to mockito-core/src/main/java/org/mockito/internal/junit/StubbingHint.java diff --git a/src/main/java/org/mockito/internal/junit/TestFinishedEvent.java b/mockito-core/src/main/java/org/mockito/internal/junit/TestFinishedEvent.java similarity index 100% rename from src/main/java/org/mockito/internal/junit/TestFinishedEvent.java rename to mockito-core/src/main/java/org/mockito/internal/junit/TestFinishedEvent.java diff --git a/src/main/java/org/mockito/internal/junit/UniversalTestListener.java b/mockito-core/src/main/java/org/mockito/internal/junit/UniversalTestListener.java similarity index 100% rename from src/main/java/org/mockito/internal/junit/UniversalTestListener.java rename to mockito-core/src/main/java/org/mockito/internal/junit/UniversalTestListener.java diff --git a/src/main/java/org/mockito/internal/junit/UnnecessaryStubbingsReporter.java b/mockito-core/src/main/java/org/mockito/internal/junit/UnnecessaryStubbingsReporter.java similarity index 100% rename from src/main/java/org/mockito/internal/junit/UnnecessaryStubbingsReporter.java rename to mockito-core/src/main/java/org/mockito/internal/junit/UnnecessaryStubbingsReporter.java diff --git a/src/main/java/org/mockito/internal/junit/UnusedStubbings.java b/mockito-core/src/main/java/org/mockito/internal/junit/UnusedStubbings.java similarity index 100% rename from src/main/java/org/mockito/internal/junit/UnusedStubbings.java rename to mockito-core/src/main/java/org/mockito/internal/junit/UnusedStubbings.java diff --git a/src/main/java/org/mockito/internal/junit/UnusedStubbingsFinder.java b/mockito-core/src/main/java/org/mockito/internal/junit/UnusedStubbingsFinder.java similarity index 100% rename from src/main/java/org/mockito/internal/junit/UnusedStubbingsFinder.java rename to mockito-core/src/main/java/org/mockito/internal/junit/UnusedStubbingsFinder.java diff --git a/src/main/java/org/mockito/internal/junit/VerificationCollectorImpl.java b/mockito-core/src/main/java/org/mockito/internal/junit/VerificationCollectorImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/junit/VerificationCollectorImpl.java rename to mockito-core/src/main/java/org/mockito/internal/junit/VerificationCollectorImpl.java diff --git a/src/main/java/org/mockito/internal/junit/package-info.java b/mockito-core/src/main/java/org/mockito/internal/junit/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/junit/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/junit/package-info.java diff --git a/src/main/java/org/mockito/internal/listeners/AutoCleanableListener.java b/mockito-core/src/main/java/org/mockito/internal/listeners/AutoCleanableListener.java similarity index 100% rename from src/main/java/org/mockito/internal/listeners/AutoCleanableListener.java rename to mockito-core/src/main/java/org/mockito/internal/listeners/AutoCleanableListener.java diff --git a/src/main/java/org/mockito/internal/listeners/StubbingLookupNotifier.java b/mockito-core/src/main/java/org/mockito/internal/listeners/StubbingLookupNotifier.java similarity index 100% rename from src/main/java/org/mockito/internal/listeners/StubbingLookupNotifier.java rename to mockito-core/src/main/java/org/mockito/internal/listeners/StubbingLookupNotifier.java diff --git a/src/main/java/org/mockito/internal/listeners/VerificationStartedNotifier.java b/mockito-core/src/main/java/org/mockito/internal/listeners/VerificationStartedNotifier.java similarity index 100% rename from src/main/java/org/mockito/internal/listeners/VerificationStartedNotifier.java rename to mockito-core/src/main/java/org/mockito/internal/listeners/VerificationStartedNotifier.java diff --git a/src/main/java/org/mockito/internal/matchers/And.java b/mockito-core/src/main/java/org/mockito/internal/matchers/And.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/And.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/And.java diff --git a/src/main/java/org/mockito/internal/matchers/Any.java b/mockito-core/src/main/java/org/mockito/internal/matchers/Any.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/Any.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/Any.java diff --git a/src/main/java/org/mockito/internal/matchers/ArrayEquals.java b/mockito-core/src/main/java/org/mockito/internal/matchers/ArrayEquals.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/ArrayEquals.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/ArrayEquals.java diff --git a/src/main/java/org/mockito/internal/matchers/CapturesArguments.java b/mockito-core/src/main/java/org/mockito/internal/matchers/CapturesArguments.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/CapturesArguments.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/CapturesArguments.java diff --git a/src/main/java/org/mockito/internal/matchers/CapturingMatcher.java b/mockito-core/src/main/java/org/mockito/internal/matchers/CapturingMatcher.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/CapturingMatcher.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/CapturingMatcher.java diff --git a/src/main/java/org/mockito/internal/matchers/CompareEqual.java b/mockito-core/src/main/java/org/mockito/internal/matchers/CompareEqual.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/CompareEqual.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/CompareEqual.java diff --git a/src/main/java/org/mockito/internal/matchers/CompareTo.java b/mockito-core/src/main/java/org/mockito/internal/matchers/CompareTo.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/CompareTo.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/CompareTo.java diff --git a/src/main/java/org/mockito/internal/matchers/Contains.java b/mockito-core/src/main/java/org/mockito/internal/matchers/Contains.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/Contains.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/Contains.java diff --git a/src/main/java/org/mockito/internal/matchers/ContainsExtraTypeInfo.java b/mockito-core/src/main/java/org/mockito/internal/matchers/ContainsExtraTypeInfo.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/ContainsExtraTypeInfo.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/ContainsExtraTypeInfo.java diff --git a/src/main/java/org/mockito/internal/matchers/EndsWith.java b/mockito-core/src/main/java/org/mockito/internal/matchers/EndsWith.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/EndsWith.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/EndsWith.java diff --git a/src/main/java/org/mockito/internal/matchers/Equality.java b/mockito-core/src/main/java/org/mockito/internal/matchers/Equality.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/Equality.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/Equality.java diff --git a/src/main/java/org/mockito/internal/matchers/Equals.java b/mockito-core/src/main/java/org/mockito/internal/matchers/Equals.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/Equals.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/Equals.java diff --git a/src/main/java/org/mockito/internal/matchers/EqualsWithDelta.java b/mockito-core/src/main/java/org/mockito/internal/matchers/EqualsWithDelta.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/EqualsWithDelta.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/EqualsWithDelta.java diff --git a/src/main/java/org/mockito/internal/matchers/Find.java b/mockito-core/src/main/java/org/mockito/internal/matchers/Find.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/Find.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/Find.java diff --git a/src/main/java/org/mockito/internal/matchers/GreaterOrEqual.java b/mockito-core/src/main/java/org/mockito/internal/matchers/GreaterOrEqual.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/GreaterOrEqual.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/GreaterOrEqual.java diff --git a/src/main/java/org/mockito/internal/matchers/GreaterThan.java b/mockito-core/src/main/java/org/mockito/internal/matchers/GreaterThan.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/GreaterThan.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/GreaterThan.java diff --git a/src/main/java/org/mockito/internal/matchers/InstanceOf.java b/mockito-core/src/main/java/org/mockito/internal/matchers/InstanceOf.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/InstanceOf.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/InstanceOf.java diff --git a/src/main/java/org/mockito/internal/matchers/LessOrEqual.java b/mockito-core/src/main/java/org/mockito/internal/matchers/LessOrEqual.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/LessOrEqual.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/LessOrEqual.java diff --git a/src/main/java/org/mockito/internal/matchers/LessThan.java b/mockito-core/src/main/java/org/mockito/internal/matchers/LessThan.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/LessThan.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/LessThan.java diff --git a/src/main/java/org/mockito/internal/matchers/LocalizedMatcher.java b/mockito-core/src/main/java/org/mockito/internal/matchers/LocalizedMatcher.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/LocalizedMatcher.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/LocalizedMatcher.java diff --git a/src/main/java/org/mockito/internal/matchers/Matches.java b/mockito-core/src/main/java/org/mockito/internal/matchers/Matches.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/Matches.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/Matches.java diff --git a/src/main/java/org/mockito/internal/matchers/Not.java b/mockito-core/src/main/java/org/mockito/internal/matchers/Not.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/Not.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/Not.java diff --git a/src/main/java/org/mockito/internal/matchers/NotNull.java b/mockito-core/src/main/java/org/mockito/internal/matchers/NotNull.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/NotNull.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/NotNull.java diff --git a/src/main/java/org/mockito/internal/matchers/Null.java b/mockito-core/src/main/java/org/mockito/internal/matchers/Null.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/Null.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/Null.java diff --git a/src/main/java/org/mockito/internal/matchers/Or.java b/mockito-core/src/main/java/org/mockito/internal/matchers/Or.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/Or.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/Or.java diff --git a/src/main/java/org/mockito/internal/matchers/Same.java b/mockito-core/src/main/java/org/mockito/internal/matchers/Same.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/Same.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/Same.java diff --git a/src/main/java/org/mockito/internal/matchers/StartsWith.java b/mockito-core/src/main/java/org/mockito/internal/matchers/StartsWith.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/StartsWith.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/StartsWith.java diff --git a/src/main/java/org/mockito/internal/matchers/apachecommons/EqualsBuilder.java b/mockito-core/src/main/java/org/mockito/internal/matchers/apachecommons/EqualsBuilder.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/apachecommons/EqualsBuilder.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/apachecommons/EqualsBuilder.java diff --git a/src/main/java/org/mockito/internal/matchers/apachecommons/ReflectionEquals.java b/mockito-core/src/main/java/org/mockito/internal/matchers/apachecommons/ReflectionEquals.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/apachecommons/ReflectionEquals.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/apachecommons/ReflectionEquals.java diff --git a/src/main/java/org/mockito/internal/matchers/apachecommons/commons-lang-license.txt b/mockito-core/src/main/java/org/mockito/internal/matchers/apachecommons/commons-lang-license.txt similarity index 100% rename from src/main/java/org/mockito/internal/matchers/apachecommons/commons-lang-license.txt rename to mockito-core/src/main/java/org/mockito/internal/matchers/apachecommons/commons-lang-license.txt diff --git a/src/main/java/org/mockito/internal/matchers/apachecommons/package-info.java b/mockito-core/src/main/java/org/mockito/internal/matchers/apachecommons/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/apachecommons/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/apachecommons/package-info.java diff --git a/src/main/java/org/mockito/internal/matchers/package-info.java b/mockito-core/src/main/java/org/mockito/internal/matchers/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/package-info.java diff --git a/src/main/java/org/mockito/internal/matchers/text/FormattedText.java b/mockito-core/src/main/java/org/mockito/internal/matchers/text/FormattedText.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/text/FormattedText.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/text/FormattedText.java diff --git a/src/main/java/org/mockito/internal/matchers/text/MatcherToString.java b/mockito-core/src/main/java/org/mockito/internal/matchers/text/MatcherToString.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/text/MatcherToString.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/text/MatcherToString.java diff --git a/src/main/java/org/mockito/internal/matchers/text/MatchersPrinter.java b/mockito-core/src/main/java/org/mockito/internal/matchers/text/MatchersPrinter.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/text/MatchersPrinter.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/text/MatchersPrinter.java diff --git a/src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java b/mockito-core/src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java similarity index 100% rename from src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java rename to mockito-core/src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java diff --git a/src/main/java/org/mockito/internal/package-info.java b/mockito-core/src/main/java/org/mockito/internal/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/package-info.java diff --git a/src/main/java/org/mockito/internal/progress/ArgumentMatcherStorage.java b/mockito-core/src/main/java/org/mockito/internal/progress/ArgumentMatcherStorage.java similarity index 100% rename from src/main/java/org/mockito/internal/progress/ArgumentMatcherStorage.java rename to mockito-core/src/main/java/org/mockito/internal/progress/ArgumentMatcherStorage.java diff --git a/src/main/java/org/mockito/internal/progress/ArgumentMatcherStorageImpl.java b/mockito-core/src/main/java/org/mockito/internal/progress/ArgumentMatcherStorageImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/progress/ArgumentMatcherStorageImpl.java rename to mockito-core/src/main/java/org/mockito/internal/progress/ArgumentMatcherStorageImpl.java diff --git a/src/main/java/org/mockito/internal/progress/MockingProgress.java b/mockito-core/src/main/java/org/mockito/internal/progress/MockingProgress.java similarity index 100% rename from src/main/java/org/mockito/internal/progress/MockingProgress.java rename to mockito-core/src/main/java/org/mockito/internal/progress/MockingProgress.java diff --git a/src/main/java/org/mockito/internal/progress/MockingProgressImpl.java b/mockito-core/src/main/java/org/mockito/internal/progress/MockingProgressImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/progress/MockingProgressImpl.java rename to mockito-core/src/main/java/org/mockito/internal/progress/MockingProgressImpl.java diff --git a/src/main/java/org/mockito/internal/progress/SequenceNumber.java b/mockito-core/src/main/java/org/mockito/internal/progress/SequenceNumber.java similarity index 100% rename from src/main/java/org/mockito/internal/progress/SequenceNumber.java rename to mockito-core/src/main/java/org/mockito/internal/progress/SequenceNumber.java diff --git a/src/main/java/org/mockito/internal/progress/ThreadSafeMockingProgress.java b/mockito-core/src/main/java/org/mockito/internal/progress/ThreadSafeMockingProgress.java similarity index 100% rename from src/main/java/org/mockito/internal/progress/ThreadSafeMockingProgress.java rename to mockito-core/src/main/java/org/mockito/internal/progress/ThreadSafeMockingProgress.java diff --git a/src/main/java/org/mockito/internal/progress/package-info.java b/mockito-core/src/main/java/org/mockito/internal/progress/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/progress/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/progress/package-info.java diff --git a/src/main/java/org/mockito/internal/reporting/Discrepancy.java b/mockito-core/src/main/java/org/mockito/internal/reporting/Discrepancy.java similarity index 100% rename from src/main/java/org/mockito/internal/reporting/Discrepancy.java rename to mockito-core/src/main/java/org/mockito/internal/reporting/Discrepancy.java diff --git a/src/main/java/org/mockito/internal/reporting/Pluralizer.java b/mockito-core/src/main/java/org/mockito/internal/reporting/Pluralizer.java similarity index 100% rename from src/main/java/org/mockito/internal/reporting/Pluralizer.java rename to mockito-core/src/main/java/org/mockito/internal/reporting/Pluralizer.java diff --git a/src/main/java/org/mockito/internal/reporting/PrintSettings.java b/mockito-core/src/main/java/org/mockito/internal/reporting/PrintSettings.java similarity index 100% rename from src/main/java/org/mockito/internal/reporting/PrintSettings.java rename to mockito-core/src/main/java/org/mockito/internal/reporting/PrintSettings.java diff --git a/src/main/java/org/mockito/internal/reporting/SmartPrinter.java b/mockito-core/src/main/java/org/mockito/internal/reporting/SmartPrinter.java similarity index 100% rename from src/main/java/org/mockito/internal/reporting/SmartPrinter.java rename to mockito-core/src/main/java/org/mockito/internal/reporting/SmartPrinter.java diff --git a/src/main/java/org/mockito/internal/reporting/package-info.java b/mockito-core/src/main/java/org/mockito/internal/reporting/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/reporting/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/reporting/package-info.java diff --git a/src/main/java/org/mockito/internal/runners/DefaultInternalRunner.java b/mockito-core/src/main/java/org/mockito/internal/runners/DefaultInternalRunner.java similarity index 100% rename from src/main/java/org/mockito/internal/runners/DefaultInternalRunner.java rename to mockito-core/src/main/java/org/mockito/internal/runners/DefaultInternalRunner.java diff --git a/src/main/java/org/mockito/internal/runners/InternalRunner.java b/mockito-core/src/main/java/org/mockito/internal/runners/InternalRunner.java similarity index 100% rename from src/main/java/org/mockito/internal/runners/InternalRunner.java rename to mockito-core/src/main/java/org/mockito/internal/runners/InternalRunner.java diff --git a/src/main/java/org/mockito/internal/runners/RunnerFactory.java b/mockito-core/src/main/java/org/mockito/internal/runners/RunnerFactory.java similarity index 100% rename from src/main/java/org/mockito/internal/runners/RunnerFactory.java rename to mockito-core/src/main/java/org/mockito/internal/runners/RunnerFactory.java diff --git a/src/main/java/org/mockito/internal/runners/StrictRunner.java b/mockito-core/src/main/java/org/mockito/internal/runners/StrictRunner.java similarity index 100% rename from src/main/java/org/mockito/internal/runners/StrictRunner.java rename to mockito-core/src/main/java/org/mockito/internal/runners/StrictRunner.java diff --git a/src/main/java/org/mockito/internal/runners/package-info.java b/mockito-core/src/main/java/org/mockito/internal/runners/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/runners/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/runners/package-info.java diff --git a/src/main/java/org/mockito/internal/runners/util/FailureDetector.java b/mockito-core/src/main/java/org/mockito/internal/runners/util/FailureDetector.java similarity index 100% rename from src/main/java/org/mockito/internal/runners/util/FailureDetector.java rename to mockito-core/src/main/java/org/mockito/internal/runners/util/FailureDetector.java diff --git a/src/main/java/org/mockito/internal/runners/util/RunnerProvider.java b/mockito-core/src/main/java/org/mockito/internal/runners/util/RunnerProvider.java similarity index 100% rename from src/main/java/org/mockito/internal/runners/util/RunnerProvider.java rename to mockito-core/src/main/java/org/mockito/internal/runners/util/RunnerProvider.java diff --git a/src/main/java/org/mockito/internal/runners/util/TestMethodsFinder.java b/mockito-core/src/main/java/org/mockito/internal/runners/util/TestMethodsFinder.java similarity index 100% rename from src/main/java/org/mockito/internal/runners/util/TestMethodsFinder.java rename to mockito-core/src/main/java/org/mockito/internal/runners/util/TestMethodsFinder.java diff --git a/src/main/java/org/mockito/internal/runners/util/package-info.java b/mockito-core/src/main/java/org/mockito/internal/runners/util/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/runners/util/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/runners/util/package-info.java diff --git a/src/main/java/org/mockito/internal/session/DefaultMockitoSessionBuilder.java b/mockito-core/src/main/java/org/mockito/internal/session/DefaultMockitoSessionBuilder.java similarity index 100% rename from src/main/java/org/mockito/internal/session/DefaultMockitoSessionBuilder.java rename to mockito-core/src/main/java/org/mockito/internal/session/DefaultMockitoSessionBuilder.java diff --git a/src/main/java/org/mockito/internal/session/MockitoLoggerAdapter.java b/mockito-core/src/main/java/org/mockito/internal/session/MockitoLoggerAdapter.java similarity index 100% rename from src/main/java/org/mockito/internal/session/MockitoLoggerAdapter.java rename to mockito-core/src/main/java/org/mockito/internal/session/MockitoLoggerAdapter.java diff --git a/src/main/java/org/mockito/internal/session/MockitoSessionLoggerAdapter.java b/mockito-core/src/main/java/org/mockito/internal/session/MockitoSessionLoggerAdapter.java similarity index 100% rename from src/main/java/org/mockito/internal/session/MockitoSessionLoggerAdapter.java rename to mockito-core/src/main/java/org/mockito/internal/session/MockitoSessionLoggerAdapter.java diff --git a/src/main/java/org/mockito/internal/stubbing/BaseStubbing.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/BaseStubbing.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/BaseStubbing.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/BaseStubbing.java diff --git a/src/main/java/org/mockito/internal/stubbing/ConsecutiveStubbing.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/ConsecutiveStubbing.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/ConsecutiveStubbing.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/ConsecutiveStubbing.java diff --git a/src/main/java/org/mockito/internal/stubbing/DefaultLenientStubber.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/DefaultLenientStubber.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/DefaultLenientStubber.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/DefaultLenientStubber.java diff --git a/src/main/java/org/mockito/internal/stubbing/DoAnswerStyleStubbing.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/DoAnswerStyleStubbing.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/DoAnswerStyleStubbing.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/DoAnswerStyleStubbing.java diff --git a/src/main/java/org/mockito/internal/stubbing/InvocationContainerImpl.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/InvocationContainerImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/InvocationContainerImpl.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/InvocationContainerImpl.java diff --git a/src/main/java/org/mockito/internal/stubbing/OngoingStubbingImpl.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/OngoingStubbingImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/OngoingStubbingImpl.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/OngoingStubbingImpl.java diff --git a/src/main/java/org/mockito/internal/stubbing/StrictnessSelector.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/StrictnessSelector.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/StrictnessSelector.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/StrictnessSelector.java diff --git a/src/main/java/org/mockito/internal/stubbing/StubbedInvocationMatcher.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/StubbedInvocationMatcher.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/StubbedInvocationMatcher.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/StubbedInvocationMatcher.java diff --git a/src/main/java/org/mockito/internal/stubbing/StubberImpl.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/StubberImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/StubberImpl.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/StubberImpl.java diff --git a/src/main/java/org/mockito/internal/stubbing/StubbingComparator.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/StubbingComparator.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/StubbingComparator.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/StubbingComparator.java diff --git a/src/main/java/org/mockito/internal/stubbing/UnusedStubbingReporting.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/UnusedStubbingReporting.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/UnusedStubbingReporting.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/UnusedStubbingReporting.java diff --git a/src/main/java/org/mockito/internal/stubbing/answers/AbstractThrowsException.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/answers/AbstractThrowsException.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/answers/AbstractThrowsException.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/answers/AbstractThrowsException.java diff --git a/src/main/java/org/mockito/internal/stubbing/answers/AnswerFunctionalInterfaces.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/answers/AnswerFunctionalInterfaces.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/answers/AnswerFunctionalInterfaces.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/answers/AnswerFunctionalInterfaces.java diff --git a/src/main/java/org/mockito/internal/stubbing/answers/AnswersWithDelay.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/answers/AnswersWithDelay.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/answers/AnswersWithDelay.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/answers/AnswersWithDelay.java diff --git a/src/main/java/org/mockito/internal/stubbing/answers/CallsRealMethods.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/answers/CallsRealMethods.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/answers/CallsRealMethods.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/answers/CallsRealMethods.java diff --git a/src/main/java/org/mockito/internal/stubbing/answers/ClonesArguments.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/answers/ClonesArguments.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/answers/ClonesArguments.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/answers/ClonesArguments.java diff --git a/src/main/java/org/mockito/internal/stubbing/answers/DefaultAnswerValidator.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/answers/DefaultAnswerValidator.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/answers/DefaultAnswerValidator.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/answers/DefaultAnswerValidator.java diff --git a/src/main/java/org/mockito/internal/stubbing/answers/DoesNothing.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/answers/DoesNothing.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/answers/DoesNothing.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/answers/DoesNothing.java diff --git a/src/main/java/org/mockito/internal/stubbing/answers/InvocationInfo.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/answers/InvocationInfo.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/answers/InvocationInfo.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/answers/InvocationInfo.java diff --git a/src/main/java/org/mockito/internal/stubbing/answers/Returns.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/answers/Returns.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/answers/Returns.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/answers/Returns.java diff --git a/src/main/java/org/mockito/internal/stubbing/answers/ReturnsArgumentAt.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/answers/ReturnsArgumentAt.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/answers/ReturnsArgumentAt.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/answers/ReturnsArgumentAt.java diff --git a/src/main/java/org/mockito/internal/stubbing/answers/ReturnsElementsOf.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/answers/ReturnsElementsOf.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/answers/ReturnsElementsOf.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/answers/ReturnsElementsOf.java diff --git a/src/main/java/org/mockito/internal/stubbing/answers/ThrowsException.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/answers/ThrowsException.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/answers/ThrowsException.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/answers/ThrowsException.java diff --git a/src/main/java/org/mockito/internal/stubbing/answers/ThrowsExceptionForClassType.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/answers/ThrowsExceptionForClassType.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/answers/ThrowsExceptionForClassType.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/answers/ThrowsExceptionForClassType.java diff --git a/src/main/java/org/mockito/internal/stubbing/answers/package-info.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/answers/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/answers/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/answers/package-info.java diff --git a/src/main/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocations.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocations.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocations.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocations.java diff --git a/src/main/java/org/mockito/internal/stubbing/defaultanswers/GloballyConfiguredAnswer.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/defaultanswers/GloballyConfiguredAnswer.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/defaultanswers/GloballyConfiguredAnswer.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/defaultanswers/GloballyConfiguredAnswer.java diff --git a/src/main/java/org/mockito/internal/stubbing/defaultanswers/RetrieveGenericsForDefaultAnswers.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/defaultanswers/RetrieveGenericsForDefaultAnswers.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/defaultanswers/RetrieveGenericsForDefaultAnswers.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/defaultanswers/RetrieveGenericsForDefaultAnswers.java diff --git a/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsDeepStubs.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsDeepStubs.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsDeepStubs.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsDeepStubs.java diff --git a/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsEmptyValues.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsEmptyValues.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsEmptyValues.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsEmptyValues.java diff --git a/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMocks.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMocks.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMocks.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMocks.java diff --git a/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMoreEmptyValues.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMoreEmptyValues.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMoreEmptyValues.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMoreEmptyValues.java diff --git a/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java diff --git a/src/main/java/org/mockito/internal/stubbing/defaultanswers/TriesToReturnSelf.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/defaultanswers/TriesToReturnSelf.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/defaultanswers/TriesToReturnSelf.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/defaultanswers/TriesToReturnSelf.java diff --git a/src/main/java/org/mockito/internal/stubbing/defaultanswers/package-info.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/defaultanswers/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/defaultanswers/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/defaultanswers/package-info.java diff --git a/src/main/java/org/mockito/internal/stubbing/package-info.java b/mockito-core/src/main/java/org/mockito/internal/stubbing/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/stubbing/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/stubbing/package-info.java diff --git a/src/main/java/org/mockito/internal/util/Checks.java b/mockito-core/src/main/java/org/mockito/internal/util/Checks.java similarity index 100% rename from src/main/java/org/mockito/internal/util/Checks.java rename to mockito-core/src/main/java/org/mockito/internal/util/Checks.java diff --git a/src/main/java/org/mockito/internal/util/ConsoleMockitoLogger.java b/mockito-core/src/main/java/org/mockito/internal/util/ConsoleMockitoLogger.java similarity index 100% rename from src/main/java/org/mockito/internal/util/ConsoleMockitoLogger.java rename to mockito-core/src/main/java/org/mockito/internal/util/ConsoleMockitoLogger.java diff --git a/src/main/java/org/mockito/internal/util/DefaultMockingDetails.java b/mockito-core/src/main/java/org/mockito/internal/util/DefaultMockingDetails.java similarity index 100% rename from src/main/java/org/mockito/internal/util/DefaultMockingDetails.java rename to mockito-core/src/main/java/org/mockito/internal/util/DefaultMockingDetails.java diff --git a/src/main/java/org/mockito/internal/util/KotlinInlineClassUtil.java b/mockito-core/src/main/java/org/mockito/internal/util/KotlinInlineClassUtil.java similarity index 100% rename from src/main/java/org/mockito/internal/util/KotlinInlineClassUtil.java rename to mockito-core/src/main/java/org/mockito/internal/util/KotlinInlineClassUtil.java diff --git a/src/main/java/org/mockito/internal/util/MockCreationValidator.java b/mockito-core/src/main/java/org/mockito/internal/util/MockCreationValidator.java similarity index 100% rename from src/main/java/org/mockito/internal/util/MockCreationValidator.java rename to mockito-core/src/main/java/org/mockito/internal/util/MockCreationValidator.java diff --git a/src/main/java/org/mockito/internal/util/MockNameImpl.java b/mockito-core/src/main/java/org/mockito/internal/util/MockNameImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/util/MockNameImpl.java rename to mockito-core/src/main/java/org/mockito/internal/util/MockNameImpl.java diff --git a/src/main/java/org/mockito/internal/util/MockUtil.java b/mockito-core/src/main/java/org/mockito/internal/util/MockUtil.java similarity index 100% rename from src/main/java/org/mockito/internal/util/MockUtil.java rename to mockito-core/src/main/java/org/mockito/internal/util/MockUtil.java diff --git a/src/main/java/org/mockito/internal/util/ObjectMethodsGuru.java b/mockito-core/src/main/java/org/mockito/internal/util/ObjectMethodsGuru.java similarity index 100% rename from src/main/java/org/mockito/internal/util/ObjectMethodsGuru.java rename to mockito-core/src/main/java/org/mockito/internal/util/ObjectMethodsGuru.java diff --git a/src/main/java/org/mockito/internal/util/Platform.java b/mockito-core/src/main/java/org/mockito/internal/util/Platform.java similarity index 100% rename from src/main/java/org/mockito/internal/util/Platform.java rename to mockito-core/src/main/java/org/mockito/internal/util/Platform.java diff --git a/src/main/java/org/mockito/internal/util/Primitives.java b/mockito-core/src/main/java/org/mockito/internal/util/Primitives.java similarity index 100% rename from src/main/java/org/mockito/internal/util/Primitives.java rename to mockito-core/src/main/java/org/mockito/internal/util/Primitives.java diff --git a/src/main/java/org/mockito/internal/util/StringUtil.java b/mockito-core/src/main/java/org/mockito/internal/util/StringUtil.java similarity index 100% rename from src/main/java/org/mockito/internal/util/StringUtil.java rename to mockito-core/src/main/java/org/mockito/internal/util/StringUtil.java diff --git a/src/main/java/org/mockito/internal/util/Supplier.java b/mockito-core/src/main/java/org/mockito/internal/util/Supplier.java similarity index 100% rename from src/main/java/org/mockito/internal/util/Supplier.java rename to mockito-core/src/main/java/org/mockito/internal/util/Supplier.java diff --git a/src/main/java/org/mockito/internal/util/Timer.java b/mockito-core/src/main/java/org/mockito/internal/util/Timer.java similarity index 100% rename from src/main/java/org/mockito/internal/util/Timer.java rename to mockito-core/src/main/java/org/mockito/internal/util/Timer.java diff --git a/src/main/java/org/mockito/internal/util/collections/HashCodeAndEqualsMockWrapper.java b/mockito-core/src/main/java/org/mockito/internal/util/collections/HashCodeAndEqualsMockWrapper.java similarity index 100% rename from src/main/java/org/mockito/internal/util/collections/HashCodeAndEqualsMockWrapper.java rename to mockito-core/src/main/java/org/mockito/internal/util/collections/HashCodeAndEqualsMockWrapper.java diff --git a/src/main/java/org/mockito/internal/util/collections/HashCodeAndEqualsSafeSet.java b/mockito-core/src/main/java/org/mockito/internal/util/collections/HashCodeAndEqualsSafeSet.java similarity index 100% rename from src/main/java/org/mockito/internal/util/collections/HashCodeAndEqualsSafeSet.java rename to mockito-core/src/main/java/org/mockito/internal/util/collections/HashCodeAndEqualsSafeSet.java diff --git a/src/main/java/org/mockito/internal/util/collections/IdentitySet.java b/mockito-core/src/main/java/org/mockito/internal/util/collections/IdentitySet.java similarity index 100% rename from src/main/java/org/mockito/internal/util/collections/IdentitySet.java rename to mockito-core/src/main/java/org/mockito/internal/util/collections/IdentitySet.java diff --git a/src/main/java/org/mockito/internal/util/collections/Iterables.java b/mockito-core/src/main/java/org/mockito/internal/util/collections/Iterables.java similarity index 100% rename from src/main/java/org/mockito/internal/util/collections/Iterables.java rename to mockito-core/src/main/java/org/mockito/internal/util/collections/Iterables.java diff --git a/src/main/java/org/mockito/internal/util/collections/Sets.java b/mockito-core/src/main/java/org/mockito/internal/util/collections/Sets.java similarity index 100% rename from src/main/java/org/mockito/internal/util/collections/Sets.java rename to mockito-core/src/main/java/org/mockito/internal/util/collections/Sets.java diff --git a/src/main/java/org/mockito/internal/util/concurrent/DetachedThreadLocal.java b/mockito-core/src/main/java/org/mockito/internal/util/concurrent/DetachedThreadLocal.java similarity index 100% rename from src/main/java/org/mockito/internal/util/concurrent/DetachedThreadLocal.java rename to mockito-core/src/main/java/org/mockito/internal/util/concurrent/DetachedThreadLocal.java diff --git a/src/main/java/org/mockito/internal/util/concurrent/LICENSE b/mockito-core/src/main/java/org/mockito/internal/util/concurrent/LICENSE similarity index 100% rename from src/main/java/org/mockito/internal/util/concurrent/LICENSE rename to mockito-core/src/main/java/org/mockito/internal/util/concurrent/LICENSE diff --git a/src/main/java/org/mockito/internal/util/concurrent/README.md b/mockito-core/src/main/java/org/mockito/internal/util/concurrent/README.md similarity index 100% rename from src/main/java/org/mockito/internal/util/concurrent/README.md rename to mockito-core/src/main/java/org/mockito/internal/util/concurrent/README.md diff --git a/src/main/java/org/mockito/internal/util/concurrent/WeakConcurrentMap.java b/mockito-core/src/main/java/org/mockito/internal/util/concurrent/WeakConcurrentMap.java similarity index 100% rename from src/main/java/org/mockito/internal/util/concurrent/WeakConcurrentMap.java rename to mockito-core/src/main/java/org/mockito/internal/util/concurrent/WeakConcurrentMap.java diff --git a/src/main/java/org/mockito/internal/util/concurrent/WeakConcurrentSet.java b/mockito-core/src/main/java/org/mockito/internal/util/concurrent/WeakConcurrentSet.java similarity index 100% rename from src/main/java/org/mockito/internal/util/concurrent/WeakConcurrentSet.java rename to mockito-core/src/main/java/org/mockito/internal/util/concurrent/WeakConcurrentSet.java diff --git a/src/main/java/org/mockito/internal/util/io/IOUtil.java b/mockito-core/src/main/java/org/mockito/internal/util/io/IOUtil.java similarity index 100% rename from src/main/java/org/mockito/internal/util/io/IOUtil.java rename to mockito-core/src/main/java/org/mockito/internal/util/io/IOUtil.java diff --git a/src/main/java/org/mockito/internal/util/package-info.java b/mockito-core/src/main/java/org/mockito/internal/util/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/util/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/util/package-info.java diff --git a/src/main/java/org/mockito/internal/util/reflection/BeanPropertySetter.java b/mockito-core/src/main/java/org/mockito/internal/util/reflection/BeanPropertySetter.java similarity index 100% rename from src/main/java/org/mockito/internal/util/reflection/BeanPropertySetter.java rename to mockito-core/src/main/java/org/mockito/internal/util/reflection/BeanPropertySetter.java diff --git a/src/main/java/org/mockito/internal/util/reflection/FieldInitializationReport.java b/mockito-core/src/main/java/org/mockito/internal/util/reflection/FieldInitializationReport.java similarity index 100% rename from src/main/java/org/mockito/internal/util/reflection/FieldInitializationReport.java rename to mockito-core/src/main/java/org/mockito/internal/util/reflection/FieldInitializationReport.java diff --git a/src/main/java/org/mockito/internal/util/reflection/FieldInitializer.java b/mockito-core/src/main/java/org/mockito/internal/util/reflection/FieldInitializer.java similarity index 100% rename from src/main/java/org/mockito/internal/util/reflection/FieldInitializer.java rename to mockito-core/src/main/java/org/mockito/internal/util/reflection/FieldInitializer.java diff --git a/src/main/java/org/mockito/internal/util/reflection/FieldReader.java b/mockito-core/src/main/java/org/mockito/internal/util/reflection/FieldReader.java similarity index 100% rename from src/main/java/org/mockito/internal/util/reflection/FieldReader.java rename to mockito-core/src/main/java/org/mockito/internal/util/reflection/FieldReader.java diff --git a/src/main/java/org/mockito/internal/util/reflection/GenericMaster.java b/mockito-core/src/main/java/org/mockito/internal/util/reflection/GenericMaster.java similarity index 100% rename from src/main/java/org/mockito/internal/util/reflection/GenericMaster.java rename to mockito-core/src/main/java/org/mockito/internal/util/reflection/GenericMaster.java diff --git a/src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java b/mockito-core/src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java similarity index 100% rename from src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java rename to mockito-core/src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java diff --git a/src/main/java/org/mockito/internal/util/reflection/GenericTypeExtractor.java b/mockito-core/src/main/java/org/mockito/internal/util/reflection/GenericTypeExtractor.java similarity index 100% rename from src/main/java/org/mockito/internal/util/reflection/GenericTypeExtractor.java rename to mockito-core/src/main/java/org/mockito/internal/util/reflection/GenericTypeExtractor.java diff --git a/src/main/java/org/mockito/internal/util/reflection/InstanceField.java b/mockito-core/src/main/java/org/mockito/internal/util/reflection/InstanceField.java similarity index 100% rename from src/main/java/org/mockito/internal/util/reflection/InstanceField.java rename to mockito-core/src/main/java/org/mockito/internal/util/reflection/InstanceField.java diff --git a/src/main/java/org/mockito/internal/util/reflection/InstrumentationMemberAccessor.java b/mockito-core/src/main/java/org/mockito/internal/util/reflection/InstrumentationMemberAccessor.java similarity index 100% rename from src/main/java/org/mockito/internal/util/reflection/InstrumentationMemberAccessor.java rename to mockito-core/src/main/java/org/mockito/internal/util/reflection/InstrumentationMemberAccessor.java diff --git a/src/main/java/org/mockito/internal/util/reflection/LenientCopyTool.java b/mockito-core/src/main/java/org/mockito/internal/util/reflection/LenientCopyTool.java similarity index 100% rename from src/main/java/org/mockito/internal/util/reflection/LenientCopyTool.java rename to mockito-core/src/main/java/org/mockito/internal/util/reflection/LenientCopyTool.java diff --git a/src/main/java/org/mockito/internal/util/reflection/ModuleMemberAccessor.java b/mockito-core/src/main/java/org/mockito/internal/util/reflection/ModuleMemberAccessor.java similarity index 100% rename from src/main/java/org/mockito/internal/util/reflection/ModuleMemberAccessor.java rename to mockito-core/src/main/java/org/mockito/internal/util/reflection/ModuleMemberAccessor.java diff --git a/src/main/java/org/mockito/internal/util/reflection/ReflectionMemberAccessor.java b/mockito-core/src/main/java/org/mockito/internal/util/reflection/ReflectionMemberAccessor.java similarity index 100% rename from src/main/java/org/mockito/internal/util/reflection/ReflectionMemberAccessor.java rename to mockito-core/src/main/java/org/mockito/internal/util/reflection/ReflectionMemberAccessor.java diff --git a/src/main/java/org/mockito/internal/util/reflection/SuperTypesLastSorter.java b/mockito-core/src/main/java/org/mockito/internal/util/reflection/SuperTypesLastSorter.java similarity index 100% rename from src/main/java/org/mockito/internal/util/reflection/SuperTypesLastSorter.java rename to mockito-core/src/main/java/org/mockito/internal/util/reflection/SuperTypesLastSorter.java diff --git a/src/main/java/org/mockito/internal/util/reflection/package-info.java b/mockito-core/src/main/java/org/mockito/internal/util/reflection/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/util/reflection/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/util/reflection/package-info.java diff --git a/src/main/java/org/mockito/internal/verification/AtLeast.java b/mockito-core/src/main/java/org/mockito/internal/verification/AtLeast.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/AtLeast.java rename to mockito-core/src/main/java/org/mockito/internal/verification/AtLeast.java diff --git a/src/main/java/org/mockito/internal/verification/AtMost.java b/mockito-core/src/main/java/org/mockito/internal/verification/AtMost.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/AtMost.java rename to mockito-core/src/main/java/org/mockito/internal/verification/AtMost.java diff --git a/src/main/java/org/mockito/internal/verification/Calls.java b/mockito-core/src/main/java/org/mockito/internal/verification/Calls.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/Calls.java rename to mockito-core/src/main/java/org/mockito/internal/verification/Calls.java diff --git a/src/main/java/org/mockito/internal/verification/DefaultRegisteredInvocations.java b/mockito-core/src/main/java/org/mockito/internal/verification/DefaultRegisteredInvocations.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/DefaultRegisteredInvocations.java rename to mockito-core/src/main/java/org/mockito/internal/verification/DefaultRegisteredInvocations.java diff --git a/src/main/java/org/mockito/internal/verification/Description.java b/mockito-core/src/main/java/org/mockito/internal/verification/Description.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/Description.java rename to mockito-core/src/main/java/org/mockito/internal/verification/Description.java diff --git a/src/main/java/org/mockito/internal/verification/InOrderContextImpl.java b/mockito-core/src/main/java/org/mockito/internal/verification/InOrderContextImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/InOrderContextImpl.java rename to mockito-core/src/main/java/org/mockito/internal/verification/InOrderContextImpl.java diff --git a/src/main/java/org/mockito/internal/verification/InOrderWrapper.java b/mockito-core/src/main/java/org/mockito/internal/verification/InOrderWrapper.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/InOrderWrapper.java rename to mockito-core/src/main/java/org/mockito/internal/verification/InOrderWrapper.java diff --git a/src/main/java/org/mockito/internal/verification/MockAwareVerificationMode.java b/mockito-core/src/main/java/org/mockito/internal/verification/MockAwareVerificationMode.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/MockAwareVerificationMode.java rename to mockito-core/src/main/java/org/mockito/internal/verification/MockAwareVerificationMode.java diff --git a/src/main/java/org/mockito/internal/verification/NoInteractions.java b/mockito-core/src/main/java/org/mockito/internal/verification/NoInteractions.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/NoInteractions.java rename to mockito-core/src/main/java/org/mockito/internal/verification/NoInteractions.java diff --git a/src/main/java/org/mockito/internal/verification/NoMoreInteractions.java b/mockito-core/src/main/java/org/mockito/internal/verification/NoMoreInteractions.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/NoMoreInteractions.java rename to mockito-core/src/main/java/org/mockito/internal/verification/NoMoreInteractions.java diff --git a/src/main/java/org/mockito/internal/verification/Only.java b/mockito-core/src/main/java/org/mockito/internal/verification/Only.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/Only.java rename to mockito-core/src/main/java/org/mockito/internal/verification/Only.java diff --git a/src/main/java/org/mockito/internal/verification/RegisteredInvocations.java b/mockito-core/src/main/java/org/mockito/internal/verification/RegisteredInvocations.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/RegisteredInvocations.java rename to mockito-core/src/main/java/org/mockito/internal/verification/RegisteredInvocations.java diff --git a/src/main/java/org/mockito/internal/verification/SingleRegisteredInvocation.java b/mockito-core/src/main/java/org/mockito/internal/verification/SingleRegisteredInvocation.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/SingleRegisteredInvocation.java rename to mockito-core/src/main/java/org/mockito/internal/verification/SingleRegisteredInvocation.java diff --git a/src/main/java/org/mockito/internal/verification/Times.java b/mockito-core/src/main/java/org/mockito/internal/verification/Times.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/Times.java rename to mockito-core/src/main/java/org/mockito/internal/verification/Times.java diff --git a/src/main/java/org/mockito/internal/verification/VerificationDataImpl.java b/mockito-core/src/main/java/org/mockito/internal/verification/VerificationDataImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/VerificationDataImpl.java rename to mockito-core/src/main/java/org/mockito/internal/verification/VerificationDataImpl.java diff --git a/src/main/java/org/mockito/internal/verification/VerificationEventImpl.java b/mockito-core/src/main/java/org/mockito/internal/verification/VerificationEventImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/VerificationEventImpl.java rename to mockito-core/src/main/java/org/mockito/internal/verification/VerificationEventImpl.java diff --git a/src/main/java/org/mockito/internal/verification/VerificationModeFactory.java b/mockito-core/src/main/java/org/mockito/internal/verification/VerificationModeFactory.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/VerificationModeFactory.java rename to mockito-core/src/main/java/org/mockito/internal/verification/VerificationModeFactory.java diff --git a/src/main/java/org/mockito/internal/verification/VerificationOverTimeImpl.java b/mockito-core/src/main/java/org/mockito/internal/verification/VerificationOverTimeImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/VerificationOverTimeImpl.java rename to mockito-core/src/main/java/org/mockito/internal/verification/VerificationOverTimeImpl.java diff --git a/src/main/java/org/mockito/internal/verification/VerificationWrapper.java b/mockito-core/src/main/java/org/mockito/internal/verification/VerificationWrapper.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/VerificationWrapper.java rename to mockito-core/src/main/java/org/mockito/internal/verification/VerificationWrapper.java diff --git a/src/main/java/org/mockito/internal/verification/VerificationWrapperInOrderWrapper.java b/mockito-core/src/main/java/org/mockito/internal/verification/VerificationWrapperInOrderWrapper.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/VerificationWrapperInOrderWrapper.java rename to mockito-core/src/main/java/org/mockito/internal/verification/VerificationWrapperInOrderWrapper.java diff --git a/src/main/java/org/mockito/internal/verification/api/InOrderContext.java b/mockito-core/src/main/java/org/mockito/internal/verification/api/InOrderContext.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/api/InOrderContext.java rename to mockito-core/src/main/java/org/mockito/internal/verification/api/InOrderContext.java diff --git a/src/main/java/org/mockito/internal/verification/api/VerificationData.java b/mockito-core/src/main/java/org/mockito/internal/verification/api/VerificationData.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/api/VerificationData.java rename to mockito-core/src/main/java/org/mockito/internal/verification/api/VerificationData.java diff --git a/src/main/java/org/mockito/internal/verification/api/VerificationDataInOrder.java b/mockito-core/src/main/java/org/mockito/internal/verification/api/VerificationDataInOrder.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/api/VerificationDataInOrder.java rename to mockito-core/src/main/java/org/mockito/internal/verification/api/VerificationDataInOrder.java diff --git a/src/main/java/org/mockito/internal/verification/api/VerificationDataInOrderImpl.java b/mockito-core/src/main/java/org/mockito/internal/verification/api/VerificationDataInOrderImpl.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/api/VerificationDataInOrderImpl.java rename to mockito-core/src/main/java/org/mockito/internal/verification/api/VerificationDataInOrderImpl.java diff --git a/src/main/java/org/mockito/internal/verification/api/VerificationInOrderMode.java b/mockito-core/src/main/java/org/mockito/internal/verification/api/VerificationInOrderMode.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/api/VerificationInOrderMode.java rename to mockito-core/src/main/java/org/mockito/internal/verification/api/VerificationInOrderMode.java diff --git a/src/main/java/org/mockito/internal/verification/api/package-info.java b/mockito-core/src/main/java/org/mockito/internal/verification/api/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/api/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/verification/api/package-info.java diff --git a/src/main/java/org/mockito/internal/verification/argumentmatching/ArgumentMatchingTool.java b/mockito-core/src/main/java/org/mockito/internal/verification/argumentmatching/ArgumentMatchingTool.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/argumentmatching/ArgumentMatchingTool.java rename to mockito-core/src/main/java/org/mockito/internal/verification/argumentmatching/ArgumentMatchingTool.java diff --git a/src/main/java/org/mockito/internal/verification/argumentmatching/package-info.java b/mockito-core/src/main/java/org/mockito/internal/verification/argumentmatching/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/argumentmatching/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/verification/argumentmatching/package-info.java diff --git a/src/main/java/org/mockito/internal/verification/checkers/AtLeastDiscrepancy.java b/mockito-core/src/main/java/org/mockito/internal/verification/checkers/AtLeastDiscrepancy.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/checkers/AtLeastDiscrepancy.java rename to mockito-core/src/main/java/org/mockito/internal/verification/checkers/AtLeastDiscrepancy.java diff --git a/src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java b/mockito-core/src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java rename to mockito-core/src/main/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsChecker.java diff --git a/src/main/java/org/mockito/internal/verification/checkers/MissingInvocationChecker.java b/mockito-core/src/main/java/org/mockito/internal/verification/checkers/MissingInvocationChecker.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/checkers/MissingInvocationChecker.java rename to mockito-core/src/main/java/org/mockito/internal/verification/checkers/MissingInvocationChecker.java diff --git a/src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java b/mockito-core/src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java rename to mockito-core/src/main/java/org/mockito/internal/verification/checkers/NumberOfInvocationsChecker.java diff --git a/src/main/java/org/mockito/internal/verification/checkers/package-info.java b/mockito-core/src/main/java/org/mockito/internal/verification/checkers/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/checkers/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/verification/checkers/package-info.java diff --git a/src/main/java/org/mockito/internal/verification/package-info.java b/mockito-core/src/main/java/org/mockito/internal/verification/package-info.java similarity index 100% rename from src/main/java/org/mockito/internal/verification/package-info.java rename to mockito-core/src/main/java/org/mockito/internal/verification/package-info.java diff --git a/src/main/java/org/mockito/invocation/DescribedInvocation.java b/mockito-core/src/main/java/org/mockito/invocation/DescribedInvocation.java similarity index 100% rename from src/main/java/org/mockito/invocation/DescribedInvocation.java rename to mockito-core/src/main/java/org/mockito/invocation/DescribedInvocation.java diff --git a/src/main/java/org/mockito/invocation/Invocation.java b/mockito-core/src/main/java/org/mockito/invocation/Invocation.java similarity index 100% rename from src/main/java/org/mockito/invocation/Invocation.java rename to mockito-core/src/main/java/org/mockito/invocation/Invocation.java diff --git a/src/main/java/org/mockito/invocation/InvocationContainer.java b/mockito-core/src/main/java/org/mockito/invocation/InvocationContainer.java similarity index 100% rename from src/main/java/org/mockito/invocation/InvocationContainer.java rename to mockito-core/src/main/java/org/mockito/invocation/InvocationContainer.java diff --git a/src/main/java/org/mockito/invocation/InvocationFactory.java b/mockito-core/src/main/java/org/mockito/invocation/InvocationFactory.java similarity index 100% rename from src/main/java/org/mockito/invocation/InvocationFactory.java rename to mockito-core/src/main/java/org/mockito/invocation/InvocationFactory.java diff --git a/src/main/java/org/mockito/invocation/InvocationOnMock.java b/mockito-core/src/main/java/org/mockito/invocation/InvocationOnMock.java similarity index 100% rename from src/main/java/org/mockito/invocation/InvocationOnMock.java rename to mockito-core/src/main/java/org/mockito/invocation/InvocationOnMock.java diff --git a/src/main/java/org/mockito/invocation/Location.java b/mockito-core/src/main/java/org/mockito/invocation/Location.java similarity index 100% rename from src/main/java/org/mockito/invocation/Location.java rename to mockito-core/src/main/java/org/mockito/invocation/Location.java diff --git a/src/main/java/org/mockito/invocation/MatchableInvocation.java b/mockito-core/src/main/java/org/mockito/invocation/MatchableInvocation.java similarity index 100% rename from src/main/java/org/mockito/invocation/MatchableInvocation.java rename to mockito-core/src/main/java/org/mockito/invocation/MatchableInvocation.java diff --git a/src/main/java/org/mockito/invocation/MockHandler.java b/mockito-core/src/main/java/org/mockito/invocation/MockHandler.java similarity index 100% rename from src/main/java/org/mockito/invocation/MockHandler.java rename to mockito-core/src/main/java/org/mockito/invocation/MockHandler.java diff --git a/src/main/java/org/mockito/invocation/StubInfo.java b/mockito-core/src/main/java/org/mockito/invocation/StubInfo.java similarity index 100% rename from src/main/java/org/mockito/invocation/StubInfo.java rename to mockito-core/src/main/java/org/mockito/invocation/StubInfo.java diff --git a/src/main/java/org/mockito/invocation/package-info.java b/mockito-core/src/main/java/org/mockito/invocation/package-info.java similarity index 100% rename from src/main/java/org/mockito/invocation/package-info.java rename to mockito-core/src/main/java/org/mockito/invocation/package-info.java diff --git a/src/main/java/org/mockito/junit/MockitoJUnit.java b/mockito-core/src/main/java/org/mockito/junit/MockitoJUnit.java similarity index 100% rename from src/main/java/org/mockito/junit/MockitoJUnit.java rename to mockito-core/src/main/java/org/mockito/junit/MockitoJUnit.java diff --git a/src/main/java/org/mockito/junit/MockitoJUnitRunner.java b/mockito-core/src/main/java/org/mockito/junit/MockitoJUnitRunner.java similarity index 100% rename from src/main/java/org/mockito/junit/MockitoJUnitRunner.java rename to mockito-core/src/main/java/org/mockito/junit/MockitoJUnitRunner.java diff --git a/src/main/java/org/mockito/junit/MockitoRule.java b/mockito-core/src/main/java/org/mockito/junit/MockitoRule.java similarity index 100% rename from src/main/java/org/mockito/junit/MockitoRule.java rename to mockito-core/src/main/java/org/mockito/junit/MockitoRule.java diff --git a/src/main/java/org/mockito/junit/MockitoTestRule.java b/mockito-core/src/main/java/org/mockito/junit/MockitoTestRule.java similarity index 100% rename from src/main/java/org/mockito/junit/MockitoTestRule.java rename to mockito-core/src/main/java/org/mockito/junit/MockitoTestRule.java diff --git a/src/main/java/org/mockito/junit/VerificationCollector.java b/mockito-core/src/main/java/org/mockito/junit/VerificationCollector.java similarity index 100% rename from src/main/java/org/mockito/junit/VerificationCollector.java rename to mockito-core/src/main/java/org/mockito/junit/VerificationCollector.java diff --git a/src/main/java/org/mockito/junit/package-info.java b/mockito-core/src/main/java/org/mockito/junit/package-info.java similarity index 100% rename from src/main/java/org/mockito/junit/package-info.java rename to mockito-core/src/main/java/org/mockito/junit/package-info.java diff --git a/src/main/java/org/mockito/listeners/InvocationListener.java b/mockito-core/src/main/java/org/mockito/listeners/InvocationListener.java similarity index 100% rename from src/main/java/org/mockito/listeners/InvocationListener.java rename to mockito-core/src/main/java/org/mockito/listeners/InvocationListener.java diff --git a/src/main/java/org/mockito/listeners/MethodInvocationReport.java b/mockito-core/src/main/java/org/mockito/listeners/MethodInvocationReport.java similarity index 100% rename from src/main/java/org/mockito/listeners/MethodInvocationReport.java rename to mockito-core/src/main/java/org/mockito/listeners/MethodInvocationReport.java diff --git a/src/main/java/org/mockito/listeners/MockCreationListener.java b/mockito-core/src/main/java/org/mockito/listeners/MockCreationListener.java similarity index 100% rename from src/main/java/org/mockito/listeners/MockCreationListener.java rename to mockito-core/src/main/java/org/mockito/listeners/MockCreationListener.java diff --git a/src/main/java/org/mockito/listeners/MockitoListener.java b/mockito-core/src/main/java/org/mockito/listeners/MockitoListener.java similarity index 100% rename from src/main/java/org/mockito/listeners/MockitoListener.java rename to mockito-core/src/main/java/org/mockito/listeners/MockitoListener.java diff --git a/src/main/java/org/mockito/listeners/StubbingLookupEvent.java b/mockito-core/src/main/java/org/mockito/listeners/StubbingLookupEvent.java similarity index 100% rename from src/main/java/org/mockito/listeners/StubbingLookupEvent.java rename to mockito-core/src/main/java/org/mockito/listeners/StubbingLookupEvent.java diff --git a/src/main/java/org/mockito/listeners/StubbingLookupListener.java b/mockito-core/src/main/java/org/mockito/listeners/StubbingLookupListener.java similarity index 100% rename from src/main/java/org/mockito/listeners/StubbingLookupListener.java rename to mockito-core/src/main/java/org/mockito/listeners/StubbingLookupListener.java diff --git a/src/main/java/org/mockito/listeners/VerificationListener.java b/mockito-core/src/main/java/org/mockito/listeners/VerificationListener.java similarity index 100% rename from src/main/java/org/mockito/listeners/VerificationListener.java rename to mockito-core/src/main/java/org/mockito/listeners/VerificationListener.java diff --git a/src/main/java/org/mockito/listeners/VerificationStartedEvent.java b/mockito-core/src/main/java/org/mockito/listeners/VerificationStartedEvent.java similarity index 100% rename from src/main/java/org/mockito/listeners/VerificationStartedEvent.java rename to mockito-core/src/main/java/org/mockito/listeners/VerificationStartedEvent.java diff --git a/src/main/java/org/mockito/listeners/VerificationStartedListener.java b/mockito-core/src/main/java/org/mockito/listeners/VerificationStartedListener.java similarity index 100% rename from src/main/java/org/mockito/listeners/VerificationStartedListener.java rename to mockito-core/src/main/java/org/mockito/listeners/VerificationStartedListener.java diff --git a/src/main/java/org/mockito/listeners/package-info.java b/mockito-core/src/main/java/org/mockito/listeners/package-info.java similarity index 100% rename from src/main/java/org/mockito/listeners/package-info.java rename to mockito-core/src/main/java/org/mockito/listeners/package-info.java diff --git a/src/main/java/org/mockito/mock/MockCreationSettings.java b/mockito-core/src/main/java/org/mockito/mock/MockCreationSettings.java similarity index 100% rename from src/main/java/org/mockito/mock/MockCreationSettings.java rename to mockito-core/src/main/java/org/mockito/mock/MockCreationSettings.java diff --git a/src/main/java/org/mockito/mock/MockName.java b/mockito-core/src/main/java/org/mockito/mock/MockName.java similarity index 100% rename from src/main/java/org/mockito/mock/MockName.java rename to mockito-core/src/main/java/org/mockito/mock/MockName.java diff --git a/src/main/java/org/mockito/mock/MockType.java b/mockito-core/src/main/java/org/mockito/mock/MockType.java similarity index 100% rename from src/main/java/org/mockito/mock/MockType.java rename to mockito-core/src/main/java/org/mockito/mock/MockType.java diff --git a/src/main/java/org/mockito/mock/SerializableMode.java b/mockito-core/src/main/java/org/mockito/mock/SerializableMode.java similarity index 100% rename from src/main/java/org/mockito/mock/SerializableMode.java rename to mockito-core/src/main/java/org/mockito/mock/SerializableMode.java diff --git a/src/main/java/org/mockito/mock/package-info.java b/mockito-core/src/main/java/org/mockito/mock/package-info.java similarity index 100% rename from src/main/java/org/mockito/mock/package-info.java rename to mockito-core/src/main/java/org/mockito/mock/package-info.java diff --git a/src/main/java/org/mockito/package-info.java b/mockito-core/src/main/java/org/mockito/package-info.java similarity index 100% rename from src/main/java/org/mockito/package-info.java rename to mockito-core/src/main/java/org/mockito/package-info.java diff --git a/src/main/java/org/mockito/plugins/AnnotationEngine.java b/mockito-core/src/main/java/org/mockito/plugins/AnnotationEngine.java similarity index 100% rename from src/main/java/org/mockito/plugins/AnnotationEngine.java rename to mockito-core/src/main/java/org/mockito/plugins/AnnotationEngine.java diff --git a/src/main/java/org/mockito/plugins/DoNotMockEnforcer.java b/mockito-core/src/main/java/org/mockito/plugins/DoNotMockEnforcer.java similarity index 100% rename from src/main/java/org/mockito/plugins/DoNotMockEnforcer.java rename to mockito-core/src/main/java/org/mockito/plugins/DoNotMockEnforcer.java diff --git a/src/main/java/org/mockito/plugins/DoNotMockEnforcerWithType.java b/mockito-core/src/main/java/org/mockito/plugins/DoNotMockEnforcerWithType.java similarity index 100% rename from src/main/java/org/mockito/plugins/DoNotMockEnforcerWithType.java rename to mockito-core/src/main/java/org/mockito/plugins/DoNotMockEnforcerWithType.java diff --git a/src/main/java/org/mockito/plugins/InlineMockMaker.java b/mockito-core/src/main/java/org/mockito/plugins/InlineMockMaker.java similarity index 100% rename from src/main/java/org/mockito/plugins/InlineMockMaker.java rename to mockito-core/src/main/java/org/mockito/plugins/InlineMockMaker.java diff --git a/src/main/java/org/mockito/plugins/InstantiatorProvider2.java b/mockito-core/src/main/java/org/mockito/plugins/InstantiatorProvider2.java similarity index 100% rename from src/main/java/org/mockito/plugins/InstantiatorProvider2.java rename to mockito-core/src/main/java/org/mockito/plugins/InstantiatorProvider2.java diff --git a/src/main/java/org/mockito/plugins/MemberAccessor.java b/mockito-core/src/main/java/org/mockito/plugins/MemberAccessor.java similarity index 100% rename from src/main/java/org/mockito/plugins/MemberAccessor.java rename to mockito-core/src/main/java/org/mockito/plugins/MemberAccessor.java diff --git a/src/main/java/org/mockito/plugins/MockMaker.java b/mockito-core/src/main/java/org/mockito/plugins/MockMaker.java similarity index 100% rename from src/main/java/org/mockito/plugins/MockMaker.java rename to mockito-core/src/main/java/org/mockito/plugins/MockMaker.java diff --git a/src/main/java/org/mockito/plugins/MockResolver.java b/mockito-core/src/main/java/org/mockito/plugins/MockResolver.java similarity index 100% rename from src/main/java/org/mockito/plugins/MockResolver.java rename to mockito-core/src/main/java/org/mockito/plugins/MockResolver.java diff --git a/src/main/java/org/mockito/plugins/MockitoLogger.java b/mockito-core/src/main/java/org/mockito/plugins/MockitoLogger.java similarity index 100% rename from src/main/java/org/mockito/plugins/MockitoLogger.java rename to mockito-core/src/main/java/org/mockito/plugins/MockitoLogger.java diff --git a/src/main/java/org/mockito/plugins/MockitoPlugins.java b/mockito-core/src/main/java/org/mockito/plugins/MockitoPlugins.java similarity index 100% rename from src/main/java/org/mockito/plugins/MockitoPlugins.java rename to mockito-core/src/main/java/org/mockito/plugins/MockitoPlugins.java diff --git a/src/main/java/org/mockito/plugins/PluginSwitch.java b/mockito-core/src/main/java/org/mockito/plugins/PluginSwitch.java similarity index 100% rename from src/main/java/org/mockito/plugins/PluginSwitch.java rename to mockito-core/src/main/java/org/mockito/plugins/PluginSwitch.java diff --git a/src/main/java/org/mockito/plugins/StackTraceCleanerProvider.java b/mockito-core/src/main/java/org/mockito/plugins/StackTraceCleanerProvider.java similarity index 100% rename from src/main/java/org/mockito/plugins/StackTraceCleanerProvider.java rename to mockito-core/src/main/java/org/mockito/plugins/StackTraceCleanerProvider.java diff --git a/src/main/java/org/mockito/plugins/package-info.java b/mockito-core/src/main/java/org/mockito/plugins/package-info.java similarity index 100% rename from src/main/java/org/mockito/plugins/package-info.java rename to mockito-core/src/main/java/org/mockito/plugins/package-info.java diff --git a/src/main/java/org/mockito/quality/MockitoHint.java b/mockito-core/src/main/java/org/mockito/quality/MockitoHint.java similarity index 100% rename from src/main/java/org/mockito/quality/MockitoHint.java rename to mockito-core/src/main/java/org/mockito/quality/MockitoHint.java diff --git a/src/main/java/org/mockito/quality/Strictness.java b/mockito-core/src/main/java/org/mockito/quality/Strictness.java similarity index 100% rename from src/main/java/org/mockito/quality/Strictness.java rename to mockito-core/src/main/java/org/mockito/quality/Strictness.java diff --git a/src/main/java/org/mockito/quality/package-info.java b/mockito-core/src/main/java/org/mockito/quality/package-info.java similarity index 100% rename from src/main/java/org/mockito/quality/package-info.java rename to mockito-core/src/main/java/org/mockito/quality/package-info.java diff --git a/src/main/java/org/mockito/session/MockitoSessionBuilder.java b/mockito-core/src/main/java/org/mockito/session/MockitoSessionBuilder.java similarity index 100% rename from src/main/java/org/mockito/session/MockitoSessionBuilder.java rename to mockito-core/src/main/java/org/mockito/session/MockitoSessionBuilder.java diff --git a/src/main/java/org/mockito/session/MockitoSessionLogger.java b/mockito-core/src/main/java/org/mockito/session/MockitoSessionLogger.java similarity index 100% rename from src/main/java/org/mockito/session/MockitoSessionLogger.java rename to mockito-core/src/main/java/org/mockito/session/MockitoSessionLogger.java diff --git a/src/main/java/org/mockito/stubbing/Answer.java b/mockito-core/src/main/java/org/mockito/stubbing/Answer.java similarity index 100% rename from src/main/java/org/mockito/stubbing/Answer.java rename to mockito-core/src/main/java/org/mockito/stubbing/Answer.java diff --git a/src/main/java/org/mockito/stubbing/Answer1.java b/mockito-core/src/main/java/org/mockito/stubbing/Answer1.java similarity index 100% rename from src/main/java/org/mockito/stubbing/Answer1.java rename to mockito-core/src/main/java/org/mockito/stubbing/Answer1.java diff --git a/src/main/java/org/mockito/stubbing/Answer2.java b/mockito-core/src/main/java/org/mockito/stubbing/Answer2.java similarity index 100% rename from src/main/java/org/mockito/stubbing/Answer2.java rename to mockito-core/src/main/java/org/mockito/stubbing/Answer2.java diff --git a/src/main/java/org/mockito/stubbing/Answer3.java b/mockito-core/src/main/java/org/mockito/stubbing/Answer3.java similarity index 100% rename from src/main/java/org/mockito/stubbing/Answer3.java rename to mockito-core/src/main/java/org/mockito/stubbing/Answer3.java diff --git a/src/main/java/org/mockito/stubbing/Answer4.java b/mockito-core/src/main/java/org/mockito/stubbing/Answer4.java similarity index 100% rename from src/main/java/org/mockito/stubbing/Answer4.java rename to mockito-core/src/main/java/org/mockito/stubbing/Answer4.java diff --git a/src/main/java/org/mockito/stubbing/Answer5.java b/mockito-core/src/main/java/org/mockito/stubbing/Answer5.java similarity index 100% rename from src/main/java/org/mockito/stubbing/Answer5.java rename to mockito-core/src/main/java/org/mockito/stubbing/Answer5.java diff --git a/src/main/java/org/mockito/stubbing/Answer6.java b/mockito-core/src/main/java/org/mockito/stubbing/Answer6.java similarity index 100% rename from src/main/java/org/mockito/stubbing/Answer6.java rename to mockito-core/src/main/java/org/mockito/stubbing/Answer6.java diff --git a/src/main/java/org/mockito/stubbing/BaseStubber.java b/mockito-core/src/main/java/org/mockito/stubbing/BaseStubber.java similarity index 100% rename from src/main/java/org/mockito/stubbing/BaseStubber.java rename to mockito-core/src/main/java/org/mockito/stubbing/BaseStubber.java diff --git a/src/main/java/org/mockito/stubbing/LenientStubber.java b/mockito-core/src/main/java/org/mockito/stubbing/LenientStubber.java similarity index 100% rename from src/main/java/org/mockito/stubbing/LenientStubber.java rename to mockito-core/src/main/java/org/mockito/stubbing/LenientStubber.java diff --git a/src/main/java/org/mockito/stubbing/OngoingStubbing.java b/mockito-core/src/main/java/org/mockito/stubbing/OngoingStubbing.java similarity index 100% rename from src/main/java/org/mockito/stubbing/OngoingStubbing.java rename to mockito-core/src/main/java/org/mockito/stubbing/OngoingStubbing.java diff --git a/src/main/java/org/mockito/stubbing/Stubber.java b/mockito-core/src/main/java/org/mockito/stubbing/Stubber.java similarity index 100% rename from src/main/java/org/mockito/stubbing/Stubber.java rename to mockito-core/src/main/java/org/mockito/stubbing/Stubber.java diff --git a/src/main/java/org/mockito/stubbing/Stubbing.java b/mockito-core/src/main/java/org/mockito/stubbing/Stubbing.java similarity index 100% rename from src/main/java/org/mockito/stubbing/Stubbing.java rename to mockito-core/src/main/java/org/mockito/stubbing/Stubbing.java diff --git a/src/main/java/org/mockito/stubbing/ValidableAnswer.java b/mockito-core/src/main/java/org/mockito/stubbing/ValidableAnswer.java similarity index 100% rename from src/main/java/org/mockito/stubbing/ValidableAnswer.java rename to mockito-core/src/main/java/org/mockito/stubbing/ValidableAnswer.java diff --git a/src/main/java/org/mockito/stubbing/VoidAnswer1.java b/mockito-core/src/main/java/org/mockito/stubbing/VoidAnswer1.java similarity index 100% rename from src/main/java/org/mockito/stubbing/VoidAnswer1.java rename to mockito-core/src/main/java/org/mockito/stubbing/VoidAnswer1.java diff --git a/src/main/java/org/mockito/stubbing/VoidAnswer2.java b/mockito-core/src/main/java/org/mockito/stubbing/VoidAnswer2.java similarity index 100% rename from src/main/java/org/mockito/stubbing/VoidAnswer2.java rename to mockito-core/src/main/java/org/mockito/stubbing/VoidAnswer2.java diff --git a/src/main/java/org/mockito/stubbing/VoidAnswer3.java b/mockito-core/src/main/java/org/mockito/stubbing/VoidAnswer3.java similarity index 100% rename from src/main/java/org/mockito/stubbing/VoidAnswer3.java rename to mockito-core/src/main/java/org/mockito/stubbing/VoidAnswer3.java diff --git a/src/main/java/org/mockito/stubbing/VoidAnswer4.java b/mockito-core/src/main/java/org/mockito/stubbing/VoidAnswer4.java similarity index 100% rename from src/main/java/org/mockito/stubbing/VoidAnswer4.java rename to mockito-core/src/main/java/org/mockito/stubbing/VoidAnswer4.java diff --git a/src/main/java/org/mockito/stubbing/VoidAnswer5.java b/mockito-core/src/main/java/org/mockito/stubbing/VoidAnswer5.java similarity index 100% rename from src/main/java/org/mockito/stubbing/VoidAnswer5.java rename to mockito-core/src/main/java/org/mockito/stubbing/VoidAnswer5.java diff --git a/src/main/java/org/mockito/stubbing/VoidAnswer6.java b/mockito-core/src/main/java/org/mockito/stubbing/VoidAnswer6.java similarity index 100% rename from src/main/java/org/mockito/stubbing/VoidAnswer6.java rename to mockito-core/src/main/java/org/mockito/stubbing/VoidAnswer6.java diff --git a/src/main/java/org/mockito/stubbing/package-info.java b/mockito-core/src/main/java/org/mockito/stubbing/package-info.java similarity index 100% rename from src/main/java/org/mockito/stubbing/package-info.java rename to mockito-core/src/main/java/org/mockito/stubbing/package-info.java diff --git a/src/main/java/org/mockito/verification/After.java b/mockito-core/src/main/java/org/mockito/verification/After.java similarity index 100% rename from src/main/java/org/mockito/verification/After.java rename to mockito-core/src/main/java/org/mockito/verification/After.java diff --git a/src/main/java/org/mockito/verification/Timeout.java b/mockito-core/src/main/java/org/mockito/verification/Timeout.java similarity index 100% rename from src/main/java/org/mockito/verification/Timeout.java rename to mockito-core/src/main/java/org/mockito/verification/Timeout.java diff --git a/src/main/java/org/mockito/verification/VerificationAfterDelay.java b/mockito-core/src/main/java/org/mockito/verification/VerificationAfterDelay.java similarity index 100% rename from src/main/java/org/mockito/verification/VerificationAfterDelay.java rename to mockito-core/src/main/java/org/mockito/verification/VerificationAfterDelay.java diff --git a/src/main/java/org/mockito/verification/VerificationEvent.java b/mockito-core/src/main/java/org/mockito/verification/VerificationEvent.java similarity index 100% rename from src/main/java/org/mockito/verification/VerificationEvent.java rename to mockito-core/src/main/java/org/mockito/verification/VerificationEvent.java diff --git a/src/main/java/org/mockito/verification/VerificationMode.java b/mockito-core/src/main/java/org/mockito/verification/VerificationMode.java similarity index 100% rename from src/main/java/org/mockito/verification/VerificationMode.java rename to mockito-core/src/main/java/org/mockito/verification/VerificationMode.java diff --git a/src/main/java/org/mockito/verification/VerificationStrategy.java b/mockito-core/src/main/java/org/mockito/verification/VerificationStrategy.java similarity index 100% rename from src/main/java/org/mockito/verification/VerificationStrategy.java rename to mockito-core/src/main/java/org/mockito/verification/VerificationStrategy.java diff --git a/src/main/java/org/mockito/verification/VerificationWithTimeout.java b/mockito-core/src/main/java/org/mockito/verification/VerificationWithTimeout.java similarity index 100% rename from src/main/java/org/mockito/verification/VerificationWithTimeout.java rename to mockito-core/src/main/java/org/mockito/verification/VerificationWithTimeout.java diff --git a/src/main/java/org/mockito/verification/package-info.java b/mockito-core/src/main/java/org/mockito/verification/package-info.java similarity index 100% rename from src/main/java/org/mockito/verification/package-info.java rename to mockito-core/src/main/java/org/mockito/verification/package-info.java diff --git a/src/main/javadoc/favicon.ico b/mockito-core/src/main/javadoc/favicon.ico similarity index 100% rename from src/main/javadoc/favicon.ico rename to mockito-core/src/main/javadoc/favicon.ico diff --git a/src/main/javadoc/mockito-theme.css b/mockito-core/src/main/javadoc/mockito-theme.css similarity index 100% rename from src/main/javadoc/mockito-theme.css rename to mockito-core/src/main/javadoc/mockito-theme.css diff --git a/src/main/javadoc/org/mockito/logo.png b/mockito-core/src/main/javadoc/org/mockito/logo.png similarity index 100% rename from src/main/javadoc/org/mockito/logo.png rename to mockito-core/src/main/javadoc/org/mockito/logo.png diff --git a/src/main/javadoc/org/mockito/logo@2x.png b/mockito-core/src/main/javadoc/org/mockito/logo@2x.png similarity index 100% rename from src/main/javadoc/org/mockito/logo@2x.png rename to mockito-core/src/main/javadoc/org/mockito/logo@2x.png diff --git a/src/test/java/org/concurrentmockito/ThreadVerifiesContinuouslyInteractingMockTest.java b/mockito-core/src/test/java/org/concurrentmockito/ThreadVerifiesContinuouslyInteractingMockTest.java similarity index 100% rename from src/test/java/org/concurrentmockito/ThreadVerifiesContinuouslyInteractingMockTest.java rename to mockito-core/src/test/java/org/concurrentmockito/ThreadVerifiesContinuouslyInteractingMockTest.java diff --git a/src/test/java/org/concurrentmockito/ThreadsRunAllTestsHalfManualTest.java b/mockito-core/src/test/java/org/concurrentmockito/ThreadsRunAllTestsHalfManualTest.java similarity index 100% rename from src/test/java/org/concurrentmockito/ThreadsRunAllTestsHalfManualTest.java rename to mockito-core/src/test/java/org/concurrentmockito/ThreadsRunAllTestsHalfManualTest.java diff --git a/src/test/java/org/concurrentmockito/ThreadsShareAMockTest.java b/mockito-core/src/test/java/org/concurrentmockito/ThreadsShareAMockTest.java similarity index 100% rename from src/test/java/org/concurrentmockito/ThreadsShareAMockTest.java rename to mockito-core/src/test/java/org/concurrentmockito/ThreadsShareAMockTest.java diff --git a/src/test/java/org/concurrentmockito/ThreadsShareGenerouslyStubbedMockTest.java b/mockito-core/src/test/java/org/concurrentmockito/ThreadsShareGenerouslyStubbedMockTest.java similarity index 100% rename from src/test/java/org/concurrentmockito/ThreadsShareGenerouslyStubbedMockTest.java rename to mockito-core/src/test/java/org/concurrentmockito/ThreadsShareGenerouslyStubbedMockTest.java diff --git a/src/test/java/org/concurrentmockito/VerificationInOrderFromMultipleThreadsTest.java b/mockito-core/src/test/java/org/concurrentmockito/VerificationInOrderFromMultipleThreadsTest.java similarity index 100% rename from src/test/java/org/concurrentmockito/VerificationInOrderFromMultipleThreadsTest.java rename to mockito-core/src/test/java/org/concurrentmockito/VerificationInOrderFromMultipleThreadsTest.java diff --git a/src/test/java/org/concurrentmockito/package-info.java b/mockito-core/src/test/java/org/concurrentmockito/package-info.java similarity index 100% rename from src/test/java/org/concurrentmockito/package-info.java rename to mockito-core/src/test/java/org/concurrentmockito/package-info.java diff --git a/src/test/java/org/mockito/AnnotationsAreCopiedFromMockedTypeTest.java b/mockito-core/src/test/java/org/mockito/AnnotationsAreCopiedFromMockedTypeTest.java similarity index 100% rename from src/test/java/org/mockito/AnnotationsAreCopiedFromMockedTypeTest.java rename to mockito-core/src/test/java/org/mockito/AnnotationsAreCopiedFromMockedTypeTest.java diff --git a/src/test/java/org/mockito/ArgumentCaptorTest.java b/mockito-core/src/test/java/org/mockito/ArgumentCaptorTest.java similarity index 100% rename from src/test/java/org/mockito/ArgumentCaptorTest.java rename to mockito-core/src/test/java/org/mockito/ArgumentCaptorTest.java diff --git a/src/test/java/org/mockito/DescriptionTest.java b/mockito-core/src/test/java/org/mockito/DescriptionTest.java similarity index 100% rename from src/test/java/org/mockito/DescriptionTest.java rename to mockito-core/src/test/java/org/mockito/DescriptionTest.java diff --git a/src/test/java/org/mockito/InvocationFactoryTest.java b/mockito-core/src/test/java/org/mockito/InvocationFactoryTest.java similarity index 100% rename from src/test/java/org/mockito/InvocationFactoryTest.java rename to mockito-core/src/test/java/org/mockito/InvocationFactoryTest.java diff --git a/src/test/java/org/mockito/MockTest.java b/mockito-core/src/test/java/org/mockito/MockTest.java similarity index 100% rename from src/test/java/org/mockito/MockTest.java rename to mockito-core/src/test/java/org/mockito/MockTest.java diff --git a/src/test/java/org/mockito/MockitoClearTest.java b/mockito-core/src/test/java/org/mockito/MockitoClearTest.java similarity index 100% rename from src/test/java/org/mockito/MockitoClearTest.java rename to mockito-core/src/test/java/org/mockito/MockitoClearTest.java diff --git a/src/test/java/org/mockito/MockitoEnvTest.java b/mockito-core/src/test/java/org/mockito/MockitoEnvTest.java similarity index 100% rename from src/test/java/org/mockito/MockitoEnvTest.java rename to mockito-core/src/test/java/org/mockito/MockitoEnvTest.java diff --git a/src/test/java/org/mockito/MockitoTest.java b/mockito-core/src/test/java/org/mockito/MockitoTest.java similarity index 100% rename from src/test/java/org/mockito/MockitoTest.java rename to mockito-core/src/test/java/org/mockito/MockitoTest.java diff --git a/src/test/java/org/mockito/PrematureGarbageCollectionTest.java b/mockito-core/src/test/java/org/mockito/PrematureGarbageCollectionTest.java similarity index 100% rename from src/test/java/org/mockito/PrematureGarbageCollectionTest.java rename to mockito-core/src/test/java/org/mockito/PrematureGarbageCollectionTest.java diff --git a/src/test/java/org/mockito/StateMaster.java b/mockito-core/src/test/java/org/mockito/StateMaster.java similarity index 100% rename from src/test/java/org/mockito/StateMaster.java rename to mockito-core/src/test/java/org/mockito/StateMaster.java diff --git a/src/test/java/org/mockito/StaticMockingExperimentTest.java b/mockito-core/src/test/java/org/mockito/StaticMockingExperimentTest.java similarity index 100% rename from src/test/java/org/mockito/StaticMockingExperimentTest.java rename to mockito-core/src/test/java/org/mockito/StaticMockingExperimentTest.java diff --git a/src/test/java/org/mockito/configuration/MockitoConfiguration.java b/mockito-core/src/test/java/org/mockito/configuration/MockitoConfiguration.java similarity index 100% rename from src/test/java/org/mockito/configuration/MockitoConfiguration.java rename to mockito-core/src/test/java/org/mockito/configuration/MockitoConfiguration.java diff --git a/src/test/java/org/mockito/exceptions/base/MockitoAssertionErrorTest.java b/mockito-core/src/test/java/org/mockito/exceptions/base/MockitoAssertionErrorTest.java similarity index 100% rename from src/test/java/org/mockito/exceptions/base/MockitoAssertionErrorTest.java rename to mockito-core/src/test/java/org/mockito/exceptions/base/MockitoAssertionErrorTest.java diff --git a/src/test/java/org/mockito/exceptions/base/MockitoExceptionTest.java b/mockito-core/src/test/java/org/mockito/exceptions/base/MockitoExceptionTest.java similarity index 100% rename from src/test/java/org/mockito/exceptions/base/MockitoExceptionTest.java rename to mockito-core/src/test/java/org/mockito/exceptions/base/MockitoExceptionTest.java diff --git a/src/test/java/org/mockito/exceptions/base/MockitoSerializationIssueTest.java b/mockito-core/src/test/java/org/mockito/exceptions/base/MockitoSerializationIssueTest.java similarity index 100% rename from src/test/java/org/mockito/exceptions/base/MockitoSerializationIssueTest.java rename to mockito-core/src/test/java/org/mockito/exceptions/base/MockitoSerializationIssueTest.java diff --git a/src/test/java/org/mockito/exceptions/base/StackTraceBuilder.java b/mockito-core/src/test/java/org/mockito/exceptions/base/StackTraceBuilder.java similarity index 100% rename from src/test/java/org/mockito/exceptions/base/StackTraceBuilder.java rename to mockito-core/src/test/java/org/mockito/exceptions/base/StackTraceBuilder.java diff --git a/src/test/java/org/mockito/exceptions/base/TraceBuilder.java b/mockito-core/src/test/java/org/mockito/exceptions/base/TraceBuilder.java similarity index 100% rename from src/test/java/org/mockito/exceptions/base/TraceBuilder.java rename to mockito-core/src/test/java/org/mockito/exceptions/base/TraceBuilder.java diff --git a/src/test/java/org/mockito/exceptions/stacktrace/StackTraceCleanerTest.java b/mockito-core/src/test/java/org/mockito/exceptions/stacktrace/StackTraceCleanerTest.java similarity index 100% rename from src/test/java/org/mockito/exceptions/stacktrace/StackTraceCleanerTest.java rename to mockito-core/src/test/java/org/mockito/exceptions/stacktrace/StackTraceCleanerTest.java diff --git a/src/test/java/org/mockito/internal/AllInvocationsFinderTest.java b/mockito-core/src/test/java/org/mockito/internal/AllInvocationsFinderTest.java similarity index 100% rename from src/test/java/org/mockito/internal/AllInvocationsFinderTest.java rename to mockito-core/src/test/java/org/mockito/internal/AllInvocationsFinderTest.java diff --git a/src/test/java/org/mockito/internal/InOrderImplTest.java b/mockito-core/src/test/java/org/mockito/internal/InOrderImplTest.java similarity index 100% rename from src/test/java/org/mockito/internal/InOrderImplTest.java rename to mockito-core/src/test/java/org/mockito/internal/InOrderImplTest.java diff --git a/src/test/java/org/mockito/internal/InvalidStateDetectionTest.java b/mockito-core/src/test/java/org/mockito/internal/InvalidStateDetectionTest.java similarity index 100% rename from src/test/java/org/mockito/internal/InvalidStateDetectionTest.java rename to mockito-core/src/test/java/org/mockito/internal/InvalidStateDetectionTest.java diff --git a/src/test/java/org/mockito/internal/configuration/ClassPathLoaderTest.java b/mockito-core/src/test/java/org/mockito/internal/configuration/ClassPathLoaderTest.java similarity index 100% rename from src/test/java/org/mockito/internal/configuration/ClassPathLoaderTest.java rename to mockito-core/src/test/java/org/mockito/internal/configuration/ClassPathLoaderTest.java diff --git a/src/test/java/org/mockito/internal/configuration/ConfigurationAccess.java b/mockito-core/src/test/java/org/mockito/internal/configuration/ConfigurationAccess.java similarity index 100% rename from src/test/java/org/mockito/internal/configuration/ConfigurationAccess.java rename to mockito-core/src/test/java/org/mockito/internal/configuration/ConfigurationAccess.java diff --git a/src/test/java/org/mockito/internal/configuration/GlobalConfigurationTest.java b/mockito-core/src/test/java/org/mockito/internal/configuration/GlobalConfigurationTest.java similarity index 100% rename from src/test/java/org/mockito/internal/configuration/GlobalConfigurationTest.java rename to mockito-core/src/test/java/org/mockito/internal/configuration/GlobalConfigurationTest.java diff --git a/src/test/java/org/mockito/internal/configuration/MockAnnotationProcessorTest.java b/mockito-core/src/test/java/org/mockito/internal/configuration/MockAnnotationProcessorTest.java similarity index 100% rename from src/test/java/org/mockito/internal/configuration/MockAnnotationProcessorTest.java rename to mockito-core/src/test/java/org/mockito/internal/configuration/MockAnnotationProcessorTest.java diff --git a/src/test/java/org/mockito/internal/configuration/MockInjectionTest.java b/mockito-core/src/test/java/org/mockito/internal/configuration/MockInjectionTest.java similarity index 100% rename from src/test/java/org/mockito/internal/configuration/MockInjectionTest.java rename to mockito-core/src/test/java/org/mockito/internal/configuration/MockInjectionTest.java diff --git a/src/test/java/org/mockito/internal/configuration/injection/ConstructorInjectionTest.java b/mockito-core/src/test/java/org/mockito/internal/configuration/injection/ConstructorInjectionTest.java similarity index 100% rename from src/test/java/org/mockito/internal/configuration/injection/ConstructorInjectionTest.java rename to mockito-core/src/test/java/org/mockito/internal/configuration/injection/ConstructorInjectionTest.java diff --git a/src/test/java/org/mockito/internal/configuration/injection/SimpleArgumentResolverTest.java b/mockito-core/src/test/java/org/mockito/internal/configuration/injection/SimpleArgumentResolverTest.java similarity index 100% rename from src/test/java/org/mockito/internal/configuration/injection/SimpleArgumentResolverTest.java rename to mockito-core/src/test/java/org/mockito/internal/configuration/injection/SimpleArgumentResolverTest.java diff --git a/src/test/java/org/mockito/internal/configuration/plugins/DefaultMockitoPluginsTest.java b/mockito-core/src/test/java/org/mockito/internal/configuration/plugins/DefaultMockitoPluginsTest.java similarity index 100% rename from src/test/java/org/mockito/internal/configuration/plugins/DefaultMockitoPluginsTest.java rename to mockito-core/src/test/java/org/mockito/internal/configuration/plugins/DefaultMockitoPluginsTest.java diff --git a/src/test/java/org/mockito/internal/configuration/plugins/PluginFileReaderTest.java b/mockito-core/src/test/java/org/mockito/internal/configuration/plugins/PluginFileReaderTest.java similarity index 100% rename from src/test/java/org/mockito/internal/configuration/plugins/PluginFileReaderTest.java rename to mockito-core/src/test/java/org/mockito/internal/configuration/plugins/PluginFileReaderTest.java diff --git a/src/test/java/org/mockito/internal/configuration/plugins/PluginFinderTest.java b/mockito-core/src/test/java/org/mockito/internal/configuration/plugins/PluginFinderTest.java similarity index 100% rename from src/test/java/org/mockito/internal/configuration/plugins/PluginFinderTest.java rename to mockito-core/src/test/java/org/mockito/internal/configuration/plugins/PluginFinderTest.java diff --git a/src/test/java/org/mockito/internal/configuration/plugins/PluginLoaderTest.java b/mockito-core/src/test/java/org/mockito/internal/configuration/plugins/PluginLoaderTest.java similarity index 100% rename from src/test/java/org/mockito/internal/configuration/plugins/PluginLoaderTest.java rename to mockito-core/src/test/java/org/mockito/internal/configuration/plugins/PluginLoaderTest.java diff --git a/src/test/java/org/mockito/internal/creation/AbstractMockMakerTest.java b/mockito-core/src/test/java/org/mockito/internal/creation/AbstractMockMakerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/creation/AbstractMockMakerTest.java rename to mockito-core/src/test/java/org/mockito/internal/creation/AbstractMockMakerTest.java diff --git a/src/test/java/org/mockito/internal/creation/DelegatingMethodTest.java b/mockito-core/src/test/java/org/mockito/internal/creation/DelegatingMethodTest.java similarity index 100% rename from src/test/java/org/mockito/internal/creation/DelegatingMethodTest.java rename to mockito-core/src/test/java/org/mockito/internal/creation/DelegatingMethodTest.java diff --git a/src/test/java/org/mockito/internal/creation/InterfaceOverrideTest.java b/mockito-core/src/test/java/org/mockito/internal/creation/InterfaceOverrideTest.java similarity index 100% rename from src/test/java/org/mockito/internal/creation/InterfaceOverrideTest.java rename to mockito-core/src/test/java/org/mockito/internal/creation/InterfaceOverrideTest.java diff --git a/src/test/java/org/mockito/internal/creation/MockSettingsImplTest.java b/mockito-core/src/test/java/org/mockito/internal/creation/MockSettingsImplTest.java similarity index 100% rename from src/test/java/org/mockito/internal/creation/MockSettingsImplTest.java rename to mockito-core/src/test/java/org/mockito/internal/creation/MockSettingsImplTest.java diff --git a/src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java b/mockito-core/src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java rename to mockito-core/src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java diff --git a/src/test/java/org/mockito/internal/creation/bytebuddy/ByteBuddyMockMakerTest.java b/mockito-core/src/test/java/org/mockito/internal/creation/bytebuddy/ByteBuddyMockMakerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/creation/bytebuddy/ByteBuddyMockMakerTest.java rename to mockito-core/src/test/java/org/mockito/internal/creation/bytebuddy/ByteBuddyMockMakerTest.java diff --git a/src/test/java/org/mockito/internal/creation/bytebuddy/InlineByteBuddyMockMakerTest.java b/mockito-core/src/test/java/org/mockito/internal/creation/bytebuddy/InlineByteBuddyMockMakerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/creation/bytebuddy/InlineByteBuddyMockMakerTest.java rename to mockito-core/src/test/java/org/mockito/internal/creation/bytebuddy/InlineByteBuddyMockMakerTest.java diff --git a/src/test/java/org/mockito/internal/creation/bytebuddy/InlineDelegateByteBuddyMockMakerTest.java b/mockito-core/src/test/java/org/mockito/internal/creation/bytebuddy/InlineDelegateByteBuddyMockMakerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/creation/bytebuddy/InlineDelegateByteBuddyMockMakerTest.java rename to mockito-core/src/test/java/org/mockito/internal/creation/bytebuddy/InlineDelegateByteBuddyMockMakerTest.java diff --git a/src/test/java/org/mockito/internal/creation/bytebuddy/PlatformUtilsTest.java b/mockito-core/src/test/java/org/mockito/internal/creation/bytebuddy/PlatformUtilsTest.java similarity index 100% rename from src/test/java/org/mockito/internal/creation/bytebuddy/PlatformUtilsTest.java rename to mockito-core/src/test/java/org/mockito/internal/creation/bytebuddy/PlatformUtilsTest.java diff --git a/src/test/java/org/mockito/internal/creation/bytebuddy/SubclassByteBuddyMockMakerTest.java b/mockito-core/src/test/java/org/mockito/internal/creation/bytebuddy/SubclassByteBuddyMockMakerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/creation/bytebuddy/SubclassByteBuddyMockMakerTest.java rename to mockito-core/src/test/java/org/mockito/internal/creation/bytebuddy/SubclassByteBuddyMockMakerTest.java diff --git a/src/test/java/org/mockito/internal/creation/bytebuddy/TypeCachingMockBytecodeGeneratorTest.java b/mockito-core/src/test/java/org/mockito/internal/creation/bytebuddy/TypeCachingMockBytecodeGeneratorTest.java similarity index 100% rename from src/test/java/org/mockito/internal/creation/bytebuddy/TypeCachingMockBytecodeGeneratorTest.java rename to mockito-core/src/test/java/org/mockito/internal/creation/bytebuddy/TypeCachingMockBytecodeGeneratorTest.java diff --git a/src/test/java/org/mockito/internal/creation/bytebuddy/sample/DifferentPackage.java b/mockito-core/src/test/java/org/mockito/internal/creation/bytebuddy/sample/DifferentPackage.java similarity index 100% rename from src/test/java/org/mockito/internal/creation/bytebuddy/sample/DifferentPackage.java rename to mockito-core/src/test/java/org/mockito/internal/creation/bytebuddy/sample/DifferentPackage.java diff --git a/src/test/java/org/mockito/internal/creation/instance/ConstructorInstantiatorTest.java b/mockito-core/src/test/java/org/mockito/internal/creation/instance/ConstructorInstantiatorTest.java similarity index 100% rename from src/test/java/org/mockito/internal/creation/instance/ConstructorInstantiatorTest.java rename to mockito-core/src/test/java/org/mockito/internal/creation/instance/ConstructorInstantiatorTest.java diff --git a/src/test/java/org/mockito/internal/creation/proxy/ProxyMockMakerTest.java b/mockito-core/src/test/java/org/mockito/internal/creation/proxy/ProxyMockMakerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/creation/proxy/ProxyMockMakerTest.java rename to mockito-core/src/test/java/org/mockito/internal/creation/proxy/ProxyMockMakerTest.java diff --git a/src/test/java/org/mockito/internal/debugging/LoggingListenerTest.java b/mockito-core/src/test/java/org/mockito/internal/debugging/LoggingListenerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/debugging/LoggingListenerTest.java rename to mockito-core/src/test/java/org/mockito/internal/debugging/LoggingListenerTest.java diff --git a/src/test/java/org/mockito/internal/debugging/VerboseMockInvocationLoggerTest.java b/mockito-core/src/test/java/org/mockito/internal/debugging/VerboseMockInvocationLoggerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/debugging/VerboseMockInvocationLoggerTest.java rename to mockito-core/src/test/java/org/mockito/internal/debugging/VerboseMockInvocationLoggerTest.java diff --git a/src/test/java/org/mockito/internal/debugging/WarningsFinderTest.java b/mockito-core/src/test/java/org/mockito/internal/debugging/WarningsFinderTest.java similarity index 100% rename from src/test/java/org/mockito/internal/debugging/WarningsFinderTest.java rename to mockito-core/src/test/java/org/mockito/internal/debugging/WarningsFinderTest.java diff --git a/src/test/java/org/mockito/internal/exceptions/ReporterTest.java b/mockito-core/src/test/java/org/mockito/internal/exceptions/ReporterTest.java similarity index 100% rename from src/test/java/org/mockito/internal/exceptions/ReporterTest.java rename to mockito-core/src/test/java/org/mockito/internal/exceptions/ReporterTest.java diff --git a/src/test/java/org/mockito/internal/exceptions/stacktrace/ConditionalStackTraceFilterTest.java b/mockito-core/src/test/java/org/mockito/internal/exceptions/stacktrace/ConditionalStackTraceFilterTest.java similarity index 100% rename from src/test/java/org/mockito/internal/exceptions/stacktrace/ConditionalStackTraceFilterTest.java rename to mockito-core/src/test/java/org/mockito/internal/exceptions/stacktrace/ConditionalStackTraceFilterTest.java diff --git a/src/test/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilterTest.java b/mockito-core/src/test/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilterTest.java similarity index 100% rename from src/test/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilterTest.java rename to mockito-core/src/test/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilterTest.java diff --git a/src/test/java/org/mockito/internal/exceptions/util/ScenarioPrinterTest.java b/mockito-core/src/test/java/org/mockito/internal/exceptions/util/ScenarioPrinterTest.java similarity index 100% rename from src/test/java/org/mockito/internal/exceptions/util/ScenarioPrinterTest.java rename to mockito-core/src/test/java/org/mockito/internal/exceptions/util/ScenarioPrinterTest.java diff --git a/src/test/java/org/mockito/internal/framework/DefaultMockitoFrameworkTest.java b/mockito-core/src/test/java/org/mockito/internal/framework/DefaultMockitoFrameworkTest.java similarity index 100% rename from src/test/java/org/mockito/internal/framework/DefaultMockitoFrameworkTest.java rename to mockito-core/src/test/java/org/mockito/internal/framework/DefaultMockitoFrameworkTest.java diff --git a/src/test/java/org/mockito/internal/hamcrest/MatcherGenericTypeExtractorTest.java b/mockito-core/src/test/java/org/mockito/internal/hamcrest/MatcherGenericTypeExtractorTest.java similarity index 100% rename from src/test/java/org/mockito/internal/hamcrest/MatcherGenericTypeExtractorTest.java rename to mockito-core/src/test/java/org/mockito/internal/hamcrest/MatcherGenericTypeExtractorTest.java diff --git a/src/test/java/org/mockito/internal/handler/InvocationNotifierHandlerTest.java b/mockito-core/src/test/java/org/mockito/internal/handler/InvocationNotifierHandlerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/handler/InvocationNotifierHandlerTest.java rename to mockito-core/src/test/java/org/mockito/internal/handler/InvocationNotifierHandlerTest.java diff --git a/src/test/java/org/mockito/internal/handler/MockHandlerFactoryTest.java b/mockito-core/src/test/java/org/mockito/internal/handler/MockHandlerFactoryTest.java similarity index 100% rename from src/test/java/org/mockito/internal/handler/MockHandlerFactoryTest.java rename to mockito-core/src/test/java/org/mockito/internal/handler/MockHandlerFactoryTest.java diff --git a/src/test/java/org/mockito/internal/handler/MockHandlerImplTest.java b/mockito-core/src/test/java/org/mockito/internal/handler/MockHandlerImplTest.java similarity index 100% rename from src/test/java/org/mockito/internal/handler/MockHandlerImplTest.java rename to mockito-core/src/test/java/org/mockito/internal/handler/MockHandlerImplTest.java diff --git a/src/test/java/org/mockito/internal/invocation/InvocationBuilder.java b/mockito-core/src/test/java/org/mockito/internal/invocation/InvocationBuilder.java similarity index 100% rename from src/test/java/org/mockito/internal/invocation/InvocationBuilder.java rename to mockito-core/src/test/java/org/mockito/internal/invocation/InvocationBuilder.java diff --git a/src/test/java/org/mockito/internal/invocation/InvocationMarkerTest.java b/mockito-core/src/test/java/org/mockito/internal/invocation/InvocationMarkerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/invocation/InvocationMarkerTest.java rename to mockito-core/src/test/java/org/mockito/internal/invocation/InvocationMarkerTest.java diff --git a/src/test/java/org/mockito/internal/invocation/InvocationMatcherTest.java b/mockito-core/src/test/java/org/mockito/internal/invocation/InvocationMatcherTest.java similarity index 100% rename from src/test/java/org/mockito/internal/invocation/InvocationMatcherTest.java rename to mockito-core/src/test/java/org/mockito/internal/invocation/InvocationMatcherTest.java diff --git a/src/test/java/org/mockito/internal/invocation/InvocationsFinderTest.java b/mockito-core/src/test/java/org/mockito/internal/invocation/InvocationsFinderTest.java similarity index 100% rename from src/test/java/org/mockito/internal/invocation/InvocationsFinderTest.java rename to mockito-core/src/test/java/org/mockito/internal/invocation/InvocationsFinderTest.java diff --git a/src/test/java/org/mockito/internal/invocation/MatcherApplicationStrategyTest.java b/mockito-core/src/test/java/org/mockito/internal/invocation/MatcherApplicationStrategyTest.java similarity index 100% rename from src/test/java/org/mockito/internal/invocation/MatcherApplicationStrategyTest.java rename to mockito-core/src/test/java/org/mockito/internal/invocation/MatcherApplicationStrategyTest.java diff --git a/src/test/java/org/mockito/internal/invocation/SerializableMethodTest.java b/mockito-core/src/test/java/org/mockito/internal/invocation/SerializableMethodTest.java similarity index 100% rename from src/test/java/org/mockito/internal/invocation/SerializableMethodTest.java rename to mockito-core/src/test/java/org/mockito/internal/invocation/SerializableMethodTest.java diff --git a/src/test/java/org/mockito/internal/invocation/TypeSafeMatchingTest.java b/mockito-core/src/test/java/org/mockito/internal/invocation/TypeSafeMatchingTest.java similarity index 100% rename from src/test/java/org/mockito/internal/invocation/TypeSafeMatchingTest.java rename to mockito-core/src/test/java/org/mockito/internal/invocation/TypeSafeMatchingTest.java diff --git a/src/test/java/org/mockito/internal/invocation/mockref/MockWeakReferenceTest.java b/mockito-core/src/test/java/org/mockito/internal/invocation/mockref/MockWeakReferenceTest.java similarity index 100% rename from src/test/java/org/mockito/internal/invocation/mockref/MockWeakReferenceTest.java rename to mockito-core/src/test/java/org/mockito/internal/invocation/mockref/MockWeakReferenceTest.java diff --git a/src/test/java/org/mockito/internal/junit/ArgMismatchFinderTest.java b/mockito-core/src/test/java/org/mockito/internal/junit/ArgMismatchFinderTest.java similarity index 100% rename from src/test/java/org/mockito/internal/junit/ArgMismatchFinderTest.java rename to mockito-core/src/test/java/org/mockito/internal/junit/ArgMismatchFinderTest.java diff --git a/src/test/java/org/mockito/internal/junit/ExceptionFactoryTest.java b/mockito-core/src/test/java/org/mockito/internal/junit/ExceptionFactoryTest.java similarity index 100% rename from src/test/java/org/mockito/internal/junit/ExceptionFactoryTest.java rename to mockito-core/src/test/java/org/mockito/internal/junit/ExceptionFactoryTest.java diff --git a/src/test/java/org/mockito/internal/junit/JUnitRuleTest.java b/mockito-core/src/test/java/org/mockito/internal/junit/JUnitRuleTest.java similarity index 100% rename from src/test/java/org/mockito/internal/junit/JUnitRuleTest.java rename to mockito-core/src/test/java/org/mockito/internal/junit/JUnitRuleTest.java diff --git a/src/test/java/org/mockito/internal/junit/StubbingArgMismatchesTest.java b/mockito-core/src/test/java/org/mockito/internal/junit/StubbingArgMismatchesTest.java similarity index 100% rename from src/test/java/org/mockito/internal/junit/StubbingArgMismatchesTest.java rename to mockito-core/src/test/java/org/mockito/internal/junit/StubbingArgMismatchesTest.java diff --git a/src/test/java/org/mockito/internal/junit/UnusedStubbingsTest.java b/mockito-core/src/test/java/org/mockito/internal/junit/UnusedStubbingsTest.java similarity index 100% rename from src/test/java/org/mockito/internal/junit/UnusedStubbingsTest.java rename to mockito-core/src/test/java/org/mockito/internal/junit/UnusedStubbingsTest.java diff --git a/src/test/java/org/mockito/internal/listeners/StubbingLookupNotifierTest.java b/mockito-core/src/test/java/org/mockito/internal/listeners/StubbingLookupNotifierTest.java similarity index 100% rename from src/test/java/org/mockito/internal/listeners/StubbingLookupNotifierTest.java rename to mockito-core/src/test/java/org/mockito/internal/listeners/StubbingLookupNotifierTest.java diff --git a/src/test/java/org/mockito/internal/listeners/VerificationStartedNotifierTest.java b/mockito-core/src/test/java/org/mockito/internal/listeners/VerificationStartedNotifierTest.java similarity index 100% rename from src/test/java/org/mockito/internal/listeners/VerificationStartedNotifierTest.java rename to mockito-core/src/test/java/org/mockito/internal/listeners/VerificationStartedNotifierTest.java diff --git a/src/test/java/org/mockito/internal/matchers/AndTest.java b/mockito-core/src/test/java/org/mockito/internal/matchers/AndTest.java similarity index 100% rename from src/test/java/org/mockito/internal/matchers/AndTest.java rename to mockito-core/src/test/java/org/mockito/internal/matchers/AndTest.java diff --git a/src/test/java/org/mockito/internal/matchers/CapturingMatcherTest.java b/mockito-core/src/test/java/org/mockito/internal/matchers/CapturingMatcherTest.java similarity index 100% rename from src/test/java/org/mockito/internal/matchers/CapturingMatcherTest.java rename to mockito-core/src/test/java/org/mockito/internal/matchers/CapturingMatcherTest.java diff --git a/src/test/java/org/mockito/internal/matchers/ComparableMatchersTest.java b/mockito-core/src/test/java/org/mockito/internal/matchers/ComparableMatchersTest.java similarity index 100% rename from src/test/java/org/mockito/internal/matchers/ComparableMatchersTest.java rename to mockito-core/src/test/java/org/mockito/internal/matchers/ComparableMatchersTest.java diff --git a/src/test/java/org/mockito/internal/matchers/EqualityTest.java b/mockito-core/src/test/java/org/mockito/internal/matchers/EqualityTest.java similarity index 100% rename from src/test/java/org/mockito/internal/matchers/EqualityTest.java rename to mockito-core/src/test/java/org/mockito/internal/matchers/EqualityTest.java diff --git a/src/test/java/org/mockito/internal/matchers/EqualsTest.java b/mockito-core/src/test/java/org/mockito/internal/matchers/EqualsTest.java similarity index 100% rename from src/test/java/org/mockito/internal/matchers/EqualsTest.java rename to mockito-core/src/test/java/org/mockito/internal/matchers/EqualsTest.java diff --git a/src/test/java/org/mockito/internal/matchers/InstanceOfTest.java b/mockito-core/src/test/java/org/mockito/internal/matchers/InstanceOfTest.java similarity index 100% rename from src/test/java/org/mockito/internal/matchers/InstanceOfTest.java rename to mockito-core/src/test/java/org/mockito/internal/matchers/InstanceOfTest.java diff --git a/src/test/java/org/mockito/internal/matchers/MatchersPrinterTest.java b/mockito-core/src/test/java/org/mockito/internal/matchers/MatchersPrinterTest.java similarity index 100% rename from src/test/java/org/mockito/internal/matchers/MatchersPrinterTest.java rename to mockito-core/src/test/java/org/mockito/internal/matchers/MatchersPrinterTest.java diff --git a/src/test/java/org/mockito/internal/matchers/MatchersToStringTest.java b/mockito-core/src/test/java/org/mockito/internal/matchers/MatchersToStringTest.java similarity index 100% rename from src/test/java/org/mockito/internal/matchers/MatchersToStringTest.java rename to mockito-core/src/test/java/org/mockito/internal/matchers/MatchersToStringTest.java diff --git a/src/test/java/org/mockito/internal/matchers/OrTest.java b/mockito-core/src/test/java/org/mockito/internal/matchers/OrTest.java similarity index 100% rename from src/test/java/org/mockito/internal/matchers/OrTest.java rename to mockito-core/src/test/java/org/mockito/internal/matchers/OrTest.java diff --git a/src/test/java/org/mockito/internal/matchers/SameTest.java b/mockito-core/src/test/java/org/mockito/internal/matchers/SameTest.java similarity index 100% rename from src/test/java/org/mockito/internal/matchers/SameTest.java rename to mockito-core/src/test/java/org/mockito/internal/matchers/SameTest.java diff --git a/src/test/java/org/mockito/internal/matchers/StringMatchersTest.java b/mockito-core/src/test/java/org/mockito/internal/matchers/StringMatchersTest.java similarity index 100% rename from src/test/java/org/mockito/internal/matchers/StringMatchersTest.java rename to mockito-core/src/test/java/org/mockito/internal/matchers/StringMatchersTest.java diff --git a/src/test/java/org/mockito/internal/matchers/apachecommons/EqualsBuilderTest.java b/mockito-core/src/test/java/org/mockito/internal/matchers/apachecommons/EqualsBuilderTest.java similarity index 100% rename from src/test/java/org/mockito/internal/matchers/apachecommons/EqualsBuilderTest.java rename to mockito-core/src/test/java/org/mockito/internal/matchers/apachecommons/EqualsBuilderTest.java diff --git a/src/test/java/org/mockito/internal/matchers/text/MatcherToStringTest.java b/mockito-core/src/test/java/org/mockito/internal/matchers/text/MatcherToStringTest.java similarity index 100% rename from src/test/java/org/mockito/internal/matchers/text/MatcherToStringTest.java rename to mockito-core/src/test/java/org/mockito/internal/matchers/text/MatcherToStringTest.java diff --git a/src/test/java/org/mockito/internal/matchers/text/ValuePrinterTest.java b/mockito-core/src/test/java/org/mockito/internal/matchers/text/ValuePrinterTest.java similarity index 100% rename from src/test/java/org/mockito/internal/matchers/text/ValuePrinterTest.java rename to mockito-core/src/test/java/org/mockito/internal/matchers/text/ValuePrinterTest.java diff --git a/src/test/java/org/mockito/internal/progress/AtLeastTest.java b/mockito-core/src/test/java/org/mockito/internal/progress/AtLeastTest.java similarity index 100% rename from src/test/java/org/mockito/internal/progress/AtLeastTest.java rename to mockito-core/src/test/java/org/mockito/internal/progress/AtLeastTest.java diff --git a/src/test/java/org/mockito/internal/progress/MockingProgressImplTest.java b/mockito-core/src/test/java/org/mockito/internal/progress/MockingProgressImplTest.java similarity index 100% rename from src/test/java/org/mockito/internal/progress/MockingProgressImplTest.java rename to mockito-core/src/test/java/org/mockito/internal/progress/MockingProgressImplTest.java diff --git a/src/test/java/org/mockito/internal/progress/ThreadSafeMockingProgressTest.java b/mockito-core/src/test/java/org/mockito/internal/progress/ThreadSafeMockingProgressTest.java similarity index 100% rename from src/test/java/org/mockito/internal/progress/ThreadSafeMockingProgressTest.java rename to mockito-core/src/test/java/org/mockito/internal/progress/ThreadSafeMockingProgressTest.java diff --git a/src/test/java/org/mockito/internal/progress/TimesTest.java b/mockito-core/src/test/java/org/mockito/internal/progress/TimesTest.java similarity index 100% rename from src/test/java/org/mockito/internal/progress/TimesTest.java rename to mockito-core/src/test/java/org/mockito/internal/progress/TimesTest.java diff --git a/src/test/java/org/mockito/internal/progress/VerificationModeBuilder.java b/mockito-core/src/test/java/org/mockito/internal/progress/VerificationModeBuilder.java similarity index 100% rename from src/test/java/org/mockito/internal/progress/VerificationModeBuilder.java rename to mockito-core/src/test/java/org/mockito/internal/progress/VerificationModeBuilder.java diff --git a/src/test/java/org/mockito/internal/reporting/PluralizerTest.java b/mockito-core/src/test/java/org/mockito/internal/reporting/PluralizerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/reporting/PluralizerTest.java rename to mockito-core/src/test/java/org/mockito/internal/reporting/PluralizerTest.java diff --git a/src/test/java/org/mockito/internal/runners/DefaultInternalRunnerTest.java b/mockito-core/src/test/java/org/mockito/internal/runners/DefaultInternalRunnerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/runners/DefaultInternalRunnerTest.java rename to mockito-core/src/test/java/org/mockito/internal/runners/DefaultInternalRunnerTest.java diff --git a/src/test/java/org/mockito/internal/runners/util/RunnerProviderTest.java b/mockito-core/src/test/java/org/mockito/internal/runners/util/RunnerProviderTest.java similarity index 100% rename from src/test/java/org/mockito/internal/runners/util/RunnerProviderTest.java rename to mockito-core/src/test/java/org/mockito/internal/runners/util/RunnerProviderTest.java diff --git a/src/test/java/org/mockito/internal/runners/util/TestMethodsFinderTest.java b/mockito-core/src/test/java/org/mockito/internal/runners/util/TestMethodsFinderTest.java similarity index 100% rename from src/test/java/org/mockito/internal/runners/util/TestMethodsFinderTest.java rename to mockito-core/src/test/java/org/mockito/internal/runners/util/TestMethodsFinderTest.java diff --git a/src/test/java/org/mockito/internal/session/DefaultMockitoSessionBuilderTest.java b/mockito-core/src/test/java/org/mockito/internal/session/DefaultMockitoSessionBuilderTest.java similarity index 100% rename from src/test/java/org/mockito/internal/session/DefaultMockitoSessionBuilderTest.java rename to mockito-core/src/test/java/org/mockito/internal/session/DefaultMockitoSessionBuilderTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/InvocationContainerImplStubbingTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/InvocationContainerImplStubbingTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/InvocationContainerImplStubbingTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/InvocationContainerImplStubbingTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/InvocationContainerImplTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/InvocationContainerImplTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/InvocationContainerImplTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/InvocationContainerImplTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/answers/AbstractThrowsExceptionTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/answers/AbstractThrowsExceptionTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/answers/AbstractThrowsExceptionTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/answers/AbstractThrowsExceptionTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/answers/AnswersWithDelayTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/answers/AnswersWithDelayTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/answers/AnswersWithDelayTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/answers/AnswersWithDelayTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/answers/CallsRealMethodsTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/answers/CallsRealMethodsTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/answers/CallsRealMethodsTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/answers/CallsRealMethodsTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/answers/DeepStubReturnsEnumJava11Test.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/answers/DeepStubReturnsEnumJava11Test.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/answers/DeepStubReturnsEnumJava11Test.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/answers/DeepStubReturnsEnumJava11Test.java diff --git a/src/test/java/org/mockito/internal/stubbing/answers/DefaultAnswerValidatorTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/answers/DefaultAnswerValidatorTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/answers/DefaultAnswerValidatorTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/answers/DefaultAnswerValidatorTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/answers/DoesNothingTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/answers/DoesNothingTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/answers/DoesNothingTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/answers/DoesNothingTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/answers/InvocationInfoExceptionTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/answers/InvocationInfoExceptionTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/answers/InvocationInfoExceptionTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/answers/InvocationInfoExceptionTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/answers/InvocationInfoTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/answers/InvocationInfoTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/answers/InvocationInfoTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/answers/InvocationInfoTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/answers/ReturnsArgumentAtTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/answers/ReturnsArgumentAtTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/answers/ReturnsArgumentAtTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/answers/ReturnsArgumentAtTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/answers/ReturnsTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/answers/ReturnsTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/answers/ReturnsTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/answers/ReturnsTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/answers/ThrowsExceptionForClassTypeTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/answers/ThrowsExceptionForClassTypeTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/answers/ThrowsExceptionForClassTypeTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/answers/ThrowsExceptionForClassTypeTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/answers/ThrowsExceptionTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/answers/ThrowsExceptionTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/answers/ThrowsExceptionTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/answers/ThrowsExceptionTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocationsTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocationsTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocationsTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocationsTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/defaultanswers/HasPrimitiveMethods.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/defaultanswers/HasPrimitiveMethods.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/defaultanswers/HasPrimitiveMethods.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/defaultanswers/HasPrimitiveMethods.java diff --git a/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsDeepStubsConcurrentTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsDeepStubsConcurrentTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsDeepStubsConcurrentTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsDeepStubsConcurrentTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsEmptyValuesTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsEmptyValuesTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsEmptyValuesTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsEmptyValuesTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsGenericDeepStubsTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsGenericDeepStubsTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsGenericDeepStubsTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsGenericDeepStubsTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMocksTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMocksTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMocksTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMocksTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMoreEmptyValuesTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMoreEmptyValuesTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMoreEmptyValuesTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMoreEmptyValuesTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsOptionalMocksTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsOptionalMocksTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsOptionalMocksTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsOptionalMocksTest.java diff --git a/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNullsTest.java b/mockito-core/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNullsTest.java similarity index 100% rename from src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNullsTest.java rename to mockito-core/src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNullsTest.java diff --git a/src/test/java/org/mockito/internal/util/ChecksTest.java b/mockito-core/src/test/java/org/mockito/internal/util/ChecksTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/ChecksTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/ChecksTest.java diff --git a/src/test/java/org/mockito/internal/util/DefaultMockingDetailsTest.java b/mockito-core/src/test/java/org/mockito/internal/util/DefaultMockingDetailsTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/DefaultMockingDetailsTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/DefaultMockingDetailsTest.java diff --git a/src/test/java/org/mockito/internal/util/MockCreationValidatorTest.java b/mockito-core/src/test/java/org/mockito/internal/util/MockCreationValidatorTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/MockCreationValidatorTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/MockCreationValidatorTest.java diff --git a/src/test/java/org/mockito/internal/util/MockNameImplTest.java b/mockito-core/src/test/java/org/mockito/internal/util/MockNameImplTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/MockNameImplTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/MockNameImplTest.java diff --git a/src/test/java/org/mockito/internal/util/MockSettingsTest.java b/mockito-core/src/test/java/org/mockito/internal/util/MockSettingsTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/MockSettingsTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/MockSettingsTest.java diff --git a/src/test/java/org/mockito/internal/util/MockUtilTest.java b/mockito-core/src/test/java/org/mockito/internal/util/MockUtilTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/MockUtilTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/MockUtilTest.java diff --git a/src/test/java/org/mockito/internal/util/ObjectMethodsGuruTest.java b/mockito-core/src/test/java/org/mockito/internal/util/ObjectMethodsGuruTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/ObjectMethodsGuruTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/ObjectMethodsGuruTest.java diff --git a/src/test/java/org/mockito/internal/util/PlatformTest.java b/mockito-core/src/test/java/org/mockito/internal/util/PlatformTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/PlatformTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/PlatformTest.java diff --git a/src/test/java/org/mockito/internal/util/PrimitivesTest.java b/mockito-core/src/test/java/org/mockito/internal/util/PrimitivesTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/PrimitivesTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/PrimitivesTest.java diff --git a/src/test/java/org/mockito/internal/util/SimpleMockitoLogger.java b/mockito-core/src/test/java/org/mockito/internal/util/SimpleMockitoLogger.java similarity index 100% rename from src/test/java/org/mockito/internal/util/SimpleMockitoLogger.java rename to mockito-core/src/test/java/org/mockito/internal/util/SimpleMockitoLogger.java diff --git a/src/test/java/org/mockito/internal/util/SimpleMockitoLoggerTest.java b/mockito-core/src/test/java/org/mockito/internal/util/SimpleMockitoLoggerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/SimpleMockitoLoggerTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/SimpleMockitoLoggerTest.java diff --git a/src/test/java/org/mockito/internal/util/StringUtilTest.java b/mockito-core/src/test/java/org/mockito/internal/util/StringUtilTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/StringUtilTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/StringUtilTest.java diff --git a/src/test/java/org/mockito/internal/util/TimerTest.java b/mockito-core/src/test/java/org/mockito/internal/util/TimerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/TimerTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/TimerTest.java diff --git a/src/test/java/org/mockito/internal/util/collections/HashCodeAndEqualsSafeSetTest.java b/mockito-core/src/test/java/org/mockito/internal/util/collections/HashCodeAndEqualsSafeSetTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/collections/HashCodeAndEqualsSafeSetTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/collections/HashCodeAndEqualsSafeSetTest.java diff --git a/src/test/java/org/mockito/internal/util/collections/IdentitySetTest.java b/mockito-core/src/test/java/org/mockito/internal/util/collections/IdentitySetTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/collections/IdentitySetTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/collections/IdentitySetTest.java diff --git a/src/test/java/org/mockito/internal/util/io/IOUtilTest.java b/mockito-core/src/test/java/org/mockito/internal/util/io/IOUtilTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/io/IOUtilTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/io/IOUtilTest.java diff --git a/src/test/java/org/mockito/internal/util/reflection/BeanPropertySetterTest.java b/mockito-core/src/test/java/org/mockito/internal/util/reflection/BeanPropertySetterTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/reflection/BeanPropertySetterTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/reflection/BeanPropertySetterTest.java diff --git a/src/test/java/org/mockito/internal/util/reflection/DummyClassForTests.java b/mockito-core/src/test/java/org/mockito/internal/util/reflection/DummyClassForTests.java similarity index 100% rename from src/test/java/org/mockito/internal/util/reflection/DummyClassForTests.java rename to mockito-core/src/test/java/org/mockito/internal/util/reflection/DummyClassForTests.java diff --git a/src/test/java/org/mockito/internal/util/reflection/DummyParentClassForTests.java b/mockito-core/src/test/java/org/mockito/internal/util/reflection/DummyParentClassForTests.java similarity index 100% rename from src/test/java/org/mockito/internal/util/reflection/DummyParentClassForTests.java rename to mockito-core/src/test/java/org/mockito/internal/util/reflection/DummyParentClassForTests.java diff --git a/src/test/java/org/mockito/internal/util/reflection/FieldInitializerTest.java b/mockito-core/src/test/java/org/mockito/internal/util/reflection/FieldInitializerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/reflection/FieldInitializerTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/reflection/FieldInitializerTest.java diff --git a/src/test/java/org/mockito/internal/util/reflection/FieldReaderTest.java b/mockito-core/src/test/java/org/mockito/internal/util/reflection/FieldReaderTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/reflection/FieldReaderTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/reflection/FieldReaderTest.java diff --git a/src/test/java/org/mockito/internal/util/reflection/GenericArrayReturnTypeTest.java b/mockito-core/src/test/java/org/mockito/internal/util/reflection/GenericArrayReturnTypeTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/reflection/GenericArrayReturnTypeTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/reflection/GenericArrayReturnTypeTest.java diff --git a/src/test/java/org/mockito/internal/util/reflection/GenericMasterTest.java b/mockito-core/src/test/java/org/mockito/internal/util/reflection/GenericMasterTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/reflection/GenericMasterTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/reflection/GenericMasterTest.java diff --git a/src/test/java/org/mockito/internal/util/reflection/GenericMetadataSupportTest.java b/mockito-core/src/test/java/org/mockito/internal/util/reflection/GenericMetadataSupportTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/reflection/GenericMetadataSupportTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/reflection/GenericMetadataSupportTest.java diff --git a/src/test/java/org/mockito/internal/util/reflection/GenericTypeExtractorTest.java b/mockito-core/src/test/java/org/mockito/internal/util/reflection/GenericTypeExtractorTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/reflection/GenericTypeExtractorTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/reflection/GenericTypeExtractorTest.java diff --git a/src/test/java/org/mockito/internal/util/reflection/LenientCopyToolTest.java b/mockito-core/src/test/java/org/mockito/internal/util/reflection/LenientCopyToolTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/reflection/LenientCopyToolTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/reflection/LenientCopyToolTest.java diff --git a/src/test/java/org/mockito/internal/util/reflection/MemberAccessorTest.java b/mockito-core/src/test/java/org/mockito/internal/util/reflection/MemberAccessorTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/reflection/MemberAccessorTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/reflection/MemberAccessorTest.java diff --git a/src/test/java/org/mockito/internal/util/reflection/ParameterizedConstructorInstantiatorTest.java b/mockito-core/src/test/java/org/mockito/internal/util/reflection/ParameterizedConstructorInstantiatorTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/reflection/ParameterizedConstructorInstantiatorTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/reflection/ParameterizedConstructorInstantiatorTest.java diff --git a/src/test/java/org/mockito/internal/util/reflection/SuperTypesLastSorterTest.java b/mockito-core/src/test/java/org/mockito/internal/util/reflection/SuperTypesLastSorterTest.java similarity index 100% rename from src/test/java/org/mockito/internal/util/reflection/SuperTypesLastSorterTest.java rename to mockito-core/src/test/java/org/mockito/internal/util/reflection/SuperTypesLastSorterTest.java diff --git a/src/test/java/org/mockito/internal/verification/DefaultRegisteredInvocationsTest.java b/mockito-core/src/test/java/org/mockito/internal/verification/DefaultRegisteredInvocationsTest.java similarity index 100% rename from src/test/java/org/mockito/internal/verification/DefaultRegisteredInvocationsTest.java rename to mockito-core/src/test/java/org/mockito/internal/verification/DefaultRegisteredInvocationsTest.java diff --git a/src/test/java/org/mockito/internal/verification/DescriptionTest.java b/mockito-core/src/test/java/org/mockito/internal/verification/DescriptionTest.java similarity index 100% rename from src/test/java/org/mockito/internal/verification/DescriptionTest.java rename to mockito-core/src/test/java/org/mockito/internal/verification/DescriptionTest.java diff --git a/src/test/java/org/mockito/internal/verification/DummyVerificationMode.java b/mockito-core/src/test/java/org/mockito/internal/verification/DummyVerificationMode.java similarity index 100% rename from src/test/java/org/mockito/internal/verification/DummyVerificationMode.java rename to mockito-core/src/test/java/org/mockito/internal/verification/DummyVerificationMode.java diff --git a/src/test/java/org/mockito/internal/verification/NoInteractionsTest.java b/mockito-core/src/test/java/org/mockito/internal/verification/NoInteractionsTest.java similarity index 100% rename from src/test/java/org/mockito/internal/verification/NoInteractionsTest.java rename to mockito-core/src/test/java/org/mockito/internal/verification/NoInteractionsTest.java diff --git a/src/test/java/org/mockito/internal/verification/NoMoreInteractionsTest.java b/mockito-core/src/test/java/org/mockito/internal/verification/NoMoreInteractionsTest.java similarity index 100% rename from src/test/java/org/mockito/internal/verification/NoMoreInteractionsTest.java rename to mockito-core/src/test/java/org/mockito/internal/verification/NoMoreInteractionsTest.java diff --git a/src/test/java/org/mockito/internal/verification/OnlyTest.java b/mockito-core/src/test/java/org/mockito/internal/verification/OnlyTest.java similarity index 100% rename from src/test/java/org/mockito/internal/verification/OnlyTest.java rename to mockito-core/src/test/java/org/mockito/internal/verification/OnlyTest.java diff --git a/src/test/java/org/mockito/internal/verification/SmartPrinterTest.java b/mockito-core/src/test/java/org/mockito/internal/verification/SmartPrinterTest.java similarity index 100% rename from src/test/java/org/mockito/internal/verification/SmartPrinterTest.java rename to mockito-core/src/test/java/org/mockito/internal/verification/SmartPrinterTest.java diff --git a/src/test/java/org/mockito/internal/verification/VerificationDataImplTest.java b/mockito-core/src/test/java/org/mockito/internal/verification/VerificationDataImplTest.java similarity index 100% rename from src/test/java/org/mockito/internal/verification/VerificationDataImplTest.java rename to mockito-core/src/test/java/org/mockito/internal/verification/VerificationDataImplTest.java diff --git a/src/test/java/org/mockito/internal/verification/VerificationOverTimeImplTest.java b/mockito-core/src/test/java/org/mockito/internal/verification/VerificationOverTimeImplTest.java similarity index 100% rename from src/test/java/org/mockito/internal/verification/VerificationOverTimeImplTest.java rename to mockito-core/src/test/java/org/mockito/internal/verification/VerificationOverTimeImplTest.java diff --git a/src/test/java/org/mockito/internal/verification/VerificationWithDescriptionTest.java b/mockito-core/src/test/java/org/mockito/internal/verification/VerificationWithDescriptionTest.java similarity index 100% rename from src/test/java/org/mockito/internal/verification/VerificationWithDescriptionTest.java rename to mockito-core/src/test/java/org/mockito/internal/verification/VerificationWithDescriptionTest.java diff --git a/src/test/java/org/mockito/internal/verification/argumentmatching/ArgumentMatchingToolTest.java b/mockito-core/src/test/java/org/mockito/internal/verification/argumentmatching/ArgumentMatchingToolTest.java similarity index 100% rename from src/test/java/org/mockito/internal/verification/argumentmatching/ArgumentMatchingToolTest.java rename to mockito-core/src/test/java/org/mockito/internal/verification/argumentmatching/ArgumentMatchingToolTest.java diff --git a/src/test/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsCheckerTest.java b/mockito-core/src/test/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsCheckerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsCheckerTest.java rename to mockito-core/src/test/java/org/mockito/internal/verification/checkers/AtLeastXNumberOfInvocationsCheckerTest.java diff --git a/src/test/java/org/mockito/internal/verification/checkers/MissingInvocationCheckerTest.java b/mockito-core/src/test/java/org/mockito/internal/verification/checkers/MissingInvocationCheckerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/verification/checkers/MissingInvocationCheckerTest.java rename to mockito-core/src/test/java/org/mockito/internal/verification/checkers/MissingInvocationCheckerTest.java diff --git a/src/test/java/org/mockito/internal/verification/checkers/MissingInvocationInOrderCheckerTest.java b/mockito-core/src/test/java/org/mockito/internal/verification/checkers/MissingInvocationInOrderCheckerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/verification/checkers/MissingInvocationInOrderCheckerTest.java rename to mockito-core/src/test/java/org/mockito/internal/verification/checkers/MissingInvocationInOrderCheckerTest.java diff --git a/src/test/java/org/mockito/internal/verification/checkers/NumberOfInvocationsCheckerTest.java b/mockito-core/src/test/java/org/mockito/internal/verification/checkers/NumberOfInvocationsCheckerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/verification/checkers/NumberOfInvocationsCheckerTest.java rename to mockito-core/src/test/java/org/mockito/internal/verification/checkers/NumberOfInvocationsCheckerTest.java diff --git a/src/test/java/org/mockito/internal/verification/checkers/NumberOfInvocationsInOrderCheckerTest.java b/mockito-core/src/test/java/org/mockito/internal/verification/checkers/NumberOfInvocationsInOrderCheckerTest.java similarity index 100% rename from src/test/java/org/mockito/internal/verification/checkers/NumberOfInvocationsInOrderCheckerTest.java rename to mockito-core/src/test/java/org/mockito/internal/verification/checkers/NumberOfInvocationsInOrderCheckerTest.java diff --git a/src/test/java/org/mockito/junit/TestableJUnitRunner.java b/mockito-core/src/test/java/org/mockito/junit/TestableJUnitRunner.java similarity index 100% rename from src/test/java/org/mockito/junit/TestableJUnitRunner.java rename to mockito-core/src/test/java/org/mockito/junit/TestableJUnitRunner.java diff --git a/src/test/java/org/mockito/verification/NegativeDurationTest.java b/mockito-core/src/test/java/org/mockito/verification/NegativeDurationTest.java similarity index 100% rename from src/test/java/org/mockito/verification/NegativeDurationTest.java rename to mockito-core/src/test/java/org/mockito/verification/NegativeDurationTest.java diff --git a/src/test/java/org/mockito/verification/TimeoutTest.java b/mockito-core/src/test/java/org/mockito/verification/TimeoutTest.java similarity index 100% rename from src/test/java/org/mockito/verification/TimeoutTest.java rename to mockito-core/src/test/java/org/mockito/verification/TimeoutTest.java diff --git a/src/test/java/org/mockitointegration/ClassLoadabilityChecker.java b/mockito-core/src/test/java/org/mockitointegration/ClassLoadabilityChecker.java similarity index 100% rename from src/test/java/org/mockitointegration/ClassLoadabilityChecker.java rename to mockito-core/src/test/java/org/mockitointegration/ClassLoadabilityChecker.java diff --git a/src/test/java/org/mockitointegration/DeferMockMakersClassLoadingTest.java b/mockito-core/src/test/java/org/mockitointegration/DeferMockMakersClassLoadingTest.java similarity index 100% rename from src/test/java/org/mockitointegration/DeferMockMakersClassLoadingTest.java rename to mockito-core/src/test/java/org/mockitointegration/DeferMockMakersClassLoadingTest.java diff --git a/src/test/java/org/mockitointegration/NoByteCodeDependenciesTest.java b/mockito-core/src/test/java/org/mockitointegration/NoByteCodeDependenciesTest.java similarity index 100% rename from src/test/java/org/mockitointegration/NoByteCodeDependenciesTest.java rename to mockito-core/src/test/java/org/mockitointegration/NoByteCodeDependenciesTest.java diff --git a/src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java b/mockito-core/src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java similarity index 100% rename from src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java rename to mockito-core/src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java diff --git a/src/test/java/org/mockitointegration/package-info.java b/mockito-core/src/test/java/org/mockitointegration/package-info.java similarity index 100% rename from src/test/java/org/mockitointegration/package-info.java rename to mockito-core/src/test/java/org/mockitointegration/package-info.java diff --git a/src/test/java/org/mockitousage/CompilationWarningsTest.java b/mockito-core/src/test/java/org/mockitousage/CompilationWarningsTest.java similarity index 100% rename from src/test/java/org/mockitousage/CompilationWarningsTest.java rename to mockito-core/src/test/java/org/mockitousage/CompilationWarningsTest.java diff --git a/src/test/java/org/mockitousage/IMethods.java b/mockito-core/src/test/java/org/mockitousage/IMethods.java similarity index 100% rename from src/test/java/org/mockitousage/IMethods.java rename to mockito-core/src/test/java/org/mockitousage/IMethods.java diff --git a/src/test/java/org/mockitousage/MethodsImpl.java b/mockito-core/src/test/java/org/mockitousage/MethodsImpl.java similarity index 100% rename from src/test/java/org/mockitousage/MethodsImpl.java rename to mockito-core/src/test/java/org/mockitousage/MethodsImpl.java diff --git a/src/test/java/org/mockitousage/PlaygroundTest.java b/mockito-core/src/test/java/org/mockitousage/PlaygroundTest.java similarity index 100% rename from src/test/java/org/mockitousage/PlaygroundTest.java rename to mockito-core/src/test/java/org/mockitousage/PlaygroundTest.java diff --git a/src/test/java/org/mockitousage/PlaygroundWithDemoOfUnclonedParametersProblemTest.java b/mockito-core/src/test/java/org/mockitousage/PlaygroundWithDemoOfUnclonedParametersProblemTest.java similarity index 100% rename from src/test/java/org/mockitousage/PlaygroundWithDemoOfUnclonedParametersProblemTest.java rename to mockito-core/src/test/java/org/mockitousage/PlaygroundWithDemoOfUnclonedParametersProblemTest.java diff --git a/src/test/java/org/mockitousage/annotation/AnnotationsTest.java b/mockito-core/src/test/java/org/mockitousage/annotation/AnnotationsTest.java similarity index 100% rename from src/test/java/org/mockitousage/annotation/AnnotationsTest.java rename to mockito-core/src/test/java/org/mockitousage/annotation/AnnotationsTest.java diff --git a/src/test/java/org/mockitousage/annotation/CaptorAnnotationBasicTest.java b/mockito-core/src/test/java/org/mockitousage/annotation/CaptorAnnotationBasicTest.java similarity index 100% rename from src/test/java/org/mockitousage/annotation/CaptorAnnotationBasicTest.java rename to mockito-core/src/test/java/org/mockitousage/annotation/CaptorAnnotationBasicTest.java diff --git a/src/test/java/org/mockitousage/annotation/CaptorAnnotationTest.java b/mockito-core/src/test/java/org/mockitousage/annotation/CaptorAnnotationTest.java similarity index 100% rename from src/test/java/org/mockitousage/annotation/CaptorAnnotationTest.java rename to mockito-core/src/test/java/org/mockitousage/annotation/CaptorAnnotationTest.java diff --git a/src/test/java/org/mockitousage/annotation/CaptorAnnotationUnhappyPathTest.java b/mockito-core/src/test/java/org/mockitousage/annotation/CaptorAnnotationUnhappyPathTest.java similarity index 100% rename from src/test/java/org/mockitousage/annotation/CaptorAnnotationUnhappyPathTest.java rename to mockito-core/src/test/java/org/mockitousage/annotation/CaptorAnnotationUnhappyPathTest.java diff --git a/src/test/java/org/mockitousage/annotation/DoNotMockTest.java b/mockito-core/src/test/java/org/mockitousage/annotation/DoNotMockTest.java similarity index 100% rename from src/test/java/org/mockitousage/annotation/DoNotMockTest.java rename to mockito-core/src/test/java/org/mockitousage/annotation/DoNotMockTest.java diff --git a/src/test/java/org/mockitousage/annotation/InjectionOfInlinedMockDeclarationTest.java b/mockito-core/src/test/java/org/mockitousage/annotation/InjectionOfInlinedMockDeclarationTest.java similarity index 100% rename from src/test/java/org/mockitousage/annotation/InjectionOfInlinedMockDeclarationTest.java rename to mockito-core/src/test/java/org/mockitousage/annotation/InjectionOfInlinedMockDeclarationTest.java diff --git a/src/test/java/org/mockitousage/annotation/MockInjectionUsingConstructorIssue421Test.java b/mockito-core/src/test/java/org/mockitousage/annotation/MockInjectionUsingConstructorIssue421Test.java similarity index 100% rename from src/test/java/org/mockitousage/annotation/MockInjectionUsingConstructorIssue421Test.java rename to mockito-core/src/test/java/org/mockitousage/annotation/MockInjectionUsingConstructorIssue421Test.java diff --git a/src/test/java/org/mockitousage/annotation/MockInjectionUsingConstructorTest.java b/mockito-core/src/test/java/org/mockitousage/annotation/MockInjectionUsingConstructorTest.java similarity index 100% rename from src/test/java/org/mockitousage/annotation/MockInjectionUsingConstructorTest.java rename to mockito-core/src/test/java/org/mockitousage/annotation/MockInjectionUsingConstructorTest.java diff --git a/src/test/java/org/mockitousage/annotation/MockInjectionUsingSetterOrPropertyTest.java b/mockito-core/src/test/java/org/mockitousage/annotation/MockInjectionUsingSetterOrPropertyTest.java similarity index 100% rename from src/test/java/org/mockitousage/annotation/MockInjectionUsingSetterOrPropertyTest.java rename to mockito-core/src/test/java/org/mockitousage/annotation/MockInjectionUsingSetterOrPropertyTest.java diff --git a/src/test/java/org/mockitousage/annotation/SpyAnnotationInitializedInBaseClassTest.java b/mockito-core/src/test/java/org/mockitousage/annotation/SpyAnnotationInitializedInBaseClassTest.java similarity index 100% rename from src/test/java/org/mockitousage/annotation/SpyAnnotationInitializedInBaseClassTest.java rename to mockito-core/src/test/java/org/mockitousage/annotation/SpyAnnotationInitializedInBaseClassTest.java diff --git a/src/test/java/org/mockitousage/annotation/SpyAnnotationTest.java b/mockito-core/src/test/java/org/mockitousage/annotation/SpyAnnotationTest.java similarity index 100% rename from src/test/java/org/mockitousage/annotation/SpyAnnotationTest.java rename to mockito-core/src/test/java/org/mockitousage/annotation/SpyAnnotationTest.java diff --git a/src/test/java/org/mockitousage/annotation/SpyInjectionTest.java b/mockito-core/src/test/java/org/mockitousage/annotation/SpyInjectionTest.java similarity index 100% rename from src/test/java/org/mockitousage/annotation/SpyInjectionTest.java rename to mockito-core/src/test/java/org/mockitousage/annotation/SpyInjectionTest.java diff --git a/src/test/java/org/mockitousage/annotation/WrongSetOfAnnotationsTest.java b/mockito-core/src/test/java/org/mockitousage/annotation/WrongSetOfAnnotationsTest.java similarity index 100% rename from src/test/java/org/mockitousage/annotation/WrongSetOfAnnotationsTest.java rename to mockito-core/src/test/java/org/mockitousage/annotation/WrongSetOfAnnotationsTest.java diff --git a/src/test/java/org/mockitousage/annotation/org/mockito/DoNotMock.java b/mockito-core/src/test/java/org/mockitousage/annotation/org/mockito/DoNotMock.java similarity index 100% rename from src/test/java/org/mockitousage/annotation/org/mockito/DoNotMock.java rename to mockito-core/src/test/java/org/mockitousage/annotation/org/mockito/DoNotMock.java diff --git a/src/test/java/org/mockitousage/basicapi/MockAccessTest.java b/mockito-core/src/test/java/org/mockitousage/basicapi/MockAccessTest.java similarity index 100% rename from src/test/java/org/mockitousage/basicapi/MockAccessTest.java rename to mockito-core/src/test/java/org/mockitousage/basicapi/MockAccessTest.java diff --git a/src/test/java/org/mockitousage/basicapi/MockingMultipleInterfacesTest.java b/mockito-core/src/test/java/org/mockitousage/basicapi/MockingMultipleInterfacesTest.java similarity index 100% rename from src/test/java/org/mockitousage/basicapi/MockingMultipleInterfacesTest.java rename to mockito-core/src/test/java/org/mockitousage/basicapi/MockingMultipleInterfacesTest.java diff --git a/src/test/java/org/mockitousage/basicapi/MocksCreationTest.java b/mockito-core/src/test/java/org/mockitousage/basicapi/MocksCreationTest.java similarity index 100% rename from src/test/java/org/mockitousage/basicapi/MocksCreationTest.java rename to mockito-core/src/test/java/org/mockitousage/basicapi/MocksCreationTest.java diff --git a/src/test/java/org/mockitousage/basicapi/MocksSerializationForAnnotationTest.java b/mockito-core/src/test/java/org/mockitousage/basicapi/MocksSerializationForAnnotationTest.java similarity index 100% rename from src/test/java/org/mockitousage/basicapi/MocksSerializationForAnnotationTest.java rename to mockito-core/src/test/java/org/mockitousage/basicapi/MocksSerializationForAnnotationTest.java diff --git a/src/test/java/org/mockitousage/basicapi/MocksSerializationTest.java b/mockito-core/src/test/java/org/mockitousage/basicapi/MocksSerializationTest.java similarity index 100% rename from src/test/java/org/mockitousage/basicapi/MocksSerializationTest.java rename to mockito-core/src/test/java/org/mockitousage/basicapi/MocksSerializationTest.java diff --git a/src/test/java/org/mockitousage/basicapi/ObjectsSerializationTest.java b/mockito-core/src/test/java/org/mockitousage/basicapi/ObjectsSerializationTest.java similarity index 100% rename from src/test/java/org/mockitousage/basicapi/ObjectsSerializationTest.java rename to mockito-core/src/test/java/org/mockitousage/basicapi/ObjectsSerializationTest.java diff --git a/src/test/java/org/mockitousage/basicapi/ReplacingObjectMethodsTest.java b/mockito-core/src/test/java/org/mockitousage/basicapi/ReplacingObjectMethodsTest.java similarity index 100% rename from src/test/java/org/mockitousage/basicapi/ReplacingObjectMethodsTest.java rename to mockito-core/src/test/java/org/mockitousage/basicapi/ReplacingObjectMethodsTest.java diff --git a/src/test/java/org/mockitousage/basicapi/ResetInvocationsTest.java b/mockito-core/src/test/java/org/mockitousage/basicapi/ResetInvocationsTest.java similarity index 100% rename from src/test/java/org/mockitousage/basicapi/ResetInvocationsTest.java rename to mockito-core/src/test/java/org/mockitousage/basicapi/ResetInvocationsTest.java diff --git a/src/test/java/org/mockitousage/basicapi/ResetTest.java b/mockito-core/src/test/java/org/mockitousage/basicapi/ResetTest.java similarity index 100% rename from src/test/java/org/mockitousage/basicapi/ResetTest.java rename to mockito-core/src/test/java/org/mockitousage/basicapi/ResetTest.java diff --git a/src/test/java/org/mockitousage/basicapi/UsingVarargsTest.java b/mockito-core/src/test/java/org/mockitousage/basicapi/UsingVarargsTest.java similarity index 100% rename from src/test/java/org/mockitousage/basicapi/UsingVarargsTest.java rename to mockito-core/src/test/java/org/mockitousage/basicapi/UsingVarargsTest.java diff --git a/src/test/java/org/mockitousage/bugs/AIOOBExceptionWithAtLeastTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/AIOOBExceptionWithAtLeastTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/AIOOBExceptionWithAtLeastTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/AIOOBExceptionWithAtLeastTest.java diff --git a/src/test/java/org/mockitousage/bugs/ActualInvocationHasNullArgumentNPEBugTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/ActualInvocationHasNullArgumentNPEBugTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/ActualInvocationHasNullArgumentNPEBugTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/ActualInvocationHasNullArgumentNPEBugTest.java diff --git a/src/test/java/org/mockitousage/bugs/ArgumentCaptorDontCapturePreviouslyVerifiedTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/ArgumentCaptorDontCapturePreviouslyVerifiedTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/ArgumentCaptorDontCapturePreviouslyVerifiedTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/ArgumentCaptorDontCapturePreviouslyVerifiedTest.java diff --git a/src/test/java/org/mockitousage/bugs/AtLeastMarksAllInvocationsVerified.java b/mockito-core/src/test/java/org/mockitousage/bugs/AtLeastMarksAllInvocationsVerified.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/AtLeastMarksAllInvocationsVerified.java rename to mockito-core/src/test/java/org/mockitousage/bugs/AtLeastMarksAllInvocationsVerified.java diff --git a/src/test/java/org/mockitousage/bugs/BridgeMethodsHitAgainTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/BridgeMethodsHitAgainTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/BridgeMethodsHitAgainTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/BridgeMethodsHitAgainTest.java diff --git a/src/test/java/org/mockitousage/bugs/CaptorAnnotationAutoboxingTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/CaptorAnnotationAutoboxingTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/CaptorAnnotationAutoboxingTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/CaptorAnnotationAutoboxingTest.java diff --git a/src/test/java/org/mockitousage/bugs/ClassCastExOnVerifyZeroInteractionsTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/ClassCastExOnVerifyZeroInteractionsTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/ClassCastExOnVerifyZeroInteractionsTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/ClassCastExOnVerifyZeroInteractionsTest.java diff --git a/src/test/java/org/mockitousage/bugs/CompareMatcherTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/CompareMatcherTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/CompareMatcherTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/CompareMatcherTest.java diff --git a/src/test/java/org/mockitousage/bugs/ConcurrentModificationExceptionOnMultiThreadedVerificationTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/ConcurrentModificationExceptionOnMultiThreadedVerificationTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/ConcurrentModificationExceptionOnMultiThreadedVerificationTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/ConcurrentModificationExceptionOnMultiThreadedVerificationTest.java diff --git a/src/test/java/org/mockitousage/bugs/ConfusedSignatureTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/ConfusedSignatureTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/ConfusedSignatureTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/ConfusedSignatureTest.java diff --git a/src/test/java/org/mockitousage/bugs/CovariantOverrideTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/CovariantOverrideTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/CovariantOverrideTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/CovariantOverrideTest.java diff --git a/src/test/java/org/mockitousage/bugs/DiamondInheritanceIsConfusingMockitoTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/DiamondInheritanceIsConfusingMockitoTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/DiamondInheritanceIsConfusingMockitoTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/DiamondInheritanceIsConfusingMockitoTest.java diff --git a/src/test/java/org/mockitousage/bugs/EnabledMockingInterfaceCloneMethodTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/EnabledMockingInterfaceCloneMethodTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/EnabledMockingInterfaceCloneMethodTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/EnabledMockingInterfaceCloneMethodTest.java diff --git a/src/test/java/org/mockitousage/bugs/EqualsWithDeltaTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/EqualsWithDeltaTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/EqualsWithDeltaTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/EqualsWithDeltaTest.java diff --git a/src/test/java/org/mockitousage/bugs/FillInStackTraceScenariosTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/FillInStackTraceScenariosTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/FillInStackTraceScenariosTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/FillInStackTraceScenariosTest.java diff --git a/src/test/java/org/mockitousage/bugs/FinalHashCodeAndEqualsRaiseNPEInInitMocksTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/FinalHashCodeAndEqualsRaiseNPEInInitMocksTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/FinalHashCodeAndEqualsRaiseNPEInInitMocksTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/FinalHashCodeAndEqualsRaiseNPEInInitMocksTest.java diff --git a/src/test/java/org/mockitousage/bugs/GenericsMockitoAnnotationsTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/GenericsMockitoAnnotationsTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/GenericsMockitoAnnotationsTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/GenericsMockitoAnnotationsTest.java diff --git a/src/test/java/org/mockitousage/bugs/IOOBExceptionShouldNotBeThrownWhenNotCodingFluentlyTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/IOOBExceptionShouldNotBeThrownWhenNotCodingFluentlyTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/IOOBExceptionShouldNotBeThrownWhenNotCodingFluentlyTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/IOOBExceptionShouldNotBeThrownWhenNotCodingFluentlyTest.java diff --git a/src/test/java/org/mockitousage/bugs/ImplementationOfGenericAbstractMethodNotInvokedOnSpyTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/ImplementationOfGenericAbstractMethodNotInvokedOnSpyTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/ImplementationOfGenericAbstractMethodNotInvokedOnSpyTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/ImplementationOfGenericAbstractMethodNotInvokedOnSpyTest.java diff --git a/src/test/java/org/mockitousage/bugs/InheritedGenericsPolimorphicCallTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/InheritedGenericsPolimorphicCallTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/InheritedGenericsPolimorphicCallTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/InheritedGenericsPolimorphicCallTest.java diff --git a/src/test/java/org/mockitousage/bugs/ListenersLostOnResetMockTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/ListenersLostOnResetMockTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/ListenersLostOnResetMockTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/ListenersLostOnResetMockTest.java diff --git a/src/test/java/org/mockitousage/bugs/MockitoRunnerBreaksWhenNoTestMethodsTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/MockitoRunnerBreaksWhenNoTestMethodsTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/MockitoRunnerBreaksWhenNoTestMethodsTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/MockitoRunnerBreaksWhenNoTestMethodsTest.java diff --git a/src/test/java/org/mockitousage/bugs/MockitoStubbedCallInAnswerTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/MockitoStubbedCallInAnswerTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/MockitoStubbedCallInAnswerTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/MockitoStubbedCallInAnswerTest.java diff --git a/src/test/java/org/mockitousage/bugs/MultipleInOrdersTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/MultipleInOrdersTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/MultipleInOrdersTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/MultipleInOrdersTest.java diff --git a/src/test/java/org/mockitousage/bugs/MultithreadedStubbingHalfManualTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/MultithreadedStubbingHalfManualTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/MultithreadedStubbingHalfManualTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/MultithreadedStubbingHalfManualTest.java diff --git a/src/test/java/org/mockitousage/bugs/NPEOnAnyClassMatcherAutounboxTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/NPEOnAnyClassMatcherAutounboxTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/NPEOnAnyClassMatcherAutounboxTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/NPEOnAnyClassMatcherAutounboxTest.java diff --git a/src/test/java/org/mockitousage/bugs/NPEWhenMockingThrowablesTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/NPEWhenMockingThrowablesTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/NPEWhenMockingThrowablesTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/NPEWhenMockingThrowablesTest.java diff --git a/src/test/java/org/mockitousage/bugs/NPEWithCertainMatchersTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/NPEWithCertainMatchersTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/NPEWithCertainMatchersTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/NPEWithCertainMatchersTest.java diff --git a/src/test/java/org/mockitousage/bugs/ShouldMocksCompareToBeConsistentWithEqualsTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/ShouldMocksCompareToBeConsistentWithEqualsTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/ShouldMocksCompareToBeConsistentWithEqualsTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/ShouldMocksCompareToBeConsistentWithEqualsTest.java diff --git a/src/test/java/org/mockitousage/bugs/ShouldNotDeadlockAnswerExecutionTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/ShouldNotDeadlockAnswerExecutionTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/ShouldNotDeadlockAnswerExecutionTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/ShouldNotDeadlockAnswerExecutionTest.java diff --git a/src/test/java/org/mockitousage/bugs/ShouldOnlyModeAllowCapturingArgumentsTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/ShouldOnlyModeAllowCapturingArgumentsTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/ShouldOnlyModeAllowCapturingArgumentsTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/ShouldOnlyModeAllowCapturingArgumentsTest.java diff --git a/src/test/java/org/mockitousage/bugs/SpyShouldHaveNiceNameTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/SpyShouldHaveNiceNameTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/SpyShouldHaveNiceNameTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/SpyShouldHaveNiceNameTest.java diff --git a/src/test/java/org/mockitousage/bugs/StubbingMocksThatAreConfiguredToReturnMocksTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/StubbingMocksThatAreConfiguredToReturnMocksTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/StubbingMocksThatAreConfiguredToReturnMocksTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/StubbingMocksThatAreConfiguredToReturnMocksTest.java diff --git a/src/test/java/org/mockitousage/bugs/ThreadLocalTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/ThreadLocalTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/ThreadLocalTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/ThreadLocalTest.java diff --git a/src/test/java/org/mockitousage/bugs/VerifyingWithAnExtraCallToADifferentMockTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/VerifyingWithAnExtraCallToADifferentMockTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/VerifyingWithAnExtraCallToADifferentMockTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/VerifyingWithAnExtraCallToADifferentMockTest.java diff --git a/src/test/java/org/mockitousage/bugs/creation/ConstructorInvokingMethodShouldNotRaiseExceptionTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/creation/ConstructorInvokingMethodShouldNotRaiseExceptionTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/creation/ConstructorInvokingMethodShouldNotRaiseExceptionTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/creation/ConstructorInvokingMethodShouldNotRaiseExceptionTest.java diff --git a/src/test/java/org/mockitousage/bugs/creation/PackagePrivateWithContextClassLoaderTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/creation/PackagePrivateWithContextClassLoaderTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/creation/PackagePrivateWithContextClassLoaderTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/creation/PackagePrivateWithContextClassLoaderTest.java diff --git a/src/test/java/org/mockitousage/bugs/creation/PublicMethodInParentWithNonPublicTypeInSignatureTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/creation/PublicMethodInParentWithNonPublicTypeInSignatureTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/creation/PublicMethodInParentWithNonPublicTypeInSignatureTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/creation/PublicMethodInParentWithNonPublicTypeInSignatureTest.java diff --git a/src/test/java/org/mockitousage/bugs/creation/ShouldAllowInlineMockCreationTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/creation/ShouldAllowInlineMockCreationTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/creation/ShouldAllowInlineMockCreationTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/creation/ShouldAllowInlineMockCreationTest.java diff --git a/src/test/java/org/mockitousage/bugs/creation/api/PublicClass.java b/mockito-core/src/test/java/org/mockitousage/bugs/creation/api/PublicClass.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/creation/api/PublicClass.java rename to mockito-core/src/test/java/org/mockitousage/bugs/creation/api/PublicClass.java diff --git a/src/test/java/org/mockitousage/bugs/creation/otherpackage/PublicParentClass.java b/mockito-core/src/test/java/org/mockitousage/bugs/creation/otherpackage/PublicParentClass.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/creation/otherpackage/PublicParentClass.java rename to mockito-core/src/test/java/org/mockitousage/bugs/creation/otherpackage/PublicParentClass.java diff --git a/src/test/java/org/mockitousage/bugs/deepstubs/DeepStubFailingWhenGenericNestedAsRawTypeTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/deepstubs/DeepStubFailingWhenGenericNestedAsRawTypeTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/deepstubs/DeepStubFailingWhenGenericNestedAsRawTypeTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/deepstubs/DeepStubFailingWhenGenericNestedAsRawTypeTest.java diff --git a/src/test/java/org/mockitousage/bugs/deepstubs/DeepStubsWronglyReportsSerializationProblemsTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/deepstubs/DeepStubsWronglyReportsSerializationProblemsTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/deepstubs/DeepStubsWronglyReportsSerializationProblemsTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/deepstubs/DeepStubsWronglyReportsSerializationProblemsTest.java diff --git a/src/test/java/org/mockitousage/bugs/injection/ChildWithSameParentFieldInjectionTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/injection/ChildWithSameParentFieldInjectionTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/injection/ChildWithSameParentFieldInjectionTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/injection/ChildWithSameParentFieldInjectionTest.java diff --git a/src/test/java/org/mockitousage/bugs/injection/InjectMocksShouldTryPropertySettersFirstBeforeFieldAccessTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/injection/InjectMocksShouldTryPropertySettersFirstBeforeFieldAccessTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/injection/InjectMocksShouldTryPropertySettersFirstBeforeFieldAccessTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/injection/InjectMocksShouldTryPropertySettersFirstBeforeFieldAccessTest.java diff --git a/src/test/java/org/mockitousage/bugs/injection/InjectionByTypeShouldFirstLookForExactTypeThenAncestorTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/injection/InjectionByTypeShouldFirstLookForExactTypeThenAncestorTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/injection/InjectionByTypeShouldFirstLookForExactTypeThenAncestorTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/injection/InjectionByTypeShouldFirstLookForExactTypeThenAncestorTest.java diff --git a/src/test/java/org/mockitousage/bugs/injection/Issue353InjectionMightNotHappenInCertainConfigurationTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/injection/Issue353InjectionMightNotHappenInCertainConfigurationTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/injection/Issue353InjectionMightNotHappenInCertainConfigurationTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/injection/Issue353InjectionMightNotHappenInCertainConfigurationTest.java diff --git a/src/test/java/org/mockitousage/bugs/injection/ParentTestMockInjectionTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/injection/ParentTestMockInjectionTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/injection/ParentTestMockInjectionTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/injection/ParentTestMockInjectionTest.java diff --git a/src/test/java/org/mockitousage/bugs/injection/ShouldNotTryToInjectInFinalOrStaticFieldsTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/injection/ShouldNotTryToInjectInFinalOrStaticFieldsTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/injection/ShouldNotTryToInjectInFinalOrStaticFieldsTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/injection/ShouldNotTryToInjectInFinalOrStaticFieldsTest.java diff --git a/src/test/java/org/mockitousage/bugs/varargs/VarargsAndAnyPicksUpExtraInvocationsTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/varargs/VarargsAndAnyPicksUpExtraInvocationsTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/varargs/VarargsAndAnyPicksUpExtraInvocationsTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/varargs/VarargsAndAnyPicksUpExtraInvocationsTest.java diff --git a/src/test/java/org/mockitousage/bugs/varargs/VarargsErrorWhenCallingRealMethodTest.java b/mockito-core/src/test/java/org/mockitousage/bugs/varargs/VarargsErrorWhenCallingRealMethodTest.java similarity index 100% rename from src/test/java/org/mockitousage/bugs/varargs/VarargsErrorWhenCallingRealMethodTest.java rename to mockito-core/src/test/java/org/mockitousage/bugs/varargs/VarargsErrorWhenCallingRealMethodTest.java diff --git a/src/test/java/org/mockitousage/configuration/ClassCacheVersusClassReloadingTest.java b/mockito-core/src/test/java/org/mockitousage/configuration/ClassCacheVersusClassReloadingTest.java similarity index 100% rename from src/test/java/org/mockitousage/configuration/ClassCacheVersusClassReloadingTest.java rename to mockito-core/src/test/java/org/mockitousage/configuration/ClassCacheVersusClassReloadingTest.java diff --git a/src/test/java/org/mockitousage/configuration/ClassToBeMocked.java b/mockito-core/src/test/java/org/mockitousage/configuration/ClassToBeMocked.java similarity index 100% rename from src/test/java/org/mockitousage/configuration/ClassToBeMocked.java rename to mockito-core/src/test/java/org/mockitousage/configuration/ClassToBeMocked.java diff --git a/src/test/java/org/mockitousage/constructor/CreatingMocksWithConstructorTest.java b/mockito-core/src/test/java/org/mockitousage/constructor/CreatingMocksWithConstructorTest.java similarity index 100% rename from src/test/java/org/mockitousage/constructor/CreatingMocksWithConstructorTest.java rename to mockito-core/src/test/java/org/mockitousage/constructor/CreatingMocksWithConstructorTest.java diff --git a/src/test/java/org/mockitousage/customization/BDDMockitoTest.java b/mockito-core/src/test/java/org/mockitousage/customization/BDDMockitoTest.java similarity index 100% rename from src/test/java/org/mockitousage/customization/BDDMockitoTest.java rename to mockito-core/src/test/java/org/mockitousage/customization/BDDMockitoTest.java diff --git a/src/test/java/org/mockitousage/debugging/Foo.java b/mockito-core/src/test/java/org/mockitousage/debugging/Foo.java similarity index 100% rename from src/test/java/org/mockitousage/debugging/Foo.java rename to mockito-core/src/test/java/org/mockitousage/debugging/Foo.java diff --git a/src/test/java/org/mockitousage/debugging/InvocationListenerCallbackTest.java b/mockito-core/src/test/java/org/mockitousage/debugging/InvocationListenerCallbackTest.java similarity index 100% rename from src/test/java/org/mockitousage/debugging/InvocationListenerCallbackTest.java rename to mockito-core/src/test/java/org/mockitousage/debugging/InvocationListenerCallbackTest.java diff --git a/src/test/java/org/mockitousage/debugging/InvocationsPrinterTest.java b/mockito-core/src/test/java/org/mockitousage/debugging/InvocationsPrinterTest.java similarity index 100% rename from src/test/java/org/mockitousage/debugging/InvocationsPrinterTest.java rename to mockito-core/src/test/java/org/mockitousage/debugging/InvocationsPrinterTest.java diff --git a/src/test/java/org/mockitousage/debugging/StubbingLookupListenerCallbackTest.java b/mockito-core/src/test/java/org/mockitousage/debugging/StubbingLookupListenerCallbackTest.java similarity index 100% rename from src/test/java/org/mockitousage/debugging/StubbingLookupListenerCallbackTest.java rename to mockito-core/src/test/java/org/mockitousage/debugging/StubbingLookupListenerCallbackTest.java diff --git a/src/test/java/org/mockitousage/debugging/VerboseLoggingOfInvocationsOnMockTest.java b/mockito-core/src/test/java/org/mockitousage/debugging/VerboseLoggingOfInvocationsOnMockTest.java similarity index 100% rename from src/test/java/org/mockitousage/debugging/VerboseLoggingOfInvocationsOnMockTest.java rename to mockito-core/src/test/java/org/mockitousage/debugging/VerboseLoggingOfInvocationsOnMockTest.java diff --git a/src/test/java/org/mockitousage/debugging/VerificationListenerCallBackTest.java b/mockito-core/src/test/java/org/mockitousage/debugging/VerificationListenerCallBackTest.java similarity index 100% rename from src/test/java/org/mockitousage/debugging/VerificationListenerCallBackTest.java rename to mockito-core/src/test/java/org/mockitousage/debugging/VerificationListenerCallBackTest.java diff --git a/src/test/java/org/mockitousage/examples/use/Article.java b/mockito-core/src/test/java/org/mockitousage/examples/use/Article.java similarity index 100% rename from src/test/java/org/mockitousage/examples/use/Article.java rename to mockito-core/src/test/java/org/mockitousage/examples/use/Article.java diff --git a/src/test/java/org/mockitousage/examples/use/ArticleCalculator.java b/mockito-core/src/test/java/org/mockitousage/examples/use/ArticleCalculator.java similarity index 100% rename from src/test/java/org/mockitousage/examples/use/ArticleCalculator.java rename to mockito-core/src/test/java/org/mockitousage/examples/use/ArticleCalculator.java diff --git a/src/test/java/org/mockitousage/examples/use/ArticleDatabase.java b/mockito-core/src/test/java/org/mockitousage/examples/use/ArticleDatabase.java similarity index 100% rename from src/test/java/org/mockitousage/examples/use/ArticleDatabase.java rename to mockito-core/src/test/java/org/mockitousage/examples/use/ArticleDatabase.java diff --git a/src/test/java/org/mockitousage/examples/use/ArticleManager.java b/mockito-core/src/test/java/org/mockitousage/examples/use/ArticleManager.java similarity index 100% rename from src/test/java/org/mockitousage/examples/use/ArticleManager.java rename to mockito-core/src/test/java/org/mockitousage/examples/use/ArticleManager.java diff --git a/src/test/java/org/mockitousage/examples/use/ExampleTest.java b/mockito-core/src/test/java/org/mockitousage/examples/use/ExampleTest.java similarity index 100% rename from src/test/java/org/mockitousage/examples/use/ExampleTest.java rename to mockito-core/src/test/java/org/mockitousage/examples/use/ExampleTest.java diff --git a/src/test/java/org/mockitousage/internal/debugging/LocationFactoryTest.java b/mockito-core/src/test/java/org/mockitousage/internal/debugging/LocationFactoryTest.java similarity index 100% rename from src/test/java/org/mockitousage/internal/debugging/LocationFactoryTest.java rename to mockito-core/src/test/java/org/mockitousage/internal/debugging/LocationFactoryTest.java diff --git a/src/test/java/org/mockitousage/internal/junit/UnusedStubbingsFinderTest.java b/mockito-core/src/test/java/org/mockitousage/internal/junit/UnusedStubbingsFinderTest.java similarity index 100% rename from src/test/java/org/mockitousage/internal/junit/UnusedStubbingsFinderTest.java rename to mockito-core/src/test/java/org/mockitousage/internal/junit/UnusedStubbingsFinderTest.java diff --git a/src/test/java/org/mockitousage/internal/package-info.java b/mockito-core/src/test/java/org/mockitousage/internal/package-info.java similarity index 100% rename from src/test/java/org/mockitousage/internal/package-info.java rename to mockito-core/src/test/java/org/mockitousage/internal/package-info.java diff --git a/src/test/java/org/mockitousage/jls/JLS_15_12_2_5Test.java b/mockito-core/src/test/java/org/mockitousage/jls/JLS_15_12_2_5Test.java similarity index 100% rename from src/test/java/org/mockitousage/jls/JLS_15_12_2_5Test.java rename to mockito-core/src/test/java/org/mockitousage/jls/JLS_15_12_2_5Test.java diff --git a/src/test/java/org/mockitousage/junitrule/InvalidTargetMockitoJUnitRuleTest.java b/mockito-core/src/test/java/org/mockitousage/junitrule/InvalidTargetMockitoJUnitRuleTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrule/InvalidTargetMockitoJUnitRuleTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrule/InvalidTargetMockitoJUnitRuleTest.java diff --git a/src/test/java/org/mockitousage/junitrule/JUnitTestRuleIntegratesWithRuleChainTest.java b/mockito-core/src/test/java/org/mockitousage/junitrule/JUnitTestRuleIntegratesWithRuleChainTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrule/JUnitTestRuleIntegratesWithRuleChainTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrule/JUnitTestRuleIntegratesWithRuleChainTest.java diff --git a/src/test/java/org/mockitousage/junitrule/LenientJUnitRuleTest.java b/mockito-core/src/test/java/org/mockitousage/junitrule/LenientJUnitRuleTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrule/LenientJUnitRuleTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrule/LenientJUnitRuleTest.java diff --git a/src/test/java/org/mockitousage/junitrule/MockitoJUnitRuleTest.java b/mockito-core/src/test/java/org/mockitousage/junitrule/MockitoJUnitRuleTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrule/MockitoJUnitRuleTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrule/MockitoJUnitRuleTest.java diff --git a/src/test/java/org/mockitousage/junitrule/MockitoJUnitTestRuleTest.java b/mockito-core/src/test/java/org/mockitousage/junitrule/MockitoJUnitTestRuleTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrule/MockitoJUnitTestRuleTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrule/MockitoJUnitTestRuleTest.java diff --git a/src/test/java/org/mockitousage/junitrule/MutableStrictJUnitRuleTest.java b/mockito-core/src/test/java/org/mockitousage/junitrule/MutableStrictJUnitRuleTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrule/MutableStrictJUnitRuleTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrule/MutableStrictJUnitRuleTest.java diff --git a/src/test/java/org/mockitousage/junitrule/MutableStrictJUnitTestRuleTest.java b/mockito-core/src/test/java/org/mockitousage/junitrule/MutableStrictJUnitTestRuleTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrule/MutableStrictJUnitTestRuleTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrule/MutableStrictJUnitTestRuleTest.java diff --git a/src/test/java/org/mockitousage/junitrule/RuleTestWithFactoryMethodTest.java b/mockito-core/src/test/java/org/mockitousage/junitrule/RuleTestWithFactoryMethodTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrule/RuleTestWithFactoryMethodTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrule/RuleTestWithFactoryMethodTest.java diff --git a/src/test/java/org/mockitousage/junitrule/RuleTestWithParameterConstructorTest.java b/mockito-core/src/test/java/org/mockitousage/junitrule/RuleTestWithParameterConstructorTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrule/RuleTestWithParameterConstructorTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrule/RuleTestWithParameterConstructorTest.java diff --git a/src/test/java/org/mockitousage/junitrule/StrictJUnitRuleTest.java b/mockito-core/src/test/java/org/mockitousage/junitrule/StrictJUnitRuleTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrule/StrictJUnitRuleTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrule/StrictJUnitRuleTest.java diff --git a/src/test/java/org/mockitousage/junitrule/StubbingWarningsJUnitRuleTest.java b/mockito-core/src/test/java/org/mockitousage/junitrule/StubbingWarningsJUnitRuleTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrule/StubbingWarningsJUnitRuleTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrule/StubbingWarningsJUnitRuleTest.java diff --git a/src/test/java/org/mockitousage/junitrule/StubbingWarningsMultiThreadingTest.java b/mockito-core/src/test/java/org/mockitousage/junitrule/StubbingWarningsMultiThreadingTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrule/StubbingWarningsMultiThreadingTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrule/StubbingWarningsMultiThreadingTest.java diff --git a/src/test/java/org/mockitousage/junitrule/VerificationCollectorImplTest.java b/mockito-core/src/test/java/org/mockitousage/junitrule/VerificationCollectorImplTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrule/VerificationCollectorImplTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrule/VerificationCollectorImplTest.java diff --git a/src/test/java/org/mockitousage/junitrunner/DeepStubbingWithJUnitRunnerTest.java b/mockito-core/src/test/java/org/mockitousage/junitrunner/DeepStubbingWithJUnitRunnerTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrunner/DeepStubbingWithJUnitRunnerTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrunner/DeepStubbingWithJUnitRunnerTest.java diff --git a/src/test/java/org/mockitousage/junitrunner/Filters.java b/mockito-core/src/test/java/org/mockitousage/junitrunner/Filters.java similarity index 100% rename from src/test/java/org/mockitousage/junitrunner/Filters.java rename to mockito-core/src/test/java/org/mockitousage/junitrunner/Filters.java diff --git a/src/test/java/org/mockitousage/junitrunner/JUnit45RunnerTest.java b/mockito-core/src/test/java/org/mockitousage/junitrunner/JUnit45RunnerTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrunner/JUnit45RunnerTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrunner/JUnit45RunnerTest.java diff --git a/src/test/java/org/mockitousage/junitrunner/ModellingVerboseMockitoTest.java b/mockito-core/src/test/java/org/mockitousage/junitrunner/ModellingVerboseMockitoTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrunner/ModellingVerboseMockitoTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrunner/ModellingVerboseMockitoTest.java diff --git a/src/test/java/org/mockitousage/junitrunner/SilentRunnerTest.java b/mockito-core/src/test/java/org/mockitousage/junitrunner/SilentRunnerTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrunner/SilentRunnerTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrunner/SilentRunnerTest.java diff --git a/src/test/java/org/mockitousage/junitrunner/StrictRunnerTest.java b/mockito-core/src/test/java/org/mockitousage/junitrunner/StrictRunnerTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrunner/StrictRunnerTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrunner/StrictRunnerTest.java diff --git a/src/test/java/org/mockitousage/junitrunner/StrictStubsRunnerTest.java b/mockito-core/src/test/java/org/mockitousage/junitrunner/StrictStubsRunnerTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrunner/StrictStubsRunnerTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrunner/StrictStubsRunnerTest.java diff --git a/src/test/java/org/mockitousage/junitrunner/StubbingWarningsJUnitRunnerTest.java b/mockito-core/src/test/java/org/mockitousage/junitrunner/StubbingWarningsJUnitRunnerTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrunner/StubbingWarningsJUnitRunnerTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrunner/StubbingWarningsJUnitRunnerTest.java diff --git a/src/test/java/org/mockitousage/junitrunner/UnusedStubsExceptionMessageTest.java b/mockito-core/src/test/java/org/mockitousage/junitrunner/UnusedStubsExceptionMessageTest.java similarity index 100% rename from src/test/java/org/mockitousage/junitrunner/UnusedStubsExceptionMessageTest.java rename to mockito-core/src/test/java/org/mockitousage/junitrunner/UnusedStubsExceptionMessageTest.java diff --git a/src/test/java/org/mockitousage/matchers/AdditionalMatcherTest.java b/mockito-core/src/test/java/org/mockitousage/matchers/AdditionalMatcherTest.java similarity index 100% rename from src/test/java/org/mockitousage/matchers/AdditionalMatcherTest.java rename to mockito-core/src/test/java/org/mockitousage/matchers/AdditionalMatcherTest.java diff --git a/src/test/java/org/mockitousage/matchers/AnyXMatchersAcceptNullsTest.java b/mockito-core/src/test/java/org/mockitousage/matchers/AnyXMatchersAcceptNullsTest.java similarity index 100% rename from src/test/java/org/mockitousage/matchers/AnyXMatchersAcceptNullsTest.java rename to mockito-core/src/test/java/org/mockitousage/matchers/AnyXMatchersAcceptNullsTest.java diff --git a/src/test/java/org/mockitousage/matchers/CapturingArgumentsTest.java b/mockito-core/src/test/java/org/mockitousage/matchers/CapturingArgumentsTest.java similarity index 100% rename from src/test/java/org/mockitousage/matchers/CapturingArgumentsTest.java rename to mockito-core/src/test/java/org/mockitousage/matchers/CapturingArgumentsTest.java diff --git a/src/test/java/org/mockitousage/matchers/CustomMatcherDoesYieldCCETest.java b/mockito-core/src/test/java/org/mockitousage/matchers/CustomMatcherDoesYieldCCETest.java similarity index 100% rename from src/test/java/org/mockitousage/matchers/CustomMatcherDoesYieldCCETest.java rename to mockito-core/src/test/java/org/mockitousage/matchers/CustomMatcherDoesYieldCCETest.java diff --git a/src/test/java/org/mockitousage/matchers/CustomMatchersTest.java b/mockito-core/src/test/java/org/mockitousage/matchers/CustomMatchersTest.java similarity index 100% rename from src/test/java/org/mockitousage/matchers/CustomMatchersTest.java rename to mockito-core/src/test/java/org/mockitousage/matchers/CustomMatchersTest.java diff --git a/src/test/java/org/mockitousage/matchers/GenericMatchersTest.java b/mockito-core/src/test/java/org/mockitousage/matchers/GenericMatchersTest.java similarity index 100% rename from src/test/java/org/mockitousage/matchers/GenericMatchersTest.java rename to mockito-core/src/test/java/org/mockitousage/matchers/GenericMatchersTest.java diff --git a/src/test/java/org/mockitousage/matchers/HamcrestMatchersTest.java b/mockito-core/src/test/java/org/mockitousage/matchers/HamcrestMatchersTest.java similarity index 100% rename from src/test/java/org/mockitousage/matchers/HamcrestMatchersTest.java rename to mockito-core/src/test/java/org/mockitousage/matchers/HamcrestMatchersTest.java diff --git a/src/test/java/org/mockitousage/matchers/InvalidUseOfMatchersTest.java b/mockito-core/src/test/java/org/mockitousage/matchers/InvalidUseOfMatchersTest.java similarity index 100% rename from src/test/java/org/mockitousage/matchers/InvalidUseOfMatchersTest.java rename to mockito-core/src/test/java/org/mockitousage/matchers/InvalidUseOfMatchersTest.java diff --git a/src/test/java/org/mockitousage/matchers/MatchersMixedWithRawArgumentsTest.java b/mockito-core/src/test/java/org/mockitousage/matchers/MatchersMixedWithRawArgumentsTest.java similarity index 100% rename from src/test/java/org/mockitousage/matchers/MatchersMixedWithRawArgumentsTest.java rename to mockito-core/src/test/java/org/mockitousage/matchers/MatchersMixedWithRawArgumentsTest.java diff --git a/src/test/java/org/mockitousage/matchers/MatchersTest.java b/mockito-core/src/test/java/org/mockitousage/matchers/MatchersTest.java similarity index 100% rename from src/test/java/org/mockitousage/matchers/MatchersTest.java rename to mockito-core/src/test/java/org/mockitousage/matchers/MatchersTest.java diff --git a/src/test/java/org/mockitousage/matchers/MoreMatchersTest.java b/mockito-core/src/test/java/org/mockitousage/matchers/MoreMatchersTest.java similarity index 100% rename from src/test/java/org/mockitousage/matchers/MoreMatchersTest.java rename to mockito-core/src/test/java/org/mockitousage/matchers/MoreMatchersTest.java diff --git a/src/test/java/org/mockitousage/matchers/NewMatchersTest.java b/mockito-core/src/test/java/org/mockitousage/matchers/NewMatchersTest.java similarity index 100% rename from src/test/java/org/mockitousage/matchers/NewMatchersTest.java rename to mockito-core/src/test/java/org/mockitousage/matchers/NewMatchersTest.java diff --git a/src/test/java/org/mockitousage/matchers/ReflectionMatchersTest.java b/mockito-core/src/test/java/org/mockitousage/matchers/ReflectionMatchersTest.java similarity index 100% rename from src/test/java/org/mockitousage/matchers/ReflectionMatchersTest.java rename to mockito-core/src/test/java/org/mockitousage/matchers/ReflectionMatchersTest.java diff --git a/src/test/java/org/mockitousage/matchers/VarargsTest.java b/mockito-core/src/test/java/org/mockitousage/matchers/VarargsTest.java similarity index 100% rename from src/test/java/org/mockitousage/matchers/VarargsTest.java rename to mockito-core/src/test/java/org/mockitousage/matchers/VarargsTest.java diff --git a/src/test/java/org/mockitousage/matchers/VerificationAndStubbingUsingMatchersTest.java b/mockito-core/src/test/java/org/mockitousage/matchers/VerificationAndStubbingUsingMatchersTest.java similarity index 100% rename from src/test/java/org/mockitousage/matchers/VerificationAndStubbingUsingMatchersTest.java rename to mockito-core/src/test/java/org/mockitousage/matchers/VerificationAndStubbingUsingMatchersTest.java diff --git a/src/test/java/org/mockitousage/misuse/CleaningUpPotentialStubbingTest.java b/mockito-core/src/test/java/org/mockitousage/misuse/CleaningUpPotentialStubbingTest.java similarity index 100% rename from src/test/java/org/mockitousage/misuse/CleaningUpPotentialStubbingTest.java rename to mockito-core/src/test/java/org/mockitousage/misuse/CleaningUpPotentialStubbingTest.java diff --git a/src/test/java/org/mockitousage/misuse/DescriptiveMessagesOnMisuseTest.java b/mockito-core/src/test/java/org/mockitousage/misuse/DescriptiveMessagesOnMisuseTest.java similarity index 100% rename from src/test/java/org/mockitousage/misuse/DescriptiveMessagesOnMisuseTest.java rename to mockito-core/src/test/java/org/mockitousage/misuse/DescriptiveMessagesOnMisuseTest.java diff --git a/src/test/java/org/mockitousage/misuse/DetectingFinalMethodsTest.java b/mockito-core/src/test/java/org/mockitousage/misuse/DetectingFinalMethodsTest.java similarity index 100% rename from src/test/java/org/mockitousage/misuse/DetectingFinalMethodsTest.java rename to mockito-core/src/test/java/org/mockitousage/misuse/DetectingFinalMethodsTest.java diff --git a/src/test/java/org/mockitousage/misuse/DetectingMisusedMatchersTest.java b/mockito-core/src/test/java/org/mockitousage/misuse/DetectingMisusedMatchersTest.java similarity index 100% rename from src/test/java/org/mockitousage/misuse/DetectingMisusedMatchersTest.java rename to mockito-core/src/test/java/org/mockitousage/misuse/DetectingMisusedMatchersTest.java diff --git a/src/test/java/org/mockitousage/misuse/ExplicitFrameworkValidationTest.java b/mockito-core/src/test/java/org/mockitousage/misuse/ExplicitFrameworkValidationTest.java similarity index 100% rename from src/test/java/org/mockitousage/misuse/ExplicitFrameworkValidationTest.java rename to mockito-core/src/test/java/org/mockitousage/misuse/ExplicitFrameworkValidationTest.java diff --git a/src/test/java/org/mockitousage/misuse/InvalidUsageTest.java b/mockito-core/src/test/java/org/mockitousage/misuse/InvalidUsageTest.java similarity index 100% rename from src/test/java/org/mockitousage/misuse/InvalidUsageTest.java rename to mockito-core/src/test/java/org/mockitousage/misuse/InvalidUsageTest.java diff --git a/src/test/java/org/mockitousage/misuse/RestrictedObjectMethodsTest.java b/mockito-core/src/test/java/org/mockitousage/misuse/RestrictedObjectMethodsTest.java similarity index 100% rename from src/test/java/org/mockitousage/misuse/RestrictedObjectMethodsTest.java rename to mockito-core/src/test/java/org/mockitousage/misuse/RestrictedObjectMethodsTest.java diff --git a/src/test/java/org/mockitousage/package-info.java b/mockito-core/src/test/java/org/mockitousage/package-info.java similarity index 100% rename from src/test/java/org/mockitousage/package-info.java rename to mockito-core/src/test/java/org/mockitousage/package-info.java diff --git a/src/test/java/org/mockitousage/packageprotected/MockingPackageProtectedTest.java b/mockito-core/src/test/java/org/mockitousage/packageprotected/MockingPackageProtectedTest.java similarity index 100% rename from src/test/java/org/mockitousage/packageprotected/MockingPackageProtectedTest.java rename to mockito-core/src/test/java/org/mockitousage/packageprotected/MockingPackageProtectedTest.java diff --git a/src/test/java/org/mockitousage/packageprotected/PackageProtected.java b/mockito-core/src/test/java/org/mockitousage/packageprotected/PackageProtected.java similarity index 100% rename from src/test/java/org/mockitousage/packageprotected/PackageProtected.java rename to mockito-core/src/test/java/org/mockitousage/packageprotected/PackageProtected.java diff --git a/src/test/java/org/mockitousage/performance/LoadsOfMocksTest.java b/mockito-core/src/test/java/org/mockitousage/performance/LoadsOfMocksTest.java similarity index 100% rename from src/test/java/org/mockitousage/performance/LoadsOfMocksTest.java rename to mockito-core/src/test/java/org/mockitousage/performance/LoadsOfMocksTest.java diff --git a/src/test/java/org/mockitousage/performance/StubOnlyAvoidMemoryConsumptionTest.java b/mockito-core/src/test/java/org/mockitousage/performance/StubOnlyAvoidMemoryConsumptionTest.java similarity index 100% rename from src/test/java/org/mockitousage/performance/StubOnlyAvoidMemoryConsumptionTest.java rename to mockito-core/src/test/java/org/mockitousage/performance/StubOnlyAvoidMemoryConsumptionTest.java diff --git a/src/test/java/org/mockitousage/plugins/MockitoPluginsTest.java b/mockito-core/src/test/java/org/mockitousage/plugins/MockitoPluginsTest.java similarity index 100% rename from src/test/java/org/mockitousage/plugins/MockitoPluginsTest.java rename to mockito-core/src/test/java/org/mockitousage/plugins/MockitoPluginsTest.java diff --git a/src/test/java/org/mockitousage/puzzlers/BridgeMethodPuzzleTest.java b/mockito-core/src/test/java/org/mockitousage/puzzlers/BridgeMethodPuzzleTest.java similarity index 100% rename from src/test/java/org/mockitousage/puzzlers/BridgeMethodPuzzleTest.java rename to mockito-core/src/test/java/org/mockitousage/puzzlers/BridgeMethodPuzzleTest.java diff --git a/src/test/java/org/mockitousage/puzzlers/OverloadingPuzzleTest.java b/mockito-core/src/test/java/org/mockitousage/puzzlers/OverloadingPuzzleTest.java similarity index 100% rename from src/test/java/org/mockitousage/puzzlers/OverloadingPuzzleTest.java rename to mockito-core/src/test/java/org/mockitousage/puzzlers/OverloadingPuzzleTest.java diff --git a/src/test/java/org/mockitousage/serialization/AcrossClassLoaderSerializationTest.java b/mockito-core/src/test/java/org/mockitousage/serialization/AcrossClassLoaderSerializationTest.java similarity index 100% rename from src/test/java/org/mockitousage/serialization/AcrossClassLoaderSerializationTest.java rename to mockito-core/src/test/java/org/mockitousage/serialization/AcrossClassLoaderSerializationTest.java diff --git a/src/test/java/org/mockitousage/serialization/DeepStubsSerializableTest.java b/mockito-core/src/test/java/org/mockitousage/serialization/DeepStubsSerializableTest.java similarity index 100% rename from src/test/java/org/mockitousage/serialization/DeepStubsSerializableTest.java rename to mockito-core/src/test/java/org/mockitousage/serialization/DeepStubsSerializableTest.java diff --git a/src/test/java/org/mockitousage/serialization/ParallelSerializationTest.java b/mockito-core/src/test/java/org/mockitousage/serialization/ParallelSerializationTest.java similarity index 100% rename from src/test/java/org/mockitousage/serialization/ParallelSerializationTest.java rename to mockito-core/src/test/java/org/mockitousage/serialization/ParallelSerializationTest.java diff --git a/src/test/java/org/mockitousage/serialization/StrictStubsSerializableTest.java b/mockito-core/src/test/java/org/mockitousage/serialization/StrictStubsSerializableTest.java similarity index 100% rename from src/test/java/org/mockitousage/serialization/StrictStubsSerializableTest.java rename to mockito-core/src/test/java/org/mockitousage/serialization/StrictStubsSerializableTest.java diff --git a/src/test/java/org/mockitousage/session/MockitoSessionTest.java b/mockito-core/src/test/java/org/mockitousage/session/MockitoSessionTest.java similarity index 100% rename from src/test/java/org/mockitousage/session/MockitoSessionTest.java rename to mockito-core/src/test/java/org/mockitousage/session/MockitoSessionTest.java diff --git a/src/test/java/org/mockitousage/spies/PartialMockingWithSpiesTest.java b/mockito-core/src/test/java/org/mockitousage/spies/PartialMockingWithSpiesTest.java similarity index 100% rename from src/test/java/org/mockitousage/spies/PartialMockingWithSpiesTest.java rename to mockito-core/src/test/java/org/mockitousage/spies/PartialMockingWithSpiesTest.java diff --git a/src/test/java/org/mockitousage/spies/SpiesWithRealEqualsAndInOrderTest.java b/mockito-core/src/test/java/org/mockitousage/spies/SpiesWithRealEqualsAndInOrderTest.java similarity index 100% rename from src/test/java/org/mockitousage/spies/SpiesWithRealEqualsAndInOrderTest.java rename to mockito-core/src/test/java/org/mockitousage/spies/SpiesWithRealEqualsAndInOrderTest.java diff --git a/src/test/java/org/mockitousage/spies/SpyAsDefaultMockUsageTest.java b/mockito-core/src/test/java/org/mockitousage/spies/SpyAsDefaultMockUsageTest.java similarity index 100% rename from src/test/java/org/mockitousage/spies/SpyAsDefaultMockUsageTest.java rename to mockito-core/src/test/java/org/mockitousage/spies/SpyAsDefaultMockUsageTest.java diff --git a/src/test/java/org/mockitousage/spies/SpyingOnInterfacesTest.java b/mockito-core/src/test/java/org/mockitousage/spies/SpyingOnInterfacesTest.java similarity index 100% rename from src/test/java/org/mockitousage/spies/SpyingOnInterfacesTest.java rename to mockito-core/src/test/java/org/mockitousage/spies/SpyingOnInterfacesTest.java diff --git a/src/test/java/org/mockitousage/spies/SpyingOnRealObjectsTest.java b/mockito-core/src/test/java/org/mockitousage/spies/SpyingOnRealObjectsTest.java similarity index 100% rename from src/test/java/org/mockitousage/spies/SpyingOnRealObjectsTest.java rename to mockito-core/src/test/java/org/mockitousage/spies/SpyingOnRealObjectsTest.java diff --git a/src/test/java/org/mockitousage/spies/StubbingSpiesDoesNotYieldNPETest.java b/mockito-core/src/test/java/org/mockitousage/spies/StubbingSpiesDoesNotYieldNPETest.java similarity index 100% rename from src/test/java/org/mockitousage/spies/StubbingSpiesDoesNotYieldNPETest.java rename to mockito-core/src/test/java/org/mockitousage/spies/StubbingSpiesDoesNotYieldNPETest.java diff --git a/src/test/java/org/mockitousage/stacktrace/ClickableStackTracesTest.java b/mockito-core/src/test/java/org/mockitousage/stacktrace/ClickableStackTracesTest.java similarity index 100% rename from src/test/java/org/mockitousage/stacktrace/ClickableStackTracesTest.java rename to mockito-core/src/test/java/org/mockitousage/stacktrace/ClickableStackTracesTest.java diff --git a/src/test/java/org/mockitousage/stacktrace/ClickableStackTracesWhenFrameworkMisusedTest.java b/mockito-core/src/test/java/org/mockitousage/stacktrace/ClickableStackTracesWhenFrameworkMisusedTest.java similarity index 100% rename from src/test/java/org/mockitousage/stacktrace/ClickableStackTracesWhenFrameworkMisusedTest.java rename to mockito-core/src/test/java/org/mockitousage/stacktrace/ClickableStackTracesWhenFrameworkMisusedTest.java diff --git a/src/test/java/org/mockitousage/stacktrace/ModellingDescriptiveMessagesTest.java b/mockito-core/src/test/java/org/mockitousage/stacktrace/ModellingDescriptiveMessagesTest.java similarity index 100% rename from src/test/java/org/mockitousage/stacktrace/ModellingDescriptiveMessagesTest.java rename to mockito-core/src/test/java/org/mockitousage/stacktrace/ModellingDescriptiveMessagesTest.java diff --git a/src/test/java/org/mockitousage/stacktrace/PointingStackTraceToActualInvocationChunkInOrderTest.java b/mockito-core/src/test/java/org/mockitousage/stacktrace/PointingStackTraceToActualInvocationChunkInOrderTest.java similarity index 100% rename from src/test/java/org/mockitousage/stacktrace/PointingStackTraceToActualInvocationChunkInOrderTest.java rename to mockito-core/src/test/java/org/mockitousage/stacktrace/PointingStackTraceToActualInvocationChunkInOrderTest.java diff --git a/src/test/java/org/mockitousage/stacktrace/PointingStackTraceToActualInvocationInOrderTest.java b/mockito-core/src/test/java/org/mockitousage/stacktrace/PointingStackTraceToActualInvocationInOrderTest.java similarity index 100% rename from src/test/java/org/mockitousage/stacktrace/PointingStackTraceToActualInvocationInOrderTest.java rename to mockito-core/src/test/java/org/mockitousage/stacktrace/PointingStackTraceToActualInvocationInOrderTest.java diff --git a/src/test/java/org/mockitousage/stacktrace/PointingStackTraceToActualInvocationTest.java b/mockito-core/src/test/java/org/mockitousage/stacktrace/PointingStackTraceToActualInvocationTest.java similarity index 100% rename from src/test/java/org/mockitousage/stacktrace/PointingStackTraceToActualInvocationTest.java rename to mockito-core/src/test/java/org/mockitousage/stacktrace/PointingStackTraceToActualInvocationTest.java diff --git a/src/test/java/org/mockitousage/stacktrace/StackTraceFilteringTest.java b/mockito-core/src/test/java/org/mockitousage/stacktrace/StackTraceFilteringTest.java similarity index 100% rename from src/test/java/org/mockitousage/stacktrace/StackTraceFilteringTest.java rename to mockito-core/src/test/java/org/mockitousage/stacktrace/StackTraceFilteringTest.java diff --git a/src/test/java/org/mockitousage/strictness/LenientMockAnnotationTest.java b/mockito-core/src/test/java/org/mockitousage/strictness/LenientMockAnnotationTest.java similarity index 100% rename from src/test/java/org/mockitousage/strictness/LenientMockAnnotationTest.java rename to mockito-core/src/test/java/org/mockitousage/strictness/LenientMockAnnotationTest.java diff --git a/src/test/java/org/mockitousage/strictness/PotentialStubbingSensitivityTest.java b/mockito-core/src/test/java/org/mockitousage/strictness/PotentialStubbingSensitivityTest.java similarity index 100% rename from src/test/java/org/mockitousage/strictness/PotentialStubbingSensitivityTest.java rename to mockito-core/src/test/java/org/mockitousage/strictness/PotentialStubbingSensitivityTest.java diff --git a/src/test/java/org/mockitousage/strictness/ProductionCode.java b/mockito-core/src/test/java/org/mockitousage/strictness/ProductionCode.java similarity index 100% rename from src/test/java/org/mockitousage/strictness/ProductionCode.java rename to mockito-core/src/test/java/org/mockitousage/strictness/ProductionCode.java diff --git a/src/test/java/org/mockitousage/strictness/StrictnessMockAnnotationTest.java b/mockito-core/src/test/java/org/mockitousage/strictness/StrictnessMockAnnotationTest.java similarity index 100% rename from src/test/java/org/mockitousage/strictness/StrictnessMockAnnotationTest.java rename to mockito-core/src/test/java/org/mockitousage/strictness/StrictnessMockAnnotationTest.java diff --git a/src/test/java/org/mockitousage/strictness/StrictnessPerMockTest.java b/mockito-core/src/test/java/org/mockitousage/strictness/StrictnessPerMockTest.java similarity index 100% rename from src/test/java/org/mockitousage/strictness/StrictnessPerMockTest.java rename to mockito-core/src/test/java/org/mockitousage/strictness/StrictnessPerMockTest.java diff --git a/src/test/java/org/mockitousage/strictness/StrictnessPerStubbingTest.java b/mockito-core/src/test/java/org/mockitousage/strictness/StrictnessPerStubbingTest.java similarity index 100% rename from src/test/java/org/mockitousage/strictness/StrictnessPerStubbingTest.java rename to mockito-core/src/test/java/org/mockitousage/strictness/StrictnessPerStubbingTest.java diff --git a/src/test/java/org/mockitousage/strictness/StrictnessPerStubbingWithRunnerTest.java b/mockito-core/src/test/java/org/mockitousage/strictness/StrictnessPerStubbingWithRunnerTest.java similarity index 100% rename from src/test/java/org/mockitousage/strictness/StrictnessPerStubbingWithRunnerTest.java rename to mockito-core/src/test/java/org/mockitousage/strictness/StrictnessPerStubbingWithRunnerTest.java diff --git a/src/test/java/org/mockitousage/strictness/StrictnessWhenRuleStrictnessIsUpdatedTest.java b/mockito-core/src/test/java/org/mockitousage/strictness/StrictnessWhenRuleStrictnessIsUpdatedTest.java similarity index 100% rename from src/test/java/org/mockitousage/strictness/StrictnessWhenRuleStrictnessIsUpdatedTest.java rename to mockito-core/src/test/java/org/mockitousage/strictness/StrictnessWhenRuleStrictnessIsUpdatedTest.java diff --git a/src/test/java/org/mockitousage/strictness/StrictnessWithRulesTest.java b/mockito-core/src/test/java/org/mockitousage/strictness/StrictnessWithRulesTest.java similarity index 100% rename from src/test/java/org/mockitousage/strictness/StrictnessWithRulesTest.java rename to mockito-core/src/test/java/org/mockitousage/strictness/StrictnessWithRulesTest.java diff --git a/src/test/java/org/mockitousage/strictness/StrictnessWithSettingsTest.java b/mockito-core/src/test/java/org/mockitousage/strictness/StrictnessWithSettingsTest.java similarity index 100% rename from src/test/java/org/mockitousage/strictness/StrictnessWithSettingsTest.java rename to mockito-core/src/test/java/org/mockitousage/strictness/StrictnessWithSettingsTest.java diff --git a/src/test/java/org/mockitousage/stubbing/BasicStubbingTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/BasicStubbingTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/BasicStubbingTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/BasicStubbingTest.java diff --git a/src/test/java/org/mockitousage/stubbing/CallingRealMethodTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/CallingRealMethodTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/CallingRealMethodTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/CallingRealMethodTest.java diff --git a/src/test/java/org/mockitousage/stubbing/CloningParameterTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/CloningParameterTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/CloningParameterTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/CloningParameterTest.java diff --git a/src/test/java/org/mockitousage/stubbing/DeepStubbingTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/DeepStubbingTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/DeepStubbingTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/DeepStubbingTest.java diff --git a/src/test/java/org/mockitousage/stubbing/MisusingStubbingTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/MisusingStubbingTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/MisusingStubbingTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/MisusingStubbingTest.java diff --git a/src/test/java/org/mockitousage/stubbing/ReturningDefaultValuesTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/ReturningDefaultValuesTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/ReturningDefaultValuesTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/ReturningDefaultValuesTest.java diff --git a/src/test/java/org/mockitousage/stubbing/SmartNullsGenericBugTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/SmartNullsGenericBugTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/SmartNullsGenericBugTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/SmartNullsGenericBugTest.java diff --git a/src/test/java/org/mockitousage/stubbing/SmartNullsStubbingTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/SmartNullsStubbingTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/SmartNullsStubbingTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/SmartNullsStubbingTest.java diff --git a/src/test/java/org/mockitousage/stubbing/StrictStubbingEndToEndTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/StrictStubbingEndToEndTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/StrictStubbingEndToEndTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/StrictStubbingEndToEndTest.java diff --git a/src/test/java/org/mockitousage/stubbing/StrictStubbingTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/StrictStubbingTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/StrictStubbingTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/StrictStubbingTest.java diff --git a/src/test/java/org/mockitousage/stubbing/StubbingConsecutiveAnswersTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/StubbingConsecutiveAnswersTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/StubbingConsecutiveAnswersTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/StubbingConsecutiveAnswersTest.java diff --git a/src/test/java/org/mockitousage/stubbing/StubbingReturnsSelfTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/StubbingReturnsSelfTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/StubbingReturnsSelfTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/StubbingReturnsSelfTest.java diff --git a/src/test/java/org/mockitousage/stubbing/StubbingUsingDoReturnTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/StubbingUsingDoReturnTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/StubbingUsingDoReturnTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/StubbingUsingDoReturnTest.java diff --git a/src/test/java/org/mockitousage/stubbing/StubbingWarningsTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/StubbingWarningsTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/StubbingWarningsTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/StubbingWarningsTest.java diff --git a/src/test/java/org/mockitousage/stubbing/StubbingWithAdditionalAnswersTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/StubbingWithAdditionalAnswersTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/StubbingWithAdditionalAnswersTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/StubbingWithAdditionalAnswersTest.java diff --git a/src/test/java/org/mockitousage/stubbing/StubbingWithBadThrowablesTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/StubbingWithBadThrowablesTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/StubbingWithBadThrowablesTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/StubbingWithBadThrowablesTest.java diff --git a/src/test/java/org/mockitousage/stubbing/StubbingWithCustomAnswerTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/StubbingWithCustomAnswerTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/StubbingWithCustomAnswerTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/StubbingWithCustomAnswerTest.java diff --git a/src/test/java/org/mockitousage/stubbing/StubbingWithDelegateTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/StubbingWithDelegateTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/StubbingWithDelegateTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/StubbingWithDelegateTest.java diff --git a/src/test/java/org/mockitousage/stubbing/StubbingWithDelegateVarArgsTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/StubbingWithDelegateVarArgsTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/StubbingWithDelegateVarArgsTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/StubbingWithDelegateVarArgsTest.java diff --git a/src/test/java/org/mockitousage/stubbing/StubbingWithExtraAnswersTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/StubbingWithExtraAnswersTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/StubbingWithExtraAnswersTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/StubbingWithExtraAnswersTest.java diff --git a/src/test/java/org/mockitousage/stubbing/StubbingWithThrowablesTest.java b/mockito-core/src/test/java/org/mockitousage/stubbing/StubbingWithThrowablesTest.java similarity index 100% rename from src/test/java/org/mockitousage/stubbing/StubbingWithThrowablesTest.java rename to mockito-core/src/test/java/org/mockitousage/stubbing/StubbingWithThrowablesTest.java diff --git a/src/test/java/org/mockitousage/verification/AtLeastXVerificationTest.java b/mockito-core/src/test/java/org/mockitousage/verification/AtLeastXVerificationTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/AtLeastXVerificationTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/AtLeastXVerificationTest.java diff --git a/src/test/java/org/mockitousage/verification/AtMostXVerificationTest.java b/mockito-core/src/test/java/org/mockitousage/verification/AtMostXVerificationTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/AtMostXVerificationTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/AtMostXVerificationTest.java diff --git a/src/test/java/org/mockitousage/verification/BasicVerificationInOrderTest.java b/mockito-core/src/test/java/org/mockitousage/verification/BasicVerificationInOrderTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/BasicVerificationInOrderTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/BasicVerificationInOrderTest.java diff --git a/src/test/java/org/mockitousage/verification/BasicVerificationTest.java b/mockito-core/src/test/java/org/mockitousage/verification/BasicVerificationTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/BasicVerificationTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/BasicVerificationTest.java diff --git a/src/test/java/org/mockitousage/verification/DescriptiveMessagesOnVerificationInOrderErrorsTest.java b/mockito-core/src/test/java/org/mockitousage/verification/DescriptiveMessagesOnVerificationInOrderErrorsTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/DescriptiveMessagesOnVerificationInOrderErrorsTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/DescriptiveMessagesOnVerificationInOrderErrorsTest.java diff --git a/src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenTimesXVerificationFailsTest.java b/mockito-core/src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenTimesXVerificationFailsTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenTimesXVerificationFailsTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenTimesXVerificationFailsTest.java diff --git a/src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenVerificationFailsTest.java b/mockito-core/src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenVerificationFailsTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenVerificationFailsTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenVerificationFailsTest.java diff --git a/src/test/java/org/mockitousage/verification/ExactNumberOfTimesVerificationTest.java b/mockito-core/src/test/java/org/mockitousage/verification/ExactNumberOfTimesVerificationTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/ExactNumberOfTimesVerificationTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/ExactNumberOfTimesVerificationTest.java diff --git a/src/test/java/org/mockitousage/verification/FindingRedundantInvocationsInOrderTest.java b/mockito-core/src/test/java/org/mockitousage/verification/FindingRedundantInvocationsInOrderTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/FindingRedundantInvocationsInOrderTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/FindingRedundantInvocationsInOrderTest.java diff --git a/src/test/java/org/mockitousage/verification/NoMoreInteractionsVerificationTest.java b/mockito-core/src/test/java/org/mockitousage/verification/NoMoreInteractionsVerificationTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/NoMoreInteractionsVerificationTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/NoMoreInteractionsVerificationTest.java diff --git a/src/test/java/org/mockitousage/verification/OnlyVerificationTest.java b/mockito-core/src/test/java/org/mockitousage/verification/OnlyVerificationTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/OnlyVerificationTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/OnlyVerificationTest.java diff --git a/src/test/java/org/mockitousage/verification/OrdinaryVerificationPrintsAllInteractionsTest.java b/mockito-core/src/test/java/org/mockitousage/verification/OrdinaryVerificationPrintsAllInteractionsTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/OrdinaryVerificationPrintsAllInteractionsTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/OrdinaryVerificationPrintsAllInteractionsTest.java diff --git a/src/test/java/org/mockitousage/verification/PrintingVerboseTypesWithArgumentsTest.java b/mockito-core/src/test/java/org/mockitousage/verification/PrintingVerboseTypesWithArgumentsTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/PrintingVerboseTypesWithArgumentsTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/PrintingVerboseTypesWithArgumentsTest.java diff --git a/src/test/java/org/mockitousage/verification/RelaxedVerificationInOrderTest.java b/mockito-core/src/test/java/org/mockitousage/verification/RelaxedVerificationInOrderTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/RelaxedVerificationInOrderTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/RelaxedVerificationInOrderTest.java diff --git a/src/test/java/org/mockitousage/verification/SelectedMocksInOrderVerificationTest.java b/mockito-core/src/test/java/org/mockitousage/verification/SelectedMocksInOrderVerificationTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/SelectedMocksInOrderVerificationTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/SelectedMocksInOrderVerificationTest.java diff --git a/src/test/java/org/mockitousage/verification/VerificationExcludingStubsTest.java b/mockito-core/src/test/java/org/mockitousage/verification/VerificationExcludingStubsTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/VerificationExcludingStubsTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/VerificationExcludingStubsTest.java diff --git a/src/test/java/org/mockitousage/verification/VerificationInOrderMixedWithOrdinaryVerificationTest.java b/mockito-core/src/test/java/org/mockitousage/verification/VerificationInOrderMixedWithOrdinaryVerificationTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/VerificationInOrderMixedWithOrdinaryVerificationTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/VerificationInOrderMixedWithOrdinaryVerificationTest.java diff --git a/src/test/java/org/mockitousage/verification/VerificationInOrderTest.java b/mockito-core/src/test/java/org/mockitousage/verification/VerificationInOrderTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/VerificationInOrderTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/VerificationInOrderTest.java diff --git a/src/test/java/org/mockitousage/verification/VerificationInOrderWithCallsTest.java b/mockito-core/src/test/java/org/mockitousage/verification/VerificationInOrderWithCallsTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/VerificationInOrderWithCallsTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/VerificationInOrderWithCallsTest.java diff --git a/src/test/java/org/mockitousage/verification/VerificationInOrderWithTimeoutTest.java b/mockito-core/src/test/java/org/mockitousage/verification/VerificationInOrderWithTimeoutTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/VerificationInOrderWithTimeoutTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/VerificationInOrderWithTimeoutTest.java diff --git a/src/test/java/org/mockitousage/verification/VerificationOnMultipleMocksUsingMatchersTest.java b/mockito-core/src/test/java/org/mockitousage/verification/VerificationOnMultipleMocksUsingMatchersTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/VerificationOnMultipleMocksUsingMatchersTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/VerificationOnMultipleMocksUsingMatchersTest.java diff --git a/src/test/java/org/mockitousage/verification/VerificationStartedListenerTest.java b/mockito-core/src/test/java/org/mockitousage/verification/VerificationStartedListenerTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/VerificationStartedListenerTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/VerificationStartedListenerTest.java diff --git a/src/test/java/org/mockitousage/verification/VerificationUsingMatchersTest.java b/mockito-core/src/test/java/org/mockitousage/verification/VerificationUsingMatchersTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/VerificationUsingMatchersTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/VerificationUsingMatchersTest.java diff --git a/src/test/java/org/mockitousage/verification/VerificationWithAfterAndCaptorTest.java b/mockito-core/src/test/java/org/mockitousage/verification/VerificationWithAfterAndCaptorTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/VerificationWithAfterAndCaptorTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/VerificationWithAfterAndCaptorTest.java diff --git a/src/test/java/org/mockitousage/verification/VerificationWithAfterTest.java b/mockito-core/src/test/java/org/mockitousage/verification/VerificationWithAfterTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/VerificationWithAfterTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/VerificationWithAfterTest.java diff --git a/src/test/java/org/mockitousage/verification/VerificationWithTimeoutTest.java b/mockito-core/src/test/java/org/mockitousage/verification/VerificationWithTimeoutTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/VerificationWithTimeoutTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/VerificationWithTimeoutTest.java diff --git a/src/test/java/org/mockitousage/verification/VerifyPrintsAllInvocationsOnErrorTest.java b/mockito-core/src/test/java/org/mockitousage/verification/VerifyPrintsAllInvocationsOnErrorTest.java similarity index 100% rename from src/test/java/org/mockitousage/verification/VerifyPrintsAllInvocationsOnErrorTest.java rename to mockito-core/src/test/java/org/mockitousage/verification/VerifyPrintsAllInvocationsOnErrorTest.java diff --git a/src/test/java/org/mockitoutil/ClassLoaders.java b/mockito-core/src/test/java/org/mockitoutil/ClassLoaders.java similarity index 100% rename from src/test/java/org/mockitoutil/ClassLoaders.java rename to mockito-core/src/test/java/org/mockitoutil/ClassLoaders.java diff --git a/src/test/java/org/mockitoutil/ClassLoadersTest.java b/mockito-core/src/test/java/org/mockitoutil/ClassLoadersTest.java similarity index 100% rename from src/test/java/org/mockitoutil/ClassLoadersTest.java rename to mockito-core/src/test/java/org/mockitoutil/ClassLoadersTest.java diff --git a/src/test/java/org/mockitoutil/ConcurrentTesting.java b/mockito-core/src/test/java/org/mockitoutil/ConcurrentTesting.java similarity index 100% rename from src/test/java/org/mockitoutil/ConcurrentTesting.java rename to mockito-core/src/test/java/org/mockitoutil/ConcurrentTesting.java diff --git a/src/test/java/org/mockitoutil/Conditions.java b/mockito-core/src/test/java/org/mockitoutil/Conditions.java similarity index 100% rename from src/test/java/org/mockitoutil/Conditions.java rename to mockito-core/src/test/java/org/mockitoutil/Conditions.java diff --git a/src/test/java/org/mockitoutil/JUnitResultAssert.java b/mockito-core/src/test/java/org/mockitoutil/JUnitResultAssert.java similarity index 100% rename from src/test/java/org/mockitoutil/JUnitResultAssert.java rename to mockito-core/src/test/java/org/mockitoutil/JUnitResultAssert.java diff --git a/src/test/java/org/mockitoutil/SafeJUnitRule.java b/mockito-core/src/test/java/org/mockitoutil/SafeJUnitRule.java similarity index 100% rename from src/test/java/org/mockitoutil/SafeJUnitRule.java rename to mockito-core/src/test/java/org/mockitoutil/SafeJUnitRule.java diff --git a/src/test/java/org/mockitoutil/SafeJUnitRuleTest.java b/mockito-core/src/test/java/org/mockitoutil/SafeJUnitRuleTest.java similarity index 100% rename from src/test/java/org/mockitoutil/SafeJUnitRuleTest.java rename to mockito-core/src/test/java/org/mockitoutil/SafeJUnitRuleTest.java diff --git a/src/test/java/org/mockitoutil/SimpleClassGenerator.java b/mockito-core/src/test/java/org/mockitoutil/SimpleClassGenerator.java similarity index 100% rename from src/test/java/org/mockitoutil/SimpleClassGenerator.java rename to mockito-core/src/test/java/org/mockitoutil/SimpleClassGenerator.java diff --git a/src/test/java/org/mockitoutil/SimplePerRealmReloadingClassLoader.java b/mockito-core/src/test/java/org/mockitoutil/SimplePerRealmReloadingClassLoader.java similarity index 100% rename from src/test/java/org/mockitoutil/SimplePerRealmReloadingClassLoader.java rename to mockito-core/src/test/java/org/mockitoutil/SimplePerRealmReloadingClassLoader.java diff --git a/src/test/java/org/mockitoutil/SimpleSerializationUtil.java b/mockito-core/src/test/java/org/mockitoutil/SimpleSerializationUtil.java similarity index 100% rename from src/test/java/org/mockitoutil/SimpleSerializationUtil.java rename to mockito-core/src/test/java/org/mockitoutil/SimpleSerializationUtil.java diff --git a/src/test/java/org/mockitoutil/Stopwatch.java b/mockito-core/src/test/java/org/mockitoutil/Stopwatch.java similarity index 100% rename from src/test/java/org/mockitoutil/Stopwatch.java rename to mockito-core/src/test/java/org/mockitoutil/Stopwatch.java diff --git a/src/test/java/org/mockitoutil/TestBase.java b/mockito-core/src/test/java/org/mockitoutil/TestBase.java similarity index 100% rename from src/test/java/org/mockitoutil/TestBase.java rename to mockito-core/src/test/java/org/mockitoutil/TestBase.java diff --git a/src/test/java/org/mockitoutil/TestBaseTest.java b/mockito-core/src/test/java/org/mockitoutil/TestBaseTest.java similarity index 100% rename from src/test/java/org/mockitoutil/TestBaseTest.java rename to mockito-core/src/test/java/org/mockitoutil/TestBaseTest.java diff --git a/src/test/java/org/mockitoutil/ThrowableAssert.java b/mockito-core/src/test/java/org/mockitoutil/ThrowableAssert.java similarity index 100% rename from src/test/java/org/mockitoutil/ThrowableAssert.java rename to mockito-core/src/test/java/org/mockitoutil/ThrowableAssert.java diff --git a/src/test/java/org/mockitoutil/VmArgAssumptions.java b/mockito-core/src/test/java/org/mockitoutil/VmArgAssumptions.java similarity index 100% rename from src/test/java/org/mockitoutil/VmArgAssumptions.java rename to mockito-core/src/test/java/org/mockitoutil/VmArgAssumptions.java diff --git a/src/test/java/org/mockitoutil/async/AsyncTesting.java b/mockito-core/src/test/java/org/mockitoutil/async/AsyncTesting.java similarity index 100% rename from src/test/java/org/mockitoutil/async/AsyncTesting.java rename to mockito-core/src/test/java/org/mockitoutil/async/AsyncTesting.java diff --git a/src/test/java/org/mockitoutil/async/AsyncTestingTest.java b/mockito-core/src/test/java/org/mockitoutil/async/AsyncTestingTest.java similarity index 100% rename from src/test/java/org/mockitoutil/async/AsyncTestingTest.java rename to mockito-core/src/test/java/org/mockitoutil/async/AsyncTestingTest.java diff --git a/mockito-extensions/android/build.gradle b/mockito-extensions/android/build.gradle index 9f2937d01b..377c09143b 100644 --- a/mockito-extensions/android/build.gradle +++ b/mockito-extensions/android/build.gradle @@ -3,7 +3,7 @@ apply from: "$rootDir/gradle/java-library.gradle" description = "Mockito for Android" dependencies { - api project.rootProject + api project(":mockito-core") implementation libs.bytebuddy.android } diff --git a/mockito-extensions/errorprone/build.gradle b/mockito-extensions/errorprone/build.gradle index 92749335a2..988c4e5cc8 100644 --- a/mockito-extensions/errorprone/build.gradle +++ b/mockito-extensions/errorprone/build.gradle @@ -6,7 +6,7 @@ dependencies { compileOnly libs.autoservice annotationProcessor libs.autoservice - implementation project.rootProject + implementation project(":mockito-core") implementation libs.errorprone testImplementation 'junit:junit:4.13.2' diff --git a/mockito-extensions/junit-jupiter/build.gradle b/mockito-extensions/junit-jupiter/build.gradle index f3b8a9424a..2681a13bdb 100644 --- a/mockito-extensions/junit-jupiter/build.gradle +++ b/mockito-extensions/junit-jupiter/build.gradle @@ -1,7 +1,7 @@ import aQute.bnd.gradle.Resolve plugins { - id 'biz.aQute.bnd.builder' + id 'biz.aQute.bnd.builder' version '7.0.0' } apply from: "$rootDir/gradle/java-library.gradle" @@ -11,7 +11,7 @@ apply from: "$rootDir/gradle/mockito-junit-jupiter/javadoc.gradle" description = "Mockito JUnit 5 support" dependencies { - api project.rootProject + api project(":mockito-core") implementation libs.junit.jupiter.api testImplementation libs.assertj testImplementation libs.junit.platform.launcher diff --git a/mockito-extensions/proxy/build.gradle b/mockito-extensions/proxy/build.gradle index 3b8251484b..29c74b4c5e 100644 --- a/mockito-extensions/proxy/build.gradle +++ b/mockito-extensions/proxy/build.gradle @@ -3,7 +3,7 @@ apply from: "$rootDir/gradle/java-library.gradle" description = "Mockito preconfigured proxy mock mock maker (to support interfaces without code generation)" dependencies { - implementation project.rootProject + implementation project(":mockito-core") testImplementation libs.junit4 testImplementation libs.assertj } diff --git a/mockito-extensions/subclass/build.gradle b/mockito-extensions/subclass/build.gradle index 3b581f519d..1f91ad6789 100644 --- a/mockito-extensions/subclass/build.gradle +++ b/mockito-extensions/subclass/build.gradle @@ -3,7 +3,7 @@ apply from: "$rootDir/gradle/java-library.gradle" description = "Mockito preconfigured subclass mock maker" dependencies { - api project.rootProject + api project(":mockito-core") testImplementation libs.junit4 testImplementation libs.assertj } diff --git a/mockito-integration-tests/android-tests/build.gradle b/mockito-integration-tests/android-tests/build.gradle index 9bb01392df..54e5a44355 100644 --- a/mockito-integration-tests/android-tests/build.gradle +++ b/mockito-integration-tests/android-tests/build.gradle @@ -70,10 +70,10 @@ dependencies { // Add :android on the classpath so that AGP's jacoco setup thinks it's "production code to be tested". // Essentially a way to say: tasks.createDebugAndroidTestCoverageReport.classFileCollection.from(project(":android")) runtimeOnly project(":mockito-extensions:android") - // Exclude :android from JVM tests, because otherwise it clashes with mockito-core/project(":"). + // Exclude :android from JVM tests, because otherwise it clashes with mockito-core/project(":mockito-core"). configurations.testImplementation { exclude group: 'org.mockito', module: 'android' } - testImplementation project(":") + testImplementation project(":mockito-core") testImplementation libs.junit4 testImplementation libs.junit.jupiter.api testImplementation libs.junit.jupiter.engine diff --git a/mockito-integration-tests/extensions-tests/build.gradle b/mockito-integration-tests/extensions-tests/build.gradle index 7061032661..c6a47a1fae 100644 --- a/mockito-integration-tests/extensions-tests/build.gradle +++ b/mockito-integration-tests/extensions-tests/build.gradle @@ -3,9 +3,9 @@ apply from: "$rootDir/gradle/java-test.gradle" description = "End-to-end tests for Mockito and its extensions." dependencies { - testImplementation project.rootProject + testImplementation project(":mockito-core") testImplementation project(":mockito-extensions:junit-jupiter") - testImplementation project(path: ':', configuration: 'testUtil') + testImplementation project(path: ':mockito-core', configuration: 'testUtil') testImplementation libs.junit4 testImplementation libs.assertj testImplementation libs.junit.jupiter.api diff --git a/mockito-integration-tests/groovy-inline-tests/build.gradle b/mockito-integration-tests/groovy-inline-tests/build.gradle index 29710760ab..3d02bbdcee 100644 --- a/mockito-integration-tests/groovy-inline-tests/build.gradle +++ b/mockito-integration-tests/groovy-inline-tests/build.gradle @@ -7,7 +7,7 @@ apply from: "$rootDir/gradle/java-test.gradle" description = "Integration test for using mockito-inline with Groovy." dependencies { - testImplementation project(":") + testImplementation project(":mockito-core") testImplementation libs.groovy testImplementation libs.junit4 } diff --git a/mockito-integration-tests/groovy-tests/build.gradle b/mockito-integration-tests/groovy-tests/build.gradle index ba0307a48c..8852de52aa 100644 --- a/mockito-integration-tests/groovy-tests/build.gradle +++ b/mockito-integration-tests/groovy-tests/build.gradle @@ -7,7 +7,7 @@ apply from: "$rootDir/gradle/java-test.gradle" description = "Integration test for using Mockito from Groovy." dependencies { - testImplementation project(":") + testImplementation project(":mockito-core") testImplementation libs.groovy testImplementation libs.junit4 } diff --git a/mockito-integration-tests/inline-mocks-tests/build.gradle b/mockito-integration-tests/inline-mocks-tests/build.gradle index 53bf96d8aa..30524ca205 100644 --- a/mockito-integration-tests/inline-mocks-tests/build.gradle +++ b/mockito-integration-tests/inline-mocks-tests/build.gradle @@ -3,7 +3,7 @@ apply from: "$rootDir/gradle/java-test.gradle" description = "Mockito preconfigured inline mock maker (intermediate and to be superseeded by automatic usage in a future version)" dependencies { - implementation project.rootProject + implementation project(":mockito-core") testImplementation libs.junit4 testImplementation libs.assertj } diff --git a/mockito-integration-tests/java-21-tests/build.gradle b/mockito-integration-tests/java-21-tests/build.gradle index 5f9b96221e..f6ffb37509 100644 --- a/mockito-integration-tests/java-21-tests/build.gradle +++ b/mockito-integration-tests/java-21-tests/build.gradle @@ -3,7 +3,7 @@ apply from: "$rootDir/gradle/java-test.gradle" description = "Test suite for Java 21 Mockito" dependencies { - implementation project.rootProject + implementation project(":mockito-core") testImplementation libs.junit4 testImplementation libs.assertj } @@ -20,8 +20,8 @@ tasks.named('test', Test) { if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_21)) { enabled = false } else { - dependsOn(':jar') - jvmArgs('-javaagent:' + rootProject.tasks.jar.outputs.files.singleFile) + dependsOn(':mockito-core:jar') + jvmArgs('-javaagent:' + project(":mockito-core").tasks.jar.outputs.files.singleFile) // jvmArgs('-Djdk.instrument.traceUsage') } } diff --git a/mockito-integration-tests/kotlin-release-coroutines-tests/build.gradle b/mockito-integration-tests/kotlin-release-coroutines-tests/build.gradle index 735098c52b..dd2098c810 100644 --- a/mockito-integration-tests/kotlin-release-coroutines-tests/build.gradle +++ b/mockito-integration-tests/kotlin-release-coroutines-tests/build.gradle @@ -16,7 +16,7 @@ tasks.withType(KotlinCompile).configureEach { } dependencies { - testImplementation project(":") + testImplementation project(":mockito-core") testImplementation libs.junit4 testImplementation libs.kotlin.stdlib diff --git a/mockito-integration-tests/kotlin-tests/build.gradle b/mockito-integration-tests/kotlin-tests/build.gradle index 735098c52b..dd2098c810 100644 --- a/mockito-integration-tests/kotlin-tests/build.gradle +++ b/mockito-integration-tests/kotlin-tests/build.gradle @@ -16,7 +16,7 @@ tasks.withType(KotlinCompile).configureEach { } dependencies { - testImplementation project(":") + testImplementation project(":mockito-core") testImplementation libs.junit4 testImplementation libs.kotlin.stdlib diff --git a/mockito-integration-tests/memory-tests/build.gradle b/mockito-integration-tests/memory-tests/build.gradle index 38d449ee18..f3b656d4b6 100644 --- a/mockito-integration-tests/memory-tests/build.gradle +++ b/mockito-integration-tests/memory-tests/build.gradle @@ -3,7 +3,7 @@ apply from: "$rootDir/gradle/java-test.gradle" description = "Test suite memory usage of Mockito" dependencies { - implementation project.rootProject + implementation project(":mockito-core") testImplementation libs.junit4 testImplementation libs.assertj } diff --git a/mockito-integration-tests/module-tests/build.gradle b/mockito-integration-tests/module-tests/build.gradle index 9427014b09..26b0d67328 100644 --- a/mockito-integration-tests/module-tests/build.gradle +++ b/mockito-integration-tests/module-tests/build.gradle @@ -3,7 +3,7 @@ apply from: "$rootDir/gradle/java-test.gradle" description = "Test suite for Java 9 modules with Mockito" dependencies { - implementation project.rootProject + implementation project(":mockito-core") testImplementation libs.junit4 testImplementation libs.assertj } diff --git a/mockito-integration-tests/osgi-tests/build.gradle b/mockito-integration-tests/osgi-tests/build.gradle index 6d902788e2..ebbca1419e 100644 --- a/mockito-integration-tests/osgi-tests/build.gradle +++ b/mockito-integration-tests/osgi-tests/build.gradle @@ -4,7 +4,7 @@ apply from: "osgi-test-bundles.gradle" description = "Test suite for OSGi framework with Mockito" dependencies { - testImplementation project.rootProject + testImplementation project(":mockito-core") testImplementation libs.junit4 testImplementation libs.osgi @@ -16,7 +16,7 @@ configurations { } dependencies { - testRuntimeBundles project.rootProject + testRuntimeBundles project(":mockito-core") testRuntimeBundles libs.bytebuddy testRuntimeBundles libs.objenesis testRuntimeBundles tasks.testBundle.outputs.files diff --git a/mockito-integration-tests/osgi-tests/osgi-test-bundles.gradle b/mockito-integration-tests/osgi-tests/osgi-test-bundles.gradle index 24c2578de5..2e14f5ca28 100644 --- a/mockito-integration-tests/osgi-tests/osgi-test-bundles.gradle +++ b/mockito-integration-tests/osgi-tests/osgi-test-bundles.gradle @@ -15,7 +15,7 @@ sourceSets { } dependencies { - testBundleImplementation project.rootProject + testBundleImplementation project(":mockito-core") testBundleImplementation libs.junit4 testBundleImplementation sourceSets.otherBundle.output } diff --git a/mockito-integration-tests/programmatic-tests/build.gradle b/mockito-integration-tests/programmatic-tests/build.gradle index 4825bf1e08..0c67a7bb05 100644 --- a/mockito-integration-tests/programmatic-tests/build.gradle +++ b/mockito-integration-tests/programmatic-tests/build.gradle @@ -3,7 +3,7 @@ apply from: "$rootDir/gradle/java-test.gradle" description = "Test suite for excercising programmatic mock maker in Mockito" dependencies { - implementation project.rootProject + implementation project(":mockito-core") testImplementation libs.junit4 testImplementation libs.assertj } diff --git a/settings.gradle.kts b/settings.gradle.kts index 657d77fb94..8cbe5a0eff 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,8 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + } +} + plugins { id("com.gradle.develocity") version "3.18.1" id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } +include("mockito-core") // BOM project include("mockito-bom") // extensions