Rename package org.sonar.batch to org.sonar.scanner

574 files changed, 1708 insertions, 1667 deletions

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/Batch.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/Batch.java
index 67b7fbda4b4..9b5d0a2a98f 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/Batch.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/Batch.java
@@ -20,7 +20,7 @@
 package org.sonar.batch.bootstrapper;
 
 import org.sonar.api.utils.MessageException;
-
+import org.sonar.scanner.bootstrap.GlobalContainer;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -30,7 +30,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.picocontainer.annotations.Nullable;
-import org.sonar.batch.bootstrap.GlobalContainer;
 
 /**
  * Entry point for sonar-runner 2.1.
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/LoggingConfiguration.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/LoggingConfiguration.java
index 41a741bbd08..a330b6c37d0 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/LoggingConfiguration.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/LoggingConfiguration.java
@@ -21,12 +21,9 @@ package org.sonar.batch.bootstrapper;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Maps;
-
 import java.util.Map;
-
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
-
 import org.apache.commons.lang.StringUtils;
 
 /**
@@ -35,6 +32,10 @@ import org.apache.commons.lang.StringUtils;
 public final class LoggingConfiguration {
 
   public static final String PROPERTY_ROOT_LOGGER_LEVEL = "ROOT_LOGGER_LEVEL";
+  /**
+   * @deprecated since 5.2 there is no more db access from scanner side
+   */
+  @Deprecated
   public static final String PROPERTY_SQL_LOGGER_LEVEL = "SQL_LOGGER_LEVEL";
 
   public static final String PROPERTY_FORMAT = "FORMAT";
@@ -84,7 +85,7 @@ public final class LoggingConfiguration {
   public LoggingConfiguration setVerbose(boolean verbose) {
     return setRootLevel(verbose ? LEVEL_ROOT_VERBOSE : LEVEL_ROOT_DEFAULT);
   }
-  
+
   public boolean isVerbose() {
     return verbose;
   }
@@ -116,16 +117,20 @@ public final class LoggingConfiguration {
     return addSubstitutionVariable(PROPERTY_ROOT_LOGGER_LEVEL, level);
   }
 
+  /**
+   * @deprecated since 5.2 there is no more db access from scanner side
+   */
+  @Deprecated
   public LoggingConfiguration setShowSql(boolean showSql) {
-    return addSubstitutionVariable(PROPERTY_SQL_LOGGER_LEVEL, showSql ? "TRACE" : "WARN");
+    return this;
   }
 
+  /**
+   * @deprecated since 5.2 there is no more db access from scanner side
+   */
+  @Deprecated
   public LoggingConfiguration setShowSql(Map<String, String> properties, @Nullable Map<String, String> fallback) {
-    String logLevel = getFallback("sonar.log.level", properties, fallback);
-    String deprecatedProfilingLevel = getFallback("sonar.log.profilingLevel", properties, fallback);
-    boolean sql = "TRACE".equals(logLevel) || "FULL".equals(deprecatedProfilingLevel);
-
-    return setShowSql(sql);
+    return this;
   }
 
   @VisibleForTesting
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/package-info.java
deleted file mode 100644
index 9ec5890816a..00000000000
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.batch.deprecated;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/package-info.java
deleted file mode 100644
index 1496e020dd6..00000000000
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.batch.deprecated.perspectives;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/package-info.java
deleted file mode 100644
index ead2a62c636..00000000000
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.batch.issue.ignore;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/package-info.java
deleted file mode 100644
index ebbc7b8371e..00000000000
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.batch.issue.ignore.pattern;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/scanner/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/scanner/package-info.java
deleted file mode 100644
index 3beb574f061..00000000000
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/scanner/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.batch.issue.ignore.scanner;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/package-info.java
deleted file mode 100644
index 148dc77f0f4..00000000000
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.batch.issue.tracking;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/package-info.java
deleted file mode 100644
index 2cc10ab66ff..00000000000
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.batch.mediumtest;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/package-info.java
deleted file mode 100644
index f4cd97fca3c..00000000000
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.batch.phases;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/report/package-info.java
deleted file mode 100644
index f4b3d8e51a9..00000000000
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.batch.report;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/package-info.java
deleted file mode 100644
index 3679d1bfbb1..00000000000
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.batch.repository;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/user/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/user/package-info.java
deleted file mode 100644
index 6462fb00b8a..00000000000
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/user/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.batch.repository.user;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/package-info.java
deleted file mode 100644
index 1bdc402f399..00000000000
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.batch.rule;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/package-info.java
deleted file mode 100644
index af539896111..00000000000
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.batch.scan;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/package-info.java
deleted file mode 100644
index d6dacad1b54..00000000000
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.batch.scan.report;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/package-info.java
deleted file mode 100644
index 925761a7298..00000000000
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.batch.scm;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/source/package-info.java
deleted file mode 100644
index c33229b0ab2..00000000000
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.batch.source;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/task/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/task/package-info.java
deleted file mode 100644
index 5787c1e27c2..00000000000
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/task/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.batch.task;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/test/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/test/package-info.java
deleted file mode 100644
index cb0a2f6c3e7..00000000000
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/test/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-@ParametersAreNonnullByDefault
-package org.sonar.batch.test;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/DefaultFileLinesContext.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/DefaultFileLinesContext.java
index 33b773e39c3..ca5dc73c1c9 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/DefaultFileLinesContext.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/DefaultFileLinesContext.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch;
+package org.sonar.scanner;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
@@ -33,7 +33,7 @@ import org.sonar.api.measures.FileLinesContext;
 import org.sonar.api.measures.Measure;
 import org.sonar.api.utils.KeyValueFormat;
 import org.sonar.api.utils.KeyValueFormat.Converter;
-import org.sonar.batch.scan.measure.MeasureCache;
+import org.sonar.scanner.scan.measure.MeasureCache;
 
 import static com.google.common.collect.Maps.filterValues;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/DefaultFileLinesContextFactory.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/DefaultFileLinesContextFactory.java
index cdc83a47d13..40b1049bd78 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/DefaultFileLinesContextFactory.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/DefaultFileLinesContextFactory.java
@@ -17,14 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch;
+package org.sonar.scanner;
 
 import org.sonar.api.batch.SensorContext;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.measure.MetricFinder;
 import org.sonar.api.measures.FileLinesContext;
 import org.sonar.api.measures.FileLinesContextFactory;
-import org.sonar.batch.scan.measure.MeasureCache;
+import org.sonar.scanner.scan.measure.MeasureCache;
 
 public class DefaultFileLinesContextFactory implements FileLinesContextFactory {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/DefaultProjectTree.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/DefaultProjectTree.java
index 5b56f27154c..c412cd15ead 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/DefaultProjectTree.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/DefaultProjectTree.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch;
+package org.sonar.scanner;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -28,7 +28,7 @@ import org.apache.commons.lang.ObjectUtils;
 import org.picocontainer.Startable;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.resources.Project;
-import org.sonar.batch.scan.ImmutableProjectReactor;
+import org.sonar.scanner.scan.ImmutableProjectReactor;
 
 public class DefaultProjectTree implements Startable {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/ProjectConfigurator.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/ProjectConfigurator.java
index a0b55e50519..64e9e242963 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/ProjectConfigurator.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/ProjectConfigurator.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch;
+package org.sonar.scanner;
 
 import java.util.Date;
 import org.apache.commons.lang.StringUtils;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/analysis/AnalysisProperties.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/analysis/AnalysisProperties.java
index e3be61067e6..c64bd12b01a 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/analysis/AnalysisProperties.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/analysis/AnalysisProperties.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.analysis;
+package org.sonar.scanner.analysis;
 
 import java.util.Map;
 import javax.annotation.Nullable;
-import org.sonar.batch.bootstrap.UserProperties;
+import org.sonar.scanner.bootstrap.UserProperties;
 
 /**
  * Batch properties that are specific to an analysis (for example
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/analysis/AnalysisTempFolderProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/analysis/AnalysisTempFolderProvider.java
index 68c2608b864..eff0e247d37 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/analysis/AnalysisTempFolderProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/analysis/AnalysisTempFolderProvider.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.analysis;
+package org.sonar.scanner.analysis;
 
 import org.sonar.api.batch.bootstrap.ProjectReactor;
 import org.picocontainer.PicoContainer;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/analysis/DefaultAnalysisMode.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/analysis/DefaultAnalysisMode.java
index 7bd08e9e16d..f16fda3c995 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/analysis/DefaultAnalysisMode.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/analysis/DefaultAnalysisMode.java
@@ -17,16 +17,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.analysis;
+package org.sonar.scanner.analysis;
 
 import java.util.Map;
 import javax.annotation.CheckForNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.CoreProperties;
-import org.sonar.batch.bootstrap.AbstractAnalysisMode;
-import org.sonar.batch.bootstrap.GlobalProperties;
-import org.sonar.batch.mediumtest.FakePluginInstaller;
+import org.sonar.scanner.bootstrap.AbstractAnalysisMode;
+import org.sonar.scanner.bootstrap.GlobalProperties;
+import org.sonar.scanner.mediumtest.FakePluginInstaller;
 
 /**
  * @since 4.0
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/index/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/analysis/package-info.java
index 86431b3a529..f3f553bdee0 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/index/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/analysis/package-info.java
@@ -18,7 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.batch.cpd.index;
+package org.sonar.scanner.analysis;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/AbstractAnalysisMode.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/AbstractAnalysisMode.java
index 2944accbd27..2aa8108f3a2 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/AbstractAnalysisMode.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/AbstractAnalysisMode.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.CoreProperties;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchComponents.java
index aa107887ea4..51dc68f024c 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchComponents.java
@@ -17,32 +17,32 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import com.google.common.collect.Lists;
 import java.util.Collection;
 import java.util.List;
 import org.sonar.api.batch.AnalysisMode;
-import org.sonar.batch.cpd.CpdComponents;
-import org.sonar.batch.issue.tracking.ServerIssueFromWs;
-import org.sonar.batch.issue.tracking.TrackedIssue;
-import org.sonar.batch.scan.report.ConsoleReport;
-import org.sonar.batch.scan.report.HtmlReport;
-import org.sonar.batch.scan.report.IssuesReportBuilder;
-import org.sonar.batch.scan.report.JSONReport;
-import org.sonar.batch.scan.report.RuleNameProvider;
-import org.sonar.batch.scan.report.SourceProvider;
-import org.sonar.batch.scm.ScmConfiguration;
-import org.sonar.batch.scm.ScmSensor;
-import org.sonar.batch.source.CodeColorizerSensor;
-import org.sonar.batch.source.LinesSensor;
-import org.sonar.batch.source.ZeroCoverageSensor;
-import org.sonar.batch.task.ListTask;
-import org.sonar.batch.task.ScanTask;
-import org.sonar.batch.task.Tasks;
 import org.sonar.core.component.DefaultResourceTypes;
 import org.sonar.core.config.CorePropertyDefinitions;
 import org.sonar.core.issue.tracking.Tracker;
+import org.sonar.scanner.cpd.CpdComponents;
+import org.sonar.scanner.issue.tracking.ServerIssueFromWs;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
+import org.sonar.scanner.scan.report.ConsoleReport;
+import org.sonar.scanner.scan.report.HtmlReport;
+import org.sonar.scanner.scan.report.IssuesReportBuilder;
+import org.sonar.scanner.scan.report.JSONReport;
+import org.sonar.scanner.scan.report.RuleNameProvider;
+import org.sonar.scanner.scan.report.SourceProvider;
+import org.sonar.scanner.scm.ScmConfiguration;
+import org.sonar.scanner.scm.ScmSensor;
+import org.sonar.scanner.source.CodeColorizerSensor;
+import org.sonar.scanner.source.LinesSensor;
+import org.sonar.scanner.source.ZeroCoverageSensor;
+import org.sonar.scanner.task.ListTask;
+import org.sonar.scanner.task.ScanTask;
+import org.sonar.scanner.task.Tasks;
 
 public class BatchComponents {
   private BatchComponents() {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchExtensionDictionnary.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchExtensionDictionnary.java
index cfebad6cbb5..6023bb1d0fb 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchExtensionDictionnary.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchExtensionDictionnary.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
@@ -43,12 +43,12 @@ import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.resources.Project;
 import org.sonar.api.utils.AnnotationUtils;
 import org.sonar.api.utils.dag.DirectAcyclicGraph;
-import org.sonar.batch.postjob.PostJobOptimizer;
-import org.sonar.batch.postjob.PostJobWrapper;
-import org.sonar.batch.sensor.DefaultSensorContext;
-import org.sonar.batch.sensor.SensorOptimizer;
-import org.sonar.batch.sensor.SensorWrapper;
 import org.sonar.core.platform.ComponentContainer;
+import org.sonar.scanner.postjob.PostJobOptimizer;
+import org.sonar.scanner.postjob.PostJobWrapper;
+import org.sonar.scanner.sensor.DefaultSensorContext;
+import org.sonar.scanner.sensor.SensorOptimizer;
+import org.sonar.scanner.sensor.SensorWrapper;
 
 /**
  * @since 2.6
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginInstaller.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchPluginInstaller.java
index 2a6b64de50d..25ce8cf68a4 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginInstaller.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchPluginInstaller.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
@@ -89,7 +89,7 @@ public class BatchPluginInstaller implements PluginInstaller {
 
   /**
    * Returns empty on purpose. This method is used only by tests.
-   * @see org.sonar.batch.mediumtest.BatchMediumTester
+   * @see org.sonar.scanner.mediumtest.BatchMediumTester
    */
   @Override
   public Map<String, Plugin> installLocals() {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginJarExploder.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchPluginJarExploder.java
index b1ee308a926..f4eea73f7db 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginJarExploder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchPluginJarExploder.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import org.apache.commons.io.FileUtils;
 import org.sonar.api.batch.ScannerSide;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginPredicate.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchPluginPredicate.java
index 6aa3fe77320..f86adc3dd1d 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginPredicate.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchPluginPredicate.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Predicate;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchPluginRepository.java
index 6a111cf23c0..08f7ea09bdd 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchPluginRepository.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchWsClient.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchWsClient.java
index d40683c8ca8..a9066499967 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchWsClient.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchWsClient.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchWsClientProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchWsClientProvider.java
index ea6ad1e9139..96bcb33ff78 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/BatchWsClientProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchWsClientProvider.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import org.picocontainer.injectors.ProviderAdapter;
 import org.sonar.api.CoreProperties;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/DroppedPropertyChecker.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/DroppedPropertyChecker.java
index 72b34d613ea..c4f2cf72e2d 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/DroppedPropertyChecker.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/DroppedPropertyChecker.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import java.util.Map;
 import org.sonar.api.utils.log.Logger;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ExtensionInstaller.java
index 5794a8a0314..7fcece413b0 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ExtensionInstaller.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import java.util.List;
 import javax.annotation.Nullable;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/ExtensionMatcher.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ExtensionMatcher.java
index d5bd2516af0..dc5cc9d9785 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/ExtensionMatcher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ExtensionMatcher.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import org.sonar.api.batch.ScannerSide;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ExtensionUtils.java
index 9d6882420f6..aa36562acd0 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ExtensionUtils.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import org.sonar.api.batch.BatchSide;
 import org.sonar.api.batch.InstantiationStrategy;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/FileCacheProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/FileCacheProvider.java
index 9880c7de23b..f15e27fc2db 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/FileCacheProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/FileCacheProvider.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import org.picocontainer.injectors.ProviderAdapter;
 import org.sonar.api.config.Settings;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/GlobalContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalContainer.java
index 606b3d9a29d..47a9422efd8 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/GlobalContainer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalContainer.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import java.util.List;
 import java.util.Map;
@@ -28,12 +28,6 @@ import org.sonar.api.utils.System2;
 import org.sonar.api.utils.UriReader;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.batch.index.CachesManager;
-import org.sonar.batch.platform.DefaultServer;
-import org.sonar.batch.repository.DefaultGlobalRepositoriesLoader;
-import org.sonar.batch.repository.GlobalRepositoriesLoader;
-import org.sonar.batch.repository.GlobalRepositoriesProvider;
-import org.sonar.batch.task.TaskContainer;
 import org.sonar.core.platform.ComponentContainer;
 import org.sonar.core.platform.PluginClassloaderFactory;
 import org.sonar.core.platform.PluginInfo;
@@ -41,6 +35,12 @@ import org.sonar.core.platform.PluginLoader;
 import org.sonar.core.platform.PluginRepository;
 import org.sonar.core.util.DefaultHttpDownloader;
 import org.sonar.core.util.UuidFactoryImpl;
+import org.sonar.scanner.index.CachesManager;
+import org.sonar.scanner.platform.DefaultServer;
+import org.sonar.scanner.repository.DefaultGlobalRepositoriesLoader;
+import org.sonar.scanner.repository.GlobalRepositoriesLoader;
+import org.sonar.scanner.repository.GlobalRepositoriesProvider;
+import org.sonar.scanner.task.TaskContainer;
 
 public class GlobalContainer extends ComponentContainer {
   private static final Logger LOG = Loggers.get(GlobalContainer.class);
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/GlobalMode.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalMode.java
index 88127f28f74..29b6b805616 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/GlobalMode.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalMode.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/GlobalProperties.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalProperties.java
index 62bc070080e..7e33002ea75 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/GlobalProperties.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalProperties.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import org.sonar.api.CoreProperties;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/GlobalSettings.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalSettings.java
index 3ff5dce8ecd..b327d79017a 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/GlobalSettings.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalSettings.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/GlobalTempFolderProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalTempFolderProvider.java
index 2ea3bff55a3..7795ee44d4b 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/GlobalTempFolderProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalTempFolderProvider.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import java.io.IOException;
 import java.nio.file.DirectoryStream;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/MetricProvider.java
index 735eeb4089f..572a0c4ee93 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/MetricProvider.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import com.google.common.collect.Lists;
 import org.sonar.api.batch.ScannerSide;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/PluginInstaller.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/PluginInstaller.java
index fc07d4c2a77..a839986ce7b 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/PluginInstaller.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/PluginInstaller.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import java.util.Map;
 import org.sonar.api.Plugin;
@@ -36,7 +36,7 @@ public interface PluginInstaller {
 
   /**
    * Used only by tests.
-   * @see org.sonar.batch.mediumtest.BatchMediumTester
+   * @see org.sonar.scanner.mediumtest.BatchMediumTester
    */
   Map<String, Plugin> installLocals();
 }
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/Slf4jLogger.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/Slf4jLogger.java
index 270bc10fe0d..7b1fc9e8ae1 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/Slf4jLogger.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/Slf4jLogger.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/UserProperties.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/UserProperties.java
index d16f8e72d27..6e63e8643d7 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/UserProperties.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/UserProperties.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import com.google.common.collect.Maps;
 import org.sonar.api.config.Encryption;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/package-info.java
index 0efbab080ec..35d9c536836 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrap/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/package-info.java
@@ -18,6 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/CpdComponents.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/CpdComponents.java
index a204f14d9fe..aa5f5f3a0aa 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/CpdComponents.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/CpdComponents.java
@@ -17,14 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.cpd;
+package org.sonar.scanner.cpd;
 
 import com.google.common.collect.ImmutableList;
 import java.util.List;
-import org.sonar.batch.cpd.deprecated.CpdMappings;
-import org.sonar.batch.cpd.deprecated.DefaultCpdBlockIndexer;
-import org.sonar.batch.cpd.deprecated.DeprecatedCpdBlockIndexerSensor;
-import org.sonar.batch.cpd.deprecated.JavaCpdBlockIndexer;
+import org.sonar.scanner.cpd.deprecated.CpdMappings;
+import org.sonar.scanner.cpd.deprecated.DefaultCpdBlockIndexer;
+import org.sonar.scanner.cpd.deprecated.DeprecatedCpdBlockIndexerSensor;
+import org.sonar.scanner.cpd.deprecated.JavaCpdBlockIndexer;
 
 public final class CpdComponents {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/CpdExecutor.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/CpdExecutor.java
index 410938bab46..07b03c18257 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/CpdExecutor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/CpdExecutor.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.cpd;
+package org.sonar.scanner.cpd;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
@@ -26,19 +26,19 @@ import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.config.Settings;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.batch.cpd.index.SonarCpdBlockIndex;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.report.ReportPublisher;
-import org.sonar.batch.util.ProgressReport;
 import org.sonar.duplications.block.Block;
 import org.sonar.duplications.detector.suffixtree.SuffixTreeCloneDetectionAlgorithm;
 import org.sonar.duplications.index.CloneGroup;
 import org.sonar.duplications.index.ClonePart;
 import org.sonar.duplications.index.PackedMemoryCloneIndex.ResourceBlocks;
+import org.sonar.scanner.cpd.index.SonarCpdBlockIndex;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponentCache;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReport.Duplicate;
 import org.sonar.scanner.protocol.output.ScannerReport.Duplication;
+import org.sonar.scanner.report.ReportPublisher;
+import org.sonar.scanner.util.ProgressReport;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/DuplicationPredicates.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/DuplicationPredicates.java
index e016ae6f970..11cb9e81a1e 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/DuplicationPredicates.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/DuplicationPredicates.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.cpd;
+package org.sonar.scanner.cpd;
 
 import com.google.common.base.Predicate;
 import org.sonar.duplications.index.CloneGroup;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/deprecated/CpdBlockIndexer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/deprecated/CpdBlockIndexer.java
index b210e2f488c..97a0a7e96ae 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/deprecated/CpdBlockIndexer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/deprecated/CpdBlockIndexer.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.cpd.deprecated;
+package org.sonar.scanner.cpd.deprecated;
 
 import org.slf4j.Logger;
 import org.sonar.api.batch.ScannerSide;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/deprecated/CpdMappings.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/deprecated/CpdMappings.java
index abeb4e64ef7..d37dfecfb03 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/deprecated/CpdMappings.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/deprecated/CpdMappings.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.cpd.deprecated;
+package org.sonar.scanner.cpd.deprecated;
 
 import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.CpdMapping;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/deprecated/DefaultCpdBlockIndexer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/deprecated/DefaultCpdBlockIndexer.java
index db51246e1c8..6ff5e27b878 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/deprecated/DefaultCpdBlockIndexer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/deprecated/DefaultCpdBlockIndexer.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.cpd.deprecated;
+package org.sonar.scanner.cpd.deprecated;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
@@ -31,9 +31,9 @@ import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.config.Settings;
-import org.sonar.batch.cpd.index.SonarCpdBlockIndex;
 import org.sonar.duplications.block.Block;
 import org.sonar.duplications.internal.pmd.TokenizerBridge;
+import org.sonar.scanner.cpd.index.SonarCpdBlockIndex;
 
 public class DefaultCpdBlockIndexer extends CpdBlockIndexer {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/deprecated/DeprecatedCpdBlockIndexerSensor.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/deprecated/DeprecatedCpdBlockIndexerSensor.java
index ad72d673777..1d66024c21c 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/deprecated/DeprecatedCpdBlockIndexerSensor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/deprecated/DeprecatedCpdBlockIndexerSensor.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.cpd.deprecated;
+package org.sonar.scanner.cpd.deprecated;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/deprecated/JavaCpdBlockIndexer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/deprecated/JavaCpdBlockIndexer.java
index 7e0772408b7..8f498ed4638 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/deprecated/JavaCpdBlockIndexer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/deprecated/JavaCpdBlockIndexer.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.cpd.deprecated;
+package org.sonar.scanner.cpd.deprecated;
 
 import com.google.common.collect.Lists;
 import java.io.FileInputStream;
@@ -34,7 +34,6 @@ import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.config.Settings;
-import org.sonar.batch.cpd.index.SonarCpdBlockIndex;
 import org.sonar.duplications.block.Block;
 import org.sonar.duplications.block.BlockChunker;
 import org.sonar.duplications.java.JavaStatementBuilder;
@@ -42,6 +41,7 @@ import org.sonar.duplications.java.JavaTokenProducer;
 import org.sonar.duplications.statement.Statement;
 import org.sonar.duplications.statement.StatementChunker;
 import org.sonar.duplications.token.TokenChunker;
+import org.sonar.scanner.cpd.index.SonarCpdBlockIndex;
 
 public class JavaCpdBlockIndexer extends CpdBlockIndexer {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/deprecated/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/deprecated/package-info.java
index 8a035753659..77c179c4535 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/deprecated/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/deprecated/package-info.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.batch.cpd.deprecated;
+package org.sonar.scanner.cpd.deprecated;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/index/SonarCpdBlockIndex.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/index/SonarCpdBlockIndex.java
index e819c12e32e..93984a86168 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/index/SonarCpdBlockIndex.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/index/SonarCpdBlockIndex.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.cpd.index;
+package org.sonar.scanner.cpd.index;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
@@ -29,15 +29,15 @@ import org.apache.commons.lang.StringUtils;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.config.Settings;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.report.ReportPublisher;
 import org.sonar.duplications.block.Block;
 import org.sonar.duplications.block.ByteArray;
 import org.sonar.duplications.index.AbstractCloneIndex;
 import org.sonar.duplications.index.CloneIndex;
 import org.sonar.duplications.index.PackedMemoryCloneIndex;
 import org.sonar.duplications.index.PackedMemoryCloneIndex.ResourceBlocks;
+import org.sonar.scanner.index.BatchComponentCache;
 import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.report.ReportPublisher;
 
 public class SonarCpdBlockIndex extends AbstractCloneIndex {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/index/package-info.java
index 8f57dd4e4c7..69e47b052e5 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/index/package-info.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.batch.profiling;
+package org.sonar.scanner.cpd.index;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/package-info.java
index c4205b6d38e..17490078093 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/cpd/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/package-info.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.batch.cpd;
+package org.sonar.scanner.cpd;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/DeprecatedSensorContext.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/DeprecatedSensorContext.java
index de68c7fba5e..422cedf7205 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/DeprecatedSensorContext.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/DeprecatedSensorContext.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.deprecated;
+package org.sonar.scanner.deprecated;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -40,9 +40,9 @@ import org.sonar.api.resources.Directory;
 import org.sonar.api.resources.File;
 import org.sonar.api.resources.Project;
 import org.sonar.api.resources.Resource;
-import org.sonar.batch.index.DefaultIndex;
-import org.sonar.batch.sensor.DefaultSensorContext;
-import org.sonar.batch.sensor.coverage.CoverageExclusions;
+import org.sonar.scanner.index.DefaultIndex;
+import org.sonar.scanner.sensor.DefaultSensorContext;
+import org.sonar.scanner.sensor.coverage.CoverageExclusions;
 
 public class DeprecatedSensorContext extends DefaultSensorContext implements SensorContext {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/InputFileComponent.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/InputFileComponent.java
index e8dcc72cb32..8a11c1856e4 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/InputFileComponent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/InputFileComponent.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.deprecated;
+package org.sonar.scanner.deprecated;
 
 import org.sonar.api.batch.fs.InputFile.Type;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/package-info.java
new file mode 100644
index 00000000000..cb740d7a8a9
--- /dev/null
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.scanner.deprecated;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/BatchPerspectives.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/perspectives/BatchPerspectives.java
index c1966f569e0..1e89551a32f 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/BatchPerspectives.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/perspectives/BatchPerspectives.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.deprecated.perspectives;
+package org.sonar.scanner.deprecated.perspectives;
 
 import com.google.common.collect.Maps;
 import java.util.Map;
@@ -26,8 +26,8 @@ import org.sonar.api.batch.fs.InputPath;
 import org.sonar.api.component.Perspective;
 import org.sonar.api.component.ResourcePerspectives;
 import org.sonar.api.resources.Resource;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.index.DefaultIndex;
+import org.sonar.scanner.index.BatchComponentCache;
+import org.sonar.scanner.index.DefaultIndex;
 
 public class BatchPerspectives implements ResourcePerspectives {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/PerspectiveBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/perspectives/PerspectiveBuilder.java
index f3db5fb259f..fd1632b9172 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/PerspectiveBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/perspectives/PerspectiveBuilder.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.deprecated.perspectives;
+package org.sonar.scanner.deprecated.perspectives;
 
 import javax.annotation.CheckForNull;
 import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.component.Perspective;
-import org.sonar.batch.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponent;
 
 @ScannerSide
 public abstract class PerspectiveBuilder<T extends Perspective> {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/PerspectiveNotFoundException.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/perspectives/PerspectiveNotFoundException.java
index 76dcaf532eb..7a9c296f16f 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/PerspectiveNotFoundException.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/perspectives/PerspectiveNotFoundException.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.deprecated.perspectives;
+package org.sonar.scanner.deprecated.perspectives;
 
 public class PerspectiveNotFoundException extends RuntimeException {
   public PerspectiveNotFoundException(String message) {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/perspectives/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/perspectives/package-info.java
new file mode 100644
index 00000000000..e600cdb3f2b
--- /dev/null
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/perspectives/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.scanner.deprecated.perspectives;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/events/BatchEvent.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/events/BatchEvent.java
index f168bb4cd7e..7ba2791d2ac 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/events/BatchEvent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/events/BatchEvent.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.events;
+package org.sonar.scanner.events;
 
 import org.sonar.api.batch.events.EventHandler;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/events/BatchStepEvent.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/events/BatchStepEvent.java
index cfa628edbf0..f75a643319a 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/events/BatchStepEvent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/events/BatchStepEvent.java
@@ -17,9 +17,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.events;
+package org.sonar.scanner.events;
 
-import org.sonar.batch.phases.AbstractPhaseEvent;
+import org.sonar.scanner.phases.AbstractPhaseEvent;
 
 /**
  * Generic event for some steps of project scan.
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/events/BatchStepHandler.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/events/BatchStepHandler.java
index 9d2cc5e54ba..c2c437d7369 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/events/BatchStepHandler.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/events/BatchStepHandler.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.events;
+package org.sonar.scanner.events;
 
 import org.sonar.api.batch.events.EventHandler;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/events/EventBus.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/events/EventBus.java
index 4b1629f1444..fbbccc6bf11 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/events/EventBus.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/events/EventBus.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.events;
+package org.sonar.scanner.events;
 
 import com.google.common.collect.Lists;
 import org.sonar.api.batch.events.EventHandler;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/analysis/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/events/package-info.java
index be39545404c..951cb392c05 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/analysis/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/events/package-info.java
@@ -18,6 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.batch.analysis;
+package org.sonar.scanner.events;
 
 import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/BatchComponent.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/index/BatchComponent.java
index 9690c833b1e..bf522d96bdc 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/BatchComponent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/index/BatchComponent.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.index;
+package org.sonar.scanner.index;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/BatchComponentCache.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/index/BatchComponentCache.java
index e858112e8b2..0a2248c9fb5 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/BatchComponentCache.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/index/BatchComponentCache.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.index;
+package org.sonar.scanner.index;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/Bucket.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/index/Bucket.java
index 5fde268c097..72f41198053 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/Bucket.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/index/Bucket.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.index;
+package org.sonar.scanner.index;
 
 import com.google.common.collect.Lists;
 import org.sonar.api.resources.Resource;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/Cache.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/index/Cache.java
index ad194c3aad0..1b6028d41f8 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/Cache.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/index/Cache.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.index;
+package org.sonar.scanner.index;
 
 import com.google.common.collect.Sets;
 import com.persistit.Exchange;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/Caches.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/index/Caches.java
index a16d409bd56..d74acd51147 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/Caches.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/index/Caches.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.index;
+package org.sonar.scanner.index;
 
 import com.google.common.collect.Maps;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/CachesManager.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/index/CachesManager.java
index 33d85c5ed24..95d3aaf5e9a 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/CachesManager.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/index/CachesManager.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.index;
+package org.sonar.scanner.index;
 
 import com.persistit.Persistit;
 import com.persistit.exception.PersistitException;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/DefaultIndex.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/index/DefaultIndex.java
index 488f1714b28..ffad84c3e68 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/DefaultIndex.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/index/DefaultIndex.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.index;
+package org.sonar.scanner.index;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -46,10 +46,10 @@ import org.sonar.api.resources.Project;
 import org.sonar.api.resources.Resource;
 import org.sonar.api.resources.ResourceUtils;
 import org.sonar.api.scan.filesystem.PathResolver;
-import org.sonar.batch.DefaultProjectTree;
-import org.sonar.batch.scan.measure.MeasureCache;
-import org.sonar.batch.sensor.DefaultSensorStorage;
 import org.sonar.core.component.ComponentKeys;
+import org.sonar.scanner.DefaultProjectTree;
+import org.sonar.scanner.scan.measure.MeasureCache;
+import org.sonar.scanner.sensor.DefaultSensorStorage;
 
 public class DefaultIndex {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/index/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/index/package-info.java
new file mode 100644
index 00000000000..225843cf1ff
--- /dev/null
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/index/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.scanner.index;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DefaultFilterableIssue.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/DefaultFilterableIssue.java
index ec890289ac5..b0cc7c3bb0d 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DefaultFilterableIssue.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/DefaultFilterableIssue.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import java.util.Date;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DefaultIssuable.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/DefaultIssuable.java
index 291fb7bb2ee..2a449596484 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DefaultIssuable.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/DefaultIssuable.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import java.util.Collections;
 import java.util.List;
@@ -25,7 +25,7 @@ import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.sensor.issue.internal.DefaultIssue;
 import org.sonar.api.issue.Issuable;
 import org.sonar.api.issue.Issue;
-import org.sonar.batch.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponent;
 
 /**
  * @since 3.6
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DefaultIssueCallback.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/DefaultIssueCallback.java
index 4c6a3b5c1e4..20f628c4216 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DefaultIssueCallback.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/DefaultIssueCallback.java
@@ -17,22 +17,20 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
-
-import org.sonar.batch.issue.tracking.TrackedIssue;
+package org.sonar.scanner.issue;
 
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.rule.RuleKey;
+import org.sonar.batch.bootstrapper.IssueListener;
 import org.sonar.api.batch.rule.Rule;
 import org.sonar.api.batch.rule.Rules;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-
-import org.sonar.batch.repository.user.UserRepositoryLoader;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
 import org.sonar.scanner.protocol.input.ScannerInput.User;
-import org.sonar.batch.bootstrapper.IssueListener;
+import org.sonar.scanner.repository.user.UserRepositoryLoader;
 
 public class DefaultIssueCallback implements IssueCallback {
   private final IssueCache issues;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DefaultIssueFilterChain.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/DefaultIssueFilterChain.java
index 2d9b86ad4a8..270665a3837 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DefaultIssueFilterChain.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/DefaultIssueFilterChain.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import com.google.common.collect.ImmutableList;
 import org.sonar.api.scan.issue.filter.IssueFilter;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DefaultProjectIssues.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/DefaultProjectIssues.java
index be81a1a2a53..aa442f6ecf0 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DefaultProjectIssues.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/DefaultProjectIssues.java
@@ -17,15 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import org.sonar.api.issue.Issue;
 import org.sonar.api.issue.ProjectIssues;
-import org.sonar.batch.issue.tracking.TrackedIssue;
-
+import org.sonar.scanner.issue.tracking.TrackedIssue;
 import javax.annotation.Nullable;
 
 /**
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DeprecatedIssueAdapterForFilter.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/DeprecatedIssueAdapterForFilter.java
index 3a87023b2d1..d52ed3ad19e 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DeprecatedIssueAdapterForFilter.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/DeprecatedIssueAdapterForFilter.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DeprecatedIssueBuilderWrapper.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/DeprecatedIssueBuilderWrapper.java
index 0ebef7b6c73..f2a228efb67 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DeprecatedIssueBuilderWrapper.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/DeprecatedIssueBuilderWrapper.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import com.google.common.base.Preconditions;
 import javax.annotation.Nullable;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DeprecatedIssueFilterChain.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/DeprecatedIssueFilterChain.java
index 83994cfb49d..e3ec5e5517d 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DeprecatedIssueFilterChain.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/DeprecatedIssueFilterChain.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import com.google.common.collect.ImmutableList;
 import org.sonar.api.issue.Issue;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DeprecatedIssueWrapper.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/DeprecatedIssueWrapper.java
index 61e215cc931..da5b9981b62 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/DeprecatedIssueWrapper.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/DeprecatedIssueWrapper.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssuableFactory.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/IssuableFactory.java
index a2c7afc9c59..85177696c53 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssuableFactory.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/IssuableFactory.java
@@ -17,13 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.issue.Issuable;
-import org.sonar.batch.deprecated.perspectives.PerspectiveBuilder;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.sensor.DefaultSensorContext;
+import org.sonar.scanner.deprecated.perspectives.PerspectiveBuilder;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.sensor.DefaultSensorContext;
 
 /**
  * Create the perspective {@link Issuable} on components.
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueCache.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/IssueCache.java
index f7a0b7f5b36..9fb784d1563 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueCache.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/IssueCache.java
@@ -17,14 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
-
-import org.sonar.batch.issue.tracking.TrackedIssue;
+package org.sonar.scanner.issue;
 
 import org.sonar.api.batch.ScannerSide;
-import org.sonar.batch.index.Cache;
-import org.sonar.batch.index.Caches;
-
+import org.sonar.scanner.index.Cache;
+import org.sonar.scanner.index.Caches;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
 import java.util.Collection;
 
 /**
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueCallback.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/IssueCallback.java
index b27b7887045..89655a83188 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueCallback.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/IssueCallback.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 public interface IssueCallback {
   void execute();
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueFilters.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/IssueFilters.java
index 5b233dfbdee..346f3803464 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueFilters.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/IssueFilters.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import org.sonar.api.scan.issue.filter.FilterableIssue;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueTransformer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/IssueTransformer.java
index c6a2644d1ad..2c2a31535c7 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/IssueTransformer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/IssueTransformer.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import com.google.common.base.Preconditions;
 import java.util.ArrayList;
@@ -28,11 +28,11 @@ import javax.annotation.Nullable;
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.issue.Issue;
 import org.sonar.api.rule.RuleKey;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.issue.tracking.SourceHashHolder;
-import org.sonar.batch.issue.tracking.TrackedIssue;
 import org.sonar.core.component.ComponentKeys;
 import org.sonar.core.util.Uuids;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.issue.tracking.SourceHashHolder;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
 import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReport.TextRange;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ModuleIssues.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ModuleIssues.java
index 23fb5820954..3fe3d2ef369 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ModuleIssues.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ModuleIssues.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import com.google.common.base.Strings;
 import org.sonar.api.batch.fs.InputComponent;
@@ -30,12 +30,12 @@ import org.sonar.api.batch.sensor.issue.Issue;
 import org.sonar.api.batch.sensor.issue.Issue.Flow;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.utils.MessageException;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.report.ReportPublisher;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponentCache;
 import org.sonar.scanner.protocol.Constants.Severity;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReport.IssueLocation;
+import org.sonar.scanner.report.ReportPublisher;
 
 /**
  * Initialize the issues raised during scan.
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/TrackedIssueAdapter.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/TrackedIssueAdapter.java
index 5d9d8c3d0a7..d1c0fd55a5e 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/TrackedIssueAdapter.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/TrackedIssueAdapter.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -30,7 +30,7 @@ import org.sonar.api.issue.Issue;
 import org.sonar.api.issue.IssueComment;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.utils.Duration;
-import org.sonar.batch.issue.tracking.TrackedIssue;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
 
 public class TrackedIssueAdapter implements Issue {
   private TrackedIssue issue;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/EnforceIssuesFilter.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/EnforceIssuesFilter.java
index de4920a1f06..e3805cf37d0 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/EnforceIssuesFilter.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/EnforceIssuesFilter.java
@@ -17,16 +17,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore;
+package org.sonar.scanner.issue.ignore;
 
 import org.sonar.api.scan.issue.filter.FilterableIssue;
-
-import org.sonar.batch.issue.ignore.pattern.IssueInclusionPatternInitializer;
-import org.sonar.batch.issue.ignore.pattern.IssuePattern;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.scan.issue.filter.IssueFilter;
 import org.sonar.api.scan.issue.filter.IssueFilterChain;
+import org.sonar.scanner.issue.ignore.pattern.IssueInclusionPatternInitializer;
+import org.sonar.scanner.issue.ignore.pattern.IssuePattern;
 
 public class EnforceIssuesFilter implements IssueFilter {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/IgnoreIssuesFilter.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/IgnoreIssuesFilter.java
index 99a716148c6..bb0b8de5996 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/IgnoreIssuesFilter.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/IgnoreIssuesFilter.java
@@ -17,17 +17,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore;
+package org.sonar.scanner.issue.ignore;
 
 import org.sonar.api.scan.issue.filter.FilterableIssue;
-
-import org.sonar.batch.issue.ignore.pattern.IssueExclusionPatternInitializer;
-import org.sonar.batch.issue.ignore.pattern.IssuePattern;
-import org.sonar.batch.issue.ignore.pattern.PatternMatcher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.scan.issue.filter.IssueFilter;
 import org.sonar.api.scan.issue.filter.IssueFilterChain;
+import org.sonar.scanner.issue.ignore.pattern.IssueExclusionPatternInitializer;
+import org.sonar.scanner.issue.ignore.pattern.IssuePattern;
+import org.sonar.scanner.issue.ignore.pattern.PatternMatcher;
 
 public class IgnoreIssuesFilter implements IssueFilter {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/package-info.java
new file mode 100644
index 00000000000..a960962d8c3
--- /dev/null
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.scanner.issue.ignore;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/AbstractPatternInitializer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/AbstractPatternInitializer.java
index 8144a878c86..1c2064449ae 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/AbstractPatternInitializer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/AbstractPatternInitializer.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore.pattern;
+package org.sonar.scanner.issue.ignore.pattern;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/IssueExclusionPatternInitializer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/IssueExclusionPatternInitializer.java
index 74d80f95186..c1311a03b13 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/IssueExclusionPatternInitializer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/IssueExclusionPatternInitializer.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore.pattern;
+package org.sonar.scanner.issue.ignore.pattern;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/IssueInclusionPatternInitializer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/IssueInclusionPatternInitializer.java
index 9fec33bb952..0fc1cd29d12 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/IssueInclusionPatternInitializer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/IssueInclusionPatternInitializer.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore.pattern;
+package org.sonar.scanner.issue.ignore.pattern;
 
 import com.google.common.collect.Maps;
 import org.sonar.api.config.Settings;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/IssuePattern.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/IssuePattern.java
index 4c4cc0b4715..7518f1af4da 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/IssuePattern.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/IssuePattern.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore.pattern;
+package org.sonar.scanner.issue.ignore.pattern;
 
 import org.sonar.api.scan.issue.filter.FilterableIssue;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/LineRange.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/LineRange.java
index 72d43f5f216..80183709076 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/LineRange.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/LineRange.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore.pattern;
+package org.sonar.scanner.issue.ignore.pattern;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Sets;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/PatternDecoder.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/PatternDecoder.java
index 11dc501cac4..a24e583aca0 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/PatternDecoder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/PatternDecoder.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore.pattern;
+package org.sonar.scanner.issue.ignore.pattern;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/PatternMatcher.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/PatternMatcher.java
index 80b6f716cff..edaac26ca63 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/pattern/PatternMatcher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/PatternMatcher.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore.pattern;
+package org.sonar.scanner.issue.ignore.pattern;
 
 import org.sonar.api.scan.issue.filter.FilterableIssue;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/package-info.java
new file mode 100644
index 00000000000..4d6a00ce8f6
--- /dev/null
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/pattern/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.scanner.issue.ignore.pattern;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsLoader.java
index 8622dc618eb..a45a601cdb0 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsLoader.java
@@ -17,15 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore.scanner;
+package org.sonar.scanner.issue.ignore.scanner;
 
 import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.resources.Project;
-import org.sonar.batch.issue.ignore.pattern.IssueExclusionPatternInitializer;
-import org.sonar.batch.issue.ignore.pattern.IssueInclusionPatternInitializer;
-
+import org.sonar.scanner.issue.ignore.pattern.IssueExclusionPatternInitializer;
+import org.sonar.scanner.issue.ignore.pattern.IssueInclusionPatternInitializer;
 import java.nio.charset.Charset;
 
 public final class IssueExclusionsLoader {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScanner.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScanner.java
index 462fea53575..c031ef90572 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScanner.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScanner.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore.scanner;
+package org.sonar.scanner.issue.ignore.scanner;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
@@ -26,10 +26,9 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.batch.ScannerSide;
-import org.sonar.batch.issue.ignore.pattern.IssueExclusionPatternInitializer;
-import org.sonar.batch.issue.ignore.pattern.IssuePattern;
-import org.sonar.batch.issue.ignore.pattern.LineRange;
-
+import org.sonar.scanner.issue.ignore.pattern.IssueExclusionPatternInitializer;
+import org.sonar.scanner.issue.ignore.pattern.IssuePattern;
+import org.sonar.scanner.issue.ignore.pattern.LineRange;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/scanner/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/scanner/package-info.java
new file mode 100644
index 00000000000..2699a3290ae
--- /dev/null
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/ignore/scanner/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.scanner.issue.ignore.scanner;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/package-info.java
new file mode 100644
index 00000000000..5cd43b1437f
--- /dev/null
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.scanner.issue;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/DefaultServerLineHashesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/DefaultServerLineHashesLoader.java
index ff28b9e8da3..1e2d92c2cc6 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/DefaultServerLineHashesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/DefaultServerLineHashesLoader.java
@@ -17,10 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.tracking;
+package org.sonar.scanner.issue.tracking;
 
-import org.sonar.batch.bootstrap.BatchWsClient;
-import org.sonar.batch.util.BatchUtils;
 import org.sonarqube.ws.client.GetRequest;
 
 import java.io.IOException;
@@ -31,6 +29,8 @@ import com.google.common.collect.Iterators;
 import org.apache.commons.io.IOUtils;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.api.utils.log.Profiler;
+import org.sonar.scanner.bootstrap.BatchWsClient;
+import org.sonar.scanner.util.BatchUtils;
 
 public class DefaultServerLineHashesLoader implements ServerLineHashesLoader {
   private BatchWsClient wsClient;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/FileHashes.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/FileHashes.java
index 3284b5a681b..c65081e5f44 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/FileHashes.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/FileHashes.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.tracking;
+package org.sonar.scanner.issue.tracking;
 
 import org.sonar.api.batch.fs.internal.FileMetadata;
 import org.sonar.api.batch.fs.internal.FileMetadata.LineHashConsumer;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/IssueTrackingInput.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/IssueTrackingInput.java
index 031396b54d7..9dbea05fa34 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/IssueTrackingInput.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/IssueTrackingInput.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.tracking;
+package org.sonar.scanner.issue.tracking;
 
 import org.sonar.core.issue.tracking.Trackable;
 import org.sonar.core.issue.tracking.BlockHashSequence;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/IssueTransition.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/IssueTransition.java
index 0b398f59cee..9c3da91e702 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/IssueTransition.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/IssueTransition.java
@@ -17,19 +17,19 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.tracking;
+package org.sonar.scanner.issue.tracking;
 
-import org.sonar.batch.util.ProgressReport;
-import org.sonar.batch.issue.IssueTransformer;
 import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.resources.Project;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.issue.IssueCache;
-import org.sonar.batch.report.ReportPublisher;
 import org.sonar.core.util.CloseableIterator;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponentCache;
+import org.sonar.scanner.issue.IssueCache;
+import org.sonar.scanner.issue.IssueTransformer;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReportReader;
+import org.sonar.scanner.report.ReportPublisher;
+import org.sonar.scanner.util.ProgressReport;
 import javax.annotation.Nullable;
 
 import java.util.ArrayList;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/LocalIssueTracking.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/LocalIssueTracking.java
index 56ac7eabe92..b0183caa188 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/LocalIssueTracking.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/LocalIssueTracking.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.tracking;
+package org.sonar.scanner.issue.tracking;
 
 import com.google.common.annotations.VisibleForTesting;
 import java.util.ArrayList;
@@ -35,14 +35,14 @@ import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.batch.rule.ActiveRule;
 import org.sonar.api.batch.rule.ActiveRules;
 import org.sonar.api.resources.ResourceUtils;
-import org.sonar.batch.analysis.DefaultAnalysisMode;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.issue.IssueTransformer;
-import org.sonar.batch.repository.ProjectRepositories;
 import org.sonar.core.issue.tracking.Input;
 import org.sonar.core.issue.tracking.Tracker;
 import org.sonar.core.issue.tracking.Tracking;
+import org.sonar.scanner.analysis.DefaultAnalysisMode;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.issue.IssueTransformer;
 import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.repository.ProjectRepositories;
 
 @ScannerSide
 public class LocalIssueTracking {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/RollingFileHashes.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/RollingFileHashes.java
index aaf2ba7bdf5..4388e2cb9a3 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/RollingFileHashes.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/RollingFileHashes.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.tracking;
+package org.sonar.scanner.issue.tracking;
 
 /**
  * Compute hashes of block around each line
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerIssueFromWs.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/ServerIssueFromWs.java
index 03937e63028..7d44d337ed9 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerIssueFromWs.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/ServerIssueFromWs.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.tracking;
+package org.sonar.scanner.issue.tracking;
 
 import javax.annotation.CheckForNull;
 import org.sonar.api.rule.RuleKey;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerIssueRepository.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/ServerIssueRepository.java
index 7106de46e02..9c3fefbd5ac 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerIssueRepository.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/ServerIssueRepository.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.tracking;
+package org.sonar.scanner.issue.tracking;
 
 import com.google.common.base.Function;
 import javax.annotation.Nullable;
@@ -26,14 +26,14 @@ import org.sonar.api.batch.InstantiationStrategy;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.api.utils.log.Profiler;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.index.Cache;
-import org.sonar.batch.index.Caches;
-import org.sonar.batch.repository.ServerIssuesLoader;
-import org.sonar.batch.scan.ImmutableProjectReactor;
 import org.sonar.core.component.ComponentKeys;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponentCache;
+import org.sonar.scanner.index.Cache;
+import org.sonar.scanner.index.Caches;
 import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
+import org.sonar.scanner.repository.ServerIssuesLoader;
+import org.sonar.scanner.scan.ImmutableProjectReactor;
 
 @InstantiationStrategy(InstantiationStrategy.PER_BATCH)
 @ScannerSide
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerIssueValueCoder.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/ServerIssueValueCoder.java
index 44876e4761c..c055c4ed2e2 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerIssueValueCoder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/ServerIssueValueCoder.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.tracking;
+package org.sonar.scanner.issue.tracking;
 
 import com.persistit.Value;
 import com.persistit.encoding.CoderContext;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerLineHashesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/ServerLineHashesLoader.java
index a09064b80b7..d77f36c65ec 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/ServerLineHashesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/ServerLineHashesLoader.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.tracking;
+package org.sonar.scanner.issue.tracking;
 
 import org.sonar.api.batch.ScannerSide;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/SourceHashHolder.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/SourceHashHolder.java
index dac686f27ea..1a6c04912b7 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/SourceHashHolder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/SourceHashHolder.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.tracking;
+package org.sonar.scanner.issue.tracking;
 
 import com.google.common.collect.ImmutableSet;
 import org.sonar.api.batch.fs.InputFile.Status;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/TrackedIssue.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/TrackedIssue.java
index 093db671f35..b530b5ae093 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/tracking/TrackedIssue.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/TrackedIssue.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.tracking;
+package org.sonar.scanner.issue.tracking;
 
 import com.google.common.base.Preconditions;
 import java.io.Serializable;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/package-info.java
new file mode 100644
index 00000000000..5ff5637da13
--- /dev/null
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.scanner.issue.tracking;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/FakePluginInstaller.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/mediumtest/FakePluginInstaller.java
index 561d7271768..6fdb948df38 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/FakePluginInstaller.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/mediumtest/FakePluginInstaller.java
@@ -17,14 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest;
+package org.sonar.scanner.mediumtest;
 
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 import org.sonar.api.Plugin;
-import org.sonar.batch.bootstrap.PluginInstaller;
 import org.sonar.core.platform.PluginInfo;
+import org.sonar.scanner.bootstrap.PluginInstaller;
 
 public class FakePluginInstaller implements PluginInstaller {
   public static final String MEDIUM_TEST_ENABLED = "sonar.mediumTest.enabled";
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/ScanTaskObserver.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/mediumtest/ScanTaskObserver.java
index bd07b1cee7a..02881a66caa 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/ScanTaskObserver.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/mediumtest/ScanTaskObserver.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest;
+package org.sonar.scanner.mediumtest;
 
 import org.sonar.api.batch.ScannerSide;
+import org.sonar.scanner.scan.ProjectScanContainer;
 import org.sonar.api.ExtensionPoint;
-import org.sonar.batch.scan.ProjectScanContainer;
 
 @ScannerSide
 @ExtensionPoint
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/ScanTaskObservers.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/mediumtest/ScanTaskObservers.java
index 90e092cad77..8a017e07f80 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/ScanTaskObservers.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/mediumtest/ScanTaskObservers.java
@@ -17,9 +17,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest;
+package org.sonar.scanner.mediumtest;
 
-import org.sonar.batch.scan.ProjectScanContainer;
+import org.sonar.scanner.scan.ProjectScanContainer;
 
 public class ScanTaskObservers {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/TaskResult.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/mediumtest/TaskResult.java
index 8d10ad0b202..e15e7030e1b 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/mediumtest/TaskResult.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/mediumtest/TaskResult.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest;
+package org.sonar.scanner.mediumtest;
 
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
@@ -40,22 +40,22 @@ import org.sonar.api.batch.fs.TextPointer;
 import org.sonar.api.batch.fs.TextRange;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.batch.sensor.highlighting.TypeOfText;
-import org.sonar.batch.issue.IssueCache;
-import org.sonar.batch.issue.tracking.TrackedIssue;
-import org.sonar.batch.report.ReportPublisher;
-import org.sonar.batch.report.ScannerReportUtils;
-import org.sonar.batch.scan.ProjectScanContainer;
-import org.sonar.batch.scan.filesystem.InputPathCache;
 import org.sonar.core.util.CloseableIterator;
+import org.sonar.scanner.issue.IssueCache;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReport.Component;
 import org.sonar.scanner.protocol.output.ScannerReport.Metadata;
 import org.sonar.scanner.protocol.output.ScannerReport.Symbol;
+import org.sonar.scanner.report.ReportPublisher;
+import org.sonar.scanner.report.ScannerReportUtils;
+import org.sonar.scanner.scan.ProjectScanContainer;
+import org.sonar.scanner.scan.filesystem.InputPathCache;
 import org.sonar.scanner.protocol.output.ScannerReportReader;
 
 import static org.apache.commons.lang.StringUtils.isNotEmpty;
 
-public class TaskResult implements org.sonar.batch.mediumtest.ScanTaskObserver {
+public class TaskResult implements org.sonar.scanner.mediumtest.ScanTaskObserver {
 
   private static final Logger LOG = LoggerFactory.getLogger(TaskResult.class);
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/mediumtest/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/mediumtest/package-info.java
new file mode 100644
index 00000000000..55b4cb4eff6
--- /dev/null
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/mediumtest/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.scanner.mediumtest;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/package-info.java
index 408dd9f93a6..d6d832f4f51 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/package-info.java
@@ -18,6 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.batch;
+package org.sonar.scanner;
 
 import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/AbstractPhaseEvent.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/AbstractPhaseEvent.java
index df8bc690534..e8ebfa1f18d 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/AbstractPhaseEvent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/AbstractPhaseEvent.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.phases;
+package org.sonar.scanner.phases;
 
 import org.sonar.api.batch.events.EventHandler;
-import org.sonar.batch.events.BatchEvent;
+import org.sonar.scanner.events.BatchEvent;
 
 public abstract class AbstractPhaseEvent<H extends EventHandler> extends BatchEvent<H> {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/AbstractPhaseExecutor.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/AbstractPhaseExecutor.java
index d3265de0aac..3174c667682 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/AbstractPhaseExecutor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/AbstractPhaseExecutor.java
@@ -17,17 +17,17 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.phases;
+package org.sonar.scanner.phases;
 
 import org.sonar.api.batch.SensorContext;
 import org.sonar.api.resources.Project;
-import org.sonar.batch.events.BatchStepEvent;
-import org.sonar.batch.events.EventBus;
-import org.sonar.batch.index.DefaultIndex;
-import org.sonar.batch.issue.ignore.scanner.IssueExclusionsLoader;
-import org.sonar.batch.rule.QProfileVerifier;
-import org.sonar.batch.scan.filesystem.DefaultModuleFileSystem;
-import org.sonar.batch.scan.filesystem.FileSystemLogger;
+import org.sonar.scanner.events.BatchStepEvent;
+import org.sonar.scanner.events.EventBus;
+import org.sonar.scanner.index.DefaultIndex;
+import org.sonar.scanner.issue.ignore.scanner.IssueExclusionsLoader;
+import org.sonar.scanner.rule.QProfileVerifier;
+import org.sonar.scanner.scan.filesystem.DefaultModuleFileSystem;
+import org.sonar.scanner.scan.filesystem.FileSystemLogger;
 
 public abstract class AbstractPhaseExecutor {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/InitializerExecutionEvent.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/InitializerExecutionEvent.java
index 9a8bdc92706..1f7b4bbd067 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/InitializerExecutionEvent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/InitializerExecutionEvent.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.phases;
+package org.sonar.scanner.phases;
 
 import org.sonar.api.batch.Initializer;
 import org.sonar.api.batch.events.InitializerExecutionHandler;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/InitializersExecutor.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/InitializersExecutor.java
index 591969ea1b0..e2b5bc6fdac 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/InitializersExecutor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/InitializersExecutor.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.phases;
+package org.sonar.scanner.phases;
 
 import com.google.common.collect.Lists;
 import org.apache.commons.lang.StringUtils;
@@ -26,9 +26,8 @@ import org.sonar.api.resources.Project;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.api.utils.log.Profiler;
-import org.sonar.batch.bootstrap.BatchExtensionDictionnary;
-import org.sonar.batch.events.EventBus;
-
+import org.sonar.scanner.bootstrap.BatchExtensionDictionnary;
+import org.sonar.scanner.events.EventBus;
 import java.util.Collection;
 
 public class InitializersExecutor {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/InitializersPhaseEvent.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/InitializersPhaseEvent.java
index 5e109625da6..6a45a4d67e5 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/InitializersPhaseEvent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/InitializersPhaseEvent.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.phases;
+package org.sonar.scanner.phases;
 
 import org.sonar.api.batch.Initializer;
 import org.sonar.api.batch.events.InitializersPhaseHandler;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/IssuesPhaseExecutor.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/IssuesPhaseExecutor.java
index 5d8a658e52f..ff4943453cb 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/IssuesPhaseExecutor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/IssuesPhaseExecutor.java
@@ -17,21 +17,21 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.phases;
+package org.sonar.scanner.phases;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.batch.SensorContext;
-import org.sonar.batch.events.BatchStepEvent;
-import org.sonar.batch.events.EventBus;
-import org.sonar.batch.index.DefaultIndex;
-import org.sonar.batch.issue.IssueCallback;
-import org.sonar.batch.issue.ignore.scanner.IssueExclusionsLoader;
-import org.sonar.batch.issue.tracking.IssueTransition;
-import org.sonar.batch.rule.QProfileVerifier;
-import org.sonar.batch.scan.filesystem.DefaultModuleFileSystem;
-import org.sonar.batch.scan.filesystem.FileSystemLogger;
-import org.sonar.batch.scan.report.IssuesReports;
+import org.sonar.scanner.events.BatchStepEvent;
+import org.sonar.scanner.events.EventBus;
+import org.sonar.scanner.index.DefaultIndex;
+import org.sonar.scanner.issue.IssueCallback;
+import org.sonar.scanner.issue.ignore.scanner.IssueExclusionsLoader;
+import org.sonar.scanner.issue.tracking.IssueTransition;
+import org.sonar.scanner.rule.QProfileVerifier;
+import org.sonar.scanner.scan.filesystem.DefaultModuleFileSystem;
+import org.sonar.scanner.scan.filesystem.FileSystemLogger;
+import org.sonar.scanner.scan.report.IssuesReports;
 
 public final class IssuesPhaseExecutor extends AbstractPhaseExecutor {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PhasesTimeProfiler.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/PhasesTimeProfiler.java
index ba8c7c498d0..a9783251372 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PhasesTimeProfiler.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/PhasesTimeProfiler.java
@@ -17,16 +17,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.phases;
+package org.sonar.scanner.phases;
 
 
-import org.sonar.batch.util.BatchUtils;
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.batch.events.SensorExecutionHandler;
 import org.sonar.api.batch.events.SensorsPhaseHandler;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.api.utils.log.Profiler;
+import org.sonar.scanner.util.BatchUtils;
 
 public class PhasesTimeProfiler implements SensorExecutionHandler, SensorsPhaseHandler {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PostJobExecutionEvent.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/PostJobExecutionEvent.java
index b7cd92a217b..3c519326f06 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PostJobExecutionEvent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/PostJobExecutionEvent.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.phases;
+package org.sonar.scanner.phases;
 
 import org.sonar.api.batch.PostJob;
 import org.sonar.api.batch.events.PostJobExecutionHandler;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PostJobPhaseEvent.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/PostJobPhaseEvent.java
index 860d7cc938d..f3cfae99ae3 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PostJobPhaseEvent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/PostJobPhaseEvent.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.phases;
+package org.sonar.scanner.phases;
 
 import org.sonar.api.batch.PostJob;
 import org.sonar.api.batch.events.PostJobsPhaseHandler;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PostJobsExecutor.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/PostJobsExecutor.java
index dbca5779152..0d25e5884c2 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PostJobsExecutor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/PostJobsExecutor.java
@@ -17,9 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.phases;
-
-import org.sonar.batch.util.BatchUtils;
+package org.sonar.scanner.phases;
 
 import com.google.common.collect.Lists;
 import org.apache.commons.lang.StringUtils;
@@ -29,9 +27,9 @@ import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.PostJob;
 import org.sonar.api.batch.SensorContext;
 import org.sonar.api.resources.Project;
-import org.sonar.batch.bootstrap.BatchExtensionDictionnary;
-import org.sonar.batch.events.EventBus;
-
+import org.sonar.scanner.bootstrap.BatchExtensionDictionnary;
+import org.sonar.scanner.events.EventBus;
+import org.sonar.scanner.util.BatchUtils;
 import java.util.Collection;
 
 @ScannerSide
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/ProjectAnalysisEvent.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/ProjectAnalysisEvent.java
index 428774acd82..feb427679ed 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/ProjectAnalysisEvent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/ProjectAnalysisEvent.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.phases;
+package org.sonar.scanner.phases;
 
 import org.sonar.api.batch.events.ProjectAnalysisHandler;
 import org.sonar.api.resources.Project;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PublishPhaseExecutor.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/PublishPhaseExecutor.java
index 98741b5aaf9..7c3434af247 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/PublishPhaseExecutor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/PublishPhaseExecutor.java
@@ -17,18 +17,18 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.phases;
+package org.sonar.scanner.phases;
 
 import org.sonar.api.batch.SensorContext;
-import org.sonar.batch.cpd.CpdExecutor;
-import org.sonar.batch.events.BatchStepEvent;
-import org.sonar.batch.events.EventBus;
-import org.sonar.batch.index.DefaultIndex;
-import org.sonar.batch.issue.ignore.scanner.IssueExclusionsLoader;
-import org.sonar.batch.report.ReportPublisher;
-import org.sonar.batch.rule.QProfileVerifier;
-import org.sonar.batch.scan.filesystem.DefaultModuleFileSystem;
-import org.sonar.batch.scan.filesystem.FileSystemLogger;
+import org.sonar.scanner.cpd.CpdExecutor;
+import org.sonar.scanner.events.BatchStepEvent;
+import org.sonar.scanner.events.EventBus;
+import org.sonar.scanner.index.DefaultIndex;
+import org.sonar.scanner.issue.ignore.scanner.IssueExclusionsLoader;
+import org.sonar.scanner.report.ReportPublisher;
+import org.sonar.scanner.rule.QProfileVerifier;
+import org.sonar.scanner.scan.filesystem.DefaultModuleFileSystem;
+import org.sonar.scanner.scan.filesystem.FileSystemLogger;
 
 public final class PublishPhaseExecutor extends AbstractPhaseExecutor {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/SensorExecutionEvent.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/SensorExecutionEvent.java
index 22cbd25aadb..ebb1aeed3c1 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/SensorExecutionEvent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/SensorExecutionEvent.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.phases;
+package org.sonar.scanner.phases;
 
 import org.sonar.api.batch.Sensor;
 import org.sonar.api.batch.events.SensorExecutionHandler;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/SensorsExecutor.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/SensorsExecutor.java
index d5682e02743..5953f4d5613 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/SensorsExecutor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/SensorsExecutor.java
@@ -17,16 +17,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.phases;
+package org.sonar.scanner.phases;
 
 import com.google.common.collect.Lists;
 import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.Sensor;
 import org.sonar.api.batch.SensorContext;
 import org.sonar.api.resources.Project;
-import org.sonar.batch.bootstrap.BatchExtensionDictionnary;
-import org.sonar.batch.events.EventBus;
-
+import org.sonar.scanner.bootstrap.BatchExtensionDictionnary;
+import org.sonar.scanner.events.EventBus;
 import java.util.Collection;
 
 @ScannerSide
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/SensorsPhaseEvent.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/SensorsPhaseEvent.java
index a1f658efa1e..ef15643b7f1 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/phases/SensorsPhaseEvent.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/SensorsPhaseEvent.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.phases;
+package org.sonar.scanner.phases;
 
 import org.sonar.api.batch.Sensor;
 import org.sonar.api.batch.events.SensorsPhaseHandler;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/package-info.java
new file mode 100644
index 00000000000..b7bf0efa63e
--- /dev/null
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.scanner.phases;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/platform/DefaultServer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/platform/DefaultServer.java
index 0243846664e..fc28bec5598 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/platform/DefaultServer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/platform/DefaultServer.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.platform;
+package org.sonar.scanner.platform;
 
 import java.io.File;
 import java.text.ParseException;
@@ -30,7 +30,7 @@ import org.sonar.api.CoreProperties;
 import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.config.Settings;
 import org.sonar.api.platform.Server;
-import org.sonar.batch.bootstrap.BatchWsClient;
+import org.sonar.scanner.bootstrap.BatchWsClient;
 
 import static org.apache.commons.lang.StringUtils.trimToEmpty;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/platform/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/platform/package-info.java
index cb2793702b0..67271b3b714 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/platform/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/platform/package-info.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.batch.platform;
+package org.sonar.scanner.platform;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/postjob/DefaultPostJobContext.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/postjob/DefaultPostJobContext.java
index 1e66067fded..ee2c3d64238 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/postjob/DefaultPostJobContext.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/postjob/DefaultPostJobContext.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.postjob;
+package org.sonar.scanner.postjob;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
@@ -30,10 +30,10 @@ import org.sonar.api.batch.postjob.issue.PostJobIssue;
 import org.sonar.api.batch.rule.Severity;
 import org.sonar.api.config.Settings;
 import org.sonar.api.rule.RuleKey;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.issue.IssueCache;
-import org.sonar.batch.issue.tracking.TrackedIssue;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponentCache;
+import org.sonar.scanner.issue.IssueCache;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
 
 public class DefaultPostJobContext implements PostJobContext {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/postjob/PostJobOptimizer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/postjob/PostJobOptimizer.java
index 8aedf095fc9..6456830e616 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/postjob/PostJobOptimizer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/postjob/PostJobOptimizer.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.postjob;
+package org.sonar.scanner.postjob;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/postjob/PostJobWrapper.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/postjob/PostJobWrapper.java
index c5ba661637c..1dba9ab675b 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/postjob/PostJobWrapper.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/postjob/PostJobWrapper.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.postjob;
+package org.sonar.scanner.postjob;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/postjob/package-info.java
index 4c9f457a97f..883fa0345fd 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/postjob/package-info.java
@@ -18,4 +18,4 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @javax.annotation.ParametersAreNonnullByDefault
-package org.sonar.batch.sensor;
+package org.sonar.scanner.postjob;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/AbstractTimeProfiling.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/profiling/AbstractTimeProfiling.java
index 6e204596616..17527ab1959 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/AbstractTimeProfiling.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/profiling/AbstractTimeProfiling.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.profiling;
+package org.sonar.scanner.profiling;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/ItemProfiling.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/profiling/ItemProfiling.java
index abbb11ccbcb..395892a96e2 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/ItemProfiling.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/profiling/ItemProfiling.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.profiling;
+package org.sonar.scanner.profiling;
 
 import org.sonar.api.utils.System2;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/ModuleProfiling.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/profiling/ModuleProfiling.java
index c31e190226e..e7465a6f0e2 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/ModuleProfiling.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/profiling/ModuleProfiling.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.profiling;
+package org.sonar.scanner.profiling;
 
 import com.google.common.collect.Maps;
 import java.util.EnumMap;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/Phase.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/profiling/Phase.java
index e43b5da6f75..198fe9459a4 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/Phase.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/profiling/Phase.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.profiling;
+package org.sonar.scanner.profiling;
 
 public enum Phase {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/PhaseProfiling.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/profiling/PhaseProfiling.java
index 5b13f1d4ee1..f56b3d237f6 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/PhaseProfiling.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/profiling/PhaseProfiling.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.profiling;
+package org.sonar.scanner.profiling;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/PhasesSumUpTimeProfiler.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/profiling/PhasesSumUpTimeProfiler.java
index f03b84caaac..5ecfbbbfd37 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/profiling/PhasesSumUpTimeProfiler.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/profiling/PhasesSumUpTimeProfiler.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.profiling;
+package org.sonar.scanner.profiling;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
@@ -46,12 +46,12 @@ import org.sonar.api.batch.events.SensorsPhaseHandler;
 import org.sonar.api.resources.Project;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.TimeUtils;
-import org.sonar.batch.bootstrap.GlobalProperties;
-import org.sonar.batch.events.BatchStepHandler;
-import org.sonar.batch.util.BatchUtils;
+import org.sonar.scanner.bootstrap.GlobalProperties;
+import org.sonar.scanner.events.BatchStepHandler;
+import org.sonar.scanner.util.BatchUtils;
 
-import static org.sonar.batch.profiling.AbstractTimeProfiling.sortByDescendingTotalTime;
-import static org.sonar.batch.profiling.AbstractTimeProfiling.truncate;
+import static org.sonar.scanner.profiling.AbstractTimeProfiling.sortByDescendingTotalTime;
+import static org.sonar.scanner.profiling.AbstractTimeProfiling.truncate;
 
 public class PhasesSumUpTimeProfiler implements ProjectAnalysisHandler, SensorExecutionHandler, DecoratorExecutionHandler, PostJobExecutionHandler, DecoratorsPhaseHandler,
   SensorsPhaseHandler, PostJobsPhaseHandler, InitializersPhaseHandler, InitializerExecutionHandler, BatchStepHandler {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/profiling/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/profiling/package-info.java
new file mode 100644
index 00000000000..89814710428
--- /dev/null
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/profiling/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.scanner.profiling;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ActiveRulesPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ActiveRulesPublisher.java
index 571d709971f..d2fbf437618 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ActiveRulesPublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ActiveRulesPublisher.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.report;
+package org.sonar.scanner.report;
 
 import com.google.common.base.Function;
 import com.google.common.collect.FluentIterable;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/AnalysisContextReportPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/AnalysisContextReportPublisher.java
index 5d739cf56cf..65c483c535b 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/AnalysisContextReportPublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/AnalysisContextReportPublisher.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.report;
+package org.sonar.scanner.report;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -36,11 +36,11 @@ import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.batch.bootstrap.BatchPluginRepository;
-import org.sonar.batch.repository.ProjectRepositories;
 import org.sonar.core.platform.PluginInfo;
+import org.sonar.scanner.bootstrap.BatchPluginRepository;
 import org.sonar.scanner.protocol.input.GlobalRepositories;
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
+import org.sonar.scanner.repository.ProjectRepositories;
 
 @ScannerSide
 public class AnalysisContextReportPublisher {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ComponentsPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ComponentsPublisher.java
index 2e6a25d791a..2631c37d452 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ComponentsPublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ComponentsPublisher.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.report;
+package org.sonar.scanner.report;
 
 import javax.annotation.CheckForNull;
 import org.apache.commons.lang.StringUtils;
@@ -27,13 +27,13 @@ import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.resources.Language;
 import org.sonar.api.resources.Resource;
 import org.sonar.api.resources.ResourceUtils;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.scan.ImmutableProjectReactor;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponentCache;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType;
 import org.sonar.scanner.protocol.output.ScannerReport.ComponentLink;
 import org.sonar.scanner.protocol.output.ScannerReport.ComponentLink.ComponentLinkType;
+import org.sonar.scanner.scan.ImmutableProjectReactor;
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
 /**
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/CoveragePublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/CoveragePublisher.java
index 1ed96d1ceb7..49f12b154c8 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/CoveragePublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/CoveragePublisher.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.report;
+package org.sonar.scanner.report;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
@@ -29,11 +29,11 @@ import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.Measure;
 import org.sonar.api.utils.KeyValueFormat;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.scan.measure.MeasureCache;
 import org.sonar.scanner.protocol.output.ScannerReport.LineCoverage;
 import org.sonar.scanner.protocol.output.ScannerReport.LineCoverage.Builder;
+import org.sonar.scanner.scan.measure.MeasureCache;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponentCache;
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
 public class CoveragePublisher implements ReportPublisherStep {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/MeasuresPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/MeasuresPublisher.java
index c0b03533d6f..74e2d43c0ff 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/MeasuresPublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/MeasuresPublisher.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.report;
+package org.sonar.scanner.report;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
@@ -26,16 +26,16 @@ import java.util.Set;
 import javax.annotation.Nonnull;
 import org.sonar.api.batch.measure.Metric;
 import org.sonar.api.measures.Measure;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.scan.measure.MeasureCache;
 import org.sonar.core.metric.ScannerMetrics;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponentCache;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReport.Measure.BoolValue;
 import org.sonar.scanner.protocol.output.ScannerReport.Measure.DoubleValue;
 import org.sonar.scanner.protocol.output.ScannerReport.Measure.IntValue;
 import org.sonar.scanner.protocol.output.ScannerReport.Measure.LongValue;
 import org.sonar.scanner.protocol.output.ScannerReport.Measure.StringValue;
+import org.sonar.scanner.scan.measure.MeasureCache;
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
 import static com.google.common.collect.Iterables.filter;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/MetadataPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/MetadataPublisher.java
index 6a6f275a480..cb341a96a3b 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/MetadataPublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/MetadataPublisher.java
@@ -17,19 +17,19 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.report;
+package org.sonar.scanner.report;
 
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.config.Settings;
 import org.sonar.api.resources.Project;
-import org.sonar.batch.cpd.index.SonarCpdBlockIndex;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.rule.ModuleQProfiles;
-import org.sonar.batch.rule.QProfile;
-import org.sonar.batch.scan.ImmutableProjectReactor;
+import org.sonar.scanner.cpd.index.SonarCpdBlockIndex;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponentCache;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
+import org.sonar.scanner.rule.ModuleQProfiles;
+import org.sonar.scanner.rule.QProfile;
+import org.sonar.scanner.scan.ImmutableProjectReactor;
 
 public class MetadataPublisher implements ReportPublisherStep {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ReportPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java
index 7775deccabb..f5f22cd911e 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ReportPublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.report;
+package org.sonar.scanner.report;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
@@ -43,10 +43,10 @@ import org.sonar.api.utils.TempFolder;
 import org.sonar.api.utils.ZipUtils;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.batch.analysis.DefaultAnalysisMode;
-import org.sonar.batch.bootstrap.BatchWsClient;
-import org.sonar.batch.scan.ImmutableProjectReactor;
+import org.sonar.scanner.analysis.DefaultAnalysisMode;
+import org.sonar.scanner.bootstrap.BatchWsClient;
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
+import org.sonar.scanner.scan.ImmutableProjectReactor;
 import org.sonarqube.ws.MediaTypes;
 import org.sonarqube.ws.WsCe;
 import org.sonarqube.ws.client.PostRequest;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ReportPublisherStep.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisherStep.java
index 8edcacb4b48..a1f7221ce6d 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ReportPublisherStep.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisherStep.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.report;
+package org.sonar.scanner.report;
 
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ScannerReportUtils.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ScannerReportUtils.java
index 020ac34ab4e..e30595c3cab 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/ScannerReportUtils.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ScannerReportUtils.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.report;
+package org.sonar.scanner.report;
 
 import org.sonar.api.batch.sensor.highlighting.TypeOfText;
 import org.sonar.scanner.protocol.output.ScannerReport.SyntaxHighlightingRule.HighlightingType;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/SourcePublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/SourcePublisher.java
index b6b5a1d1745..7c569227b14 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/SourcePublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/SourcePublisher.java
@@ -17,14 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.report;
+package org.sonar.scanner.report;
 
 import org.apache.commons.io.ByteOrderMark;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.input.BOMInputStream;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.index.BatchComponentCache;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponentCache;
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/TestExecutionAndCoveragePublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/TestExecutionAndCoveragePublisher.java
index b047337928a..c920a34f0fe 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/report/TestExecutionAndCoveragePublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/TestExecutionAndCoveragePublisher.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.report;
+package org.sonar.scanner.report;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
@@ -30,14 +30,14 @@ import org.sonar.api.test.CoverageBlock;
 import org.sonar.api.test.MutableTestCase;
 import org.sonar.api.test.MutableTestPlan;
 import org.sonar.api.test.TestCase;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.test.DefaultTestable;
-import org.sonar.batch.test.TestPlanBuilder;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponentCache;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReport.CoverageDetail;
 import org.sonar.scanner.protocol.output.ScannerReport.Test;
 import org.sonar.scanner.protocol.output.ScannerReport.Test.TestStatus;
+import org.sonar.scanner.test.DefaultTestable;
+import org.sonar.scanner.test.TestPlanBuilder;
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
 public class TestExecutionAndCoveragePublisher implements ReportPublisherStep {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/package-info.java
new file mode 100644
index 00000000000..5cdc2bd8fd4
--- /dev/null
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.scanner.report;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/DefaultGlobalRepositoriesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/DefaultGlobalRepositoriesLoader.java
index 6ccce5e2c25..d7140372d45 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/DefaultGlobalRepositoriesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/DefaultGlobalRepositoriesLoader.java
@@ -17,12 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository;
+package org.sonar.scanner.repository;
 
+import org.sonar.scanner.bootstrap.BatchWsClient;
 import org.sonar.scanner.protocol.input.GlobalRepositories;
 import org.sonarqube.ws.client.GetRequest;
-import org.sonar.batch.bootstrap.BatchWsClient;
-
 import java.io.IOException;
 import java.io.Reader;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/DefaultProjectRepositoriesLoader.java
index 878d11ee04f..5a9283dbac1 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/DefaultProjectRepositoriesLoader.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository;
+package org.sonar.scanner.repository;
 
 import com.google.common.base.Throwables;
 
@@ -34,8 +34,8 @@ import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.utils.MessageException;
-import org.sonar.batch.bootstrap.BatchWsClient;
-import org.sonar.batch.util.BatchUtils;
+import org.sonar.scanner.bootstrap.BatchWsClient;
+import org.sonar.scanner.util.BatchUtils;
 import org.sonarqube.ws.WsBatch.WsProjectResponse;
 import org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath;
 import org.sonarqube.ws.WsBatch.WsProjectResponse.Settings;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/DefaultQualityProfileLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/DefaultQualityProfileLoader.java
index 6d3766b1c3b..6ed05d2a7bc 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/DefaultQualityProfileLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/DefaultQualityProfileLoader.java
@@ -17,17 +17,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository;
+package org.sonar.scanner.repository;
 
 import org.sonar.api.utils.MessageException;
-
+import org.sonar.scanner.bootstrap.BatchWsClient;
+import org.sonar.scanner.util.BatchUtils;
 import org.sonarqube.ws.QualityProfiles.SearchWsResponse;
-import org.sonar.batch.util.BatchUtils;
 import org.apache.commons.io.IOUtils;
 import org.sonarqube.ws.QualityProfiles.SearchWsResponse.QualityProfile;
 import org.sonarqube.ws.client.GetRequest;
-import org.sonar.batch.bootstrap.BatchWsClient;
-
 import javax.annotation.Nullable;
 
 import java.io.IOException;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/DefaultServerIssuesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/DefaultServerIssuesLoader.java
index f5f4406fab5..00015cee70a 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/DefaultServerIssuesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/DefaultServerIssuesLoader.java
@@ -17,15 +17,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository;
+package org.sonar.scanner.repository;
 
 import com.google.common.base.Function;
 import java.io.IOException;
 import java.io.InputStream;
 import org.apache.commons.io.IOUtils;
-import org.sonar.batch.bootstrap.BatchWsClient;
-import org.sonar.batch.util.BatchUtils;
+import org.sonar.scanner.bootstrap.BatchWsClient;
 import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
+import org.sonar.scanner.util.BatchUtils;
 import org.sonarqube.ws.client.GetRequest;
 
 public class DefaultServerIssuesLoader implements ServerIssuesLoader {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/FileData.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/FileData.java
index bcf470e8986..b3f545eb39b 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/FileData.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/FileData.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository;
+package org.sonar.scanner.repository;
 
 import javax.annotation.concurrent.Immutable;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/GlobalRepositoriesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/GlobalRepositoriesLoader.java
index cf8b435eee7..9e5050eaa55 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/GlobalRepositoriesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/GlobalRepositoriesLoader.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository;
+package org.sonar.scanner.repository;
 
 import org.sonar.scanner.protocol.input.GlobalRepositories;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/GlobalRepositoriesProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/GlobalRepositoriesProvider.java
index e28d952671b..1d3b9bf55cd 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/GlobalRepositoriesProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/GlobalRepositoriesProvider.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository;
+package org.sonar.scanner.repository;
 
 import org.picocontainer.injectors.ProviderAdapter;
 import org.sonar.api.utils.log.Logger;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/ProjectRepositories.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/ProjectRepositories.java
index baba0c52396..b6c418e9150 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/ProjectRepositories.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/ProjectRepositories.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository;
+package org.sonar.scanner.repository;
 
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Table;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/ProjectRepositoriesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/ProjectRepositoriesLoader.java
index f689d3664df..77c7e205200 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/ProjectRepositoriesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/ProjectRepositoriesLoader.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository;
+package org.sonar.scanner.repository;
 
 
 public interface ProjectRepositoriesLoader {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/ProjectRepositoriesProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/ProjectRepositoriesProvider.java
index f5b17549f46..764afb358f6 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/ProjectRepositoriesProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/ProjectRepositoriesProvider.java
@@ -17,15 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository;
+package org.sonar.scanner.repository;
 
 import org.sonar.api.utils.log.Profiler;
-
+import org.sonar.scanner.analysis.DefaultAnalysisMode;
 import org.sonar.api.batch.bootstrap.ProjectKey;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-
-import org.sonar.batch.analysis.DefaultAnalysisMode;
 import org.picocontainer.injectors.ProviderAdapter;
 
 public class ProjectRepositoriesProvider extends ProviderAdapter {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/QualityProfileLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/QualityProfileLoader.java
index 45d492b1347..1619a47d877 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/QualityProfileLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/QualityProfileLoader.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository;
+package org.sonar.scanner.repository;
 
 import org.sonarqube.ws.QualityProfiles.SearchWsResponse.QualityProfile;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/QualityProfileProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/QualityProfileProvider.java
index 0b62b406a41..f24a6e688b3 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/QualityProfileProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/QualityProfileProvider.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository;
+package org.sonar.scanner.repository;
 
 import java.util.List;
 import javax.annotation.CheckForNull;
@@ -26,9 +26,9 @@ import org.sonar.api.batch.bootstrap.ProjectKey;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.api.utils.log.Profiler;
-import org.sonar.batch.analysis.AnalysisProperties;
-import org.sonar.batch.analysis.DefaultAnalysisMode;
-import org.sonar.batch.rule.ModuleQProfiles;
+import org.sonar.scanner.analysis.AnalysisProperties;
+import org.sonar.scanner.analysis.DefaultAnalysisMode;
+import org.sonar.scanner.rule.ModuleQProfiles;
 import org.sonarqube.ws.QualityProfiles.SearchWsResponse.QualityProfile;
 
 public class QualityProfileProvider extends ProviderAdapter {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/ServerIssuesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/ServerIssuesLoader.java
index 171323b347d..9d88cc7ff04 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/ServerIssuesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/ServerIssuesLoader.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository;
+package org.sonar.scanner.repository;
 
 import com.google.common.base.Function;
 import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/language/DefaultLanguagesRepository.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/language/DefaultLanguagesRepository.java
index 4f891e64f3d..c370eb74bc9 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/language/DefaultLanguagesRepository.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/language/DefaultLanguagesRepository.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository.language;
+package org.sonar.scanner.repository.language;
 
 import org.picocontainer.Startable;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/language/Language.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/language/Language.java
index 1a9ae783536..e0aca6dd8f2 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/language/Language.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/language/Language.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository.language;
+package org.sonar.scanner.repository.language;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/language/LanguagesRepository.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/language/LanguagesRepository.java
index 732b6705087..2646c7ff4e0 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/language/LanguagesRepository.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/language/LanguagesRepository.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository.language;
+package org.sonar.scanner.repository.language;
 
 import org.sonar.api.batch.ScannerSide;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/language/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/language/package-info.java
index 03b2bf5f676..1522227ed7c 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/language/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/language/package-info.java
@@ -18,4 +18,4 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @javax.annotation.ParametersAreNonnullByDefault
-package org.sonar.batch.repository.language;
+package org.sonar.scanner.repository.language;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/package-info.java
new file mode 100644
index 00000000000..e44c0332c7f
--- /dev/null
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.scanner.repository;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/user/UserRepositoryLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/user/UserRepositoryLoader.java
index f4aa2072911..acf5d8c7d95 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/repository/user/UserRepositoryLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/user/UserRepositoryLoader.java
@@ -17,16 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository.user;
+package org.sonar.scanner.repository.user;
 
 import org.apache.commons.io.IOUtils;
-
-import org.sonar.batch.bootstrap.BatchWsClient;
-
 import com.google.common.collect.Lists;
 import com.google.common.base.Joiner;
-import org.sonar.batch.util.BatchUtils;
+import org.sonar.scanner.bootstrap.BatchWsClient;
 import org.sonar.scanner.protocol.input.ScannerInput;
+import org.sonar.scanner.util.BatchUtils;
 import org.sonarqube.ws.client.GetRequest;
 import com.google.common.base.Function;
 import java.io.IOException;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/user/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/user/package-info.java
new file mode 100644
index 00000000000..6743be4de83
--- /dev/null
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/repository/user/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.scanner.repository.user;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/ActiveRulesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/ActiveRulesLoader.java
index cc7d7e12371..a6e7a67a961 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/ActiveRulesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/ActiveRulesLoader.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.rule;
+package org.sonar.scanner.rule;
 
 import java.util.List;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/ActiveRulesProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/ActiveRulesProvider.java
index 14814b9de0c..42df46a0a3d 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/ActiveRulesProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/ActiveRulesProvider.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.rule;
+package org.sonar.scanner.rule;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/DefaultActiveRulesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/DefaultActiveRulesLoader.java
index 0a6e7951782..acff8ed90a1 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/DefaultActiveRulesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/DefaultActiveRulesLoader.java
@@ -17,9 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.rule;
-
-import org.sonar.batch.util.BatchUtils;
+package org.sonar.scanner.rule;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -30,7 +28,8 @@ import java.util.Map;
 
 import org.apache.commons.io.IOUtils;
 import org.sonar.api.rule.RuleKey;
-import org.sonar.batch.bootstrap.BatchWsClient;
+import org.sonar.scanner.bootstrap.BatchWsClient;
+import org.sonar.scanner.util.BatchUtils;
 import org.sonarqube.ws.Rules.Active;
 import org.sonarqube.ws.Rules.Active.Param;
 import org.sonarqube.ws.client.GetRequest;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/DefaultRulesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/DefaultRulesLoader.java
index 9921af66c8b..ff310de154b 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/DefaultRulesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/DefaultRulesLoader.java
@@ -17,11 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.rule;
+package org.sonar.scanner.rule;
 
 import org.apache.commons.io.IOUtils;
-
-import org.sonar.batch.bootstrap.BatchWsClient;
+import org.sonar.scanner.bootstrap.BatchWsClient;
 import org.sonarqube.ws.Rules.ListResponse.Rule;
 import org.sonarqube.ws.client.GetRequest;
 import org.sonarqube.ws.Rules.ListResponse;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/LoadedActiveRule.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/LoadedActiveRule.java
index 31e5919220f..72ec6f5f266 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/LoadedActiveRule.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/LoadedActiveRule.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.rule;
+package org.sonar.scanner.rule;
 
 import java.util.Map;
 import javax.annotation.CheckForNull;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/ModuleQProfiles.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/ModuleQProfiles.java
index 29763f4edc0..e777a1643a8 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/ModuleQProfiles.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/ModuleQProfiles.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.rule;
+package org.sonar.scanner.rule;
 
 import org.sonar.api.utils.DateUtils;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/QProfile.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/QProfile.java
index a0fce1c9c6b..62bdbd620e2 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/QProfile.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/QProfile.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.rule;
+package org.sonar.scanner.rule;
 
 import com.google.common.base.MoreObjects;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/QProfileVerifier.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/QProfileVerifier.java
index f37fcd0adac..42537768da3 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/QProfileVerifier.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/QProfileVerifier.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.rule;
+package org.sonar.scanner.rule;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.apache.commons.lang.StringUtils;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/RuleFinderCompatibility.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/RuleFinderCompatibility.java
index 93b55d7da01..a1689c5dc6e 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/RuleFinderCompatibility.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/RuleFinderCompatibility.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.rule;
+package org.sonar.scanner.rule;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/RulesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/RulesLoader.java
index 1c4c8df4db2..279cae11d3d 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/RulesLoader.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/RulesLoader.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.rule;
+package org.sonar.scanner.rule;
 
 import java.util.List;
 import org.sonarqube.ws.Rules.ListResponse.Rule;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/RulesProfileProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/RulesProfileProvider.java
index a1c1f1c2dda..d96888bbe34 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/RulesProfileProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/RulesProfileProvider.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.rule;
+package org.sonar.scanner.rule;
 
 import com.google.common.collect.Lists;
 import java.util.Collection;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/RulesProfileWrapper.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/RulesProfileWrapper.java
index 327c141ea34..d71448d21cc 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/RulesProfileWrapper.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/RulesProfileWrapper.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.rule;
+package org.sonar.scanner.rule;
 
 import com.google.common.collect.Lists;
 import org.slf4j.Logger;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/RulesProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/RulesProvider.java
index fcc71194a70..20554c62d8a 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/rule/RulesProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/RulesProvider.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.rule;
+package org.sonar.scanner.rule;
 
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/events/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/package-info.java
index 922fe861be7..be66d9cb43d 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/events/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/package-info.java
@@ -18,6 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.batch.events;
+package org.sonar.scanner.rule;
 
 import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ImmutableProjectReactor.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ImmutableProjectReactor.java
index 8d070a34254..1e843596500 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ImmutableProjectReactor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ImmutableProjectReactor.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
 import java.util.Collection;
 import java.util.LinkedHashMap;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ImmutableProjectReactorProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ImmutableProjectReactorProvider.java
index 3a90eb145ae..384fed3d19e 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ImmutableProjectReactorProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ImmutableProjectReactorProvider.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
 import org.picocontainer.injectors.ProviderAdapter;
 import org.sonar.api.batch.bootstrap.ProjectReactor;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/LanguageVerifier.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/LanguageVerifier.java
index 83e27324e64..55f9f1f6780 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/LanguageVerifier.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/LanguageVerifier.java
@@ -17,10 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
-import org.sonar.batch.repository.language.Language;
-import org.sonar.batch.repository.language.LanguagesRepository;
 import org.apache.commons.lang.StringUtils;
 import org.picocontainer.Startable;
 import org.slf4j.Logger;
@@ -29,6 +27,8 @@ import org.sonar.api.CoreProperties;
 import org.sonar.api.batch.fs.internal.DefaultFileSystem;
 import org.sonar.api.config.Settings;
 import org.sonar.api.utils.MessageException;
+import org.sonar.scanner.repository.language.Language;
+import org.sonar.scanner.repository.language.LanguagesRepository;
 
 /**
  * Verifies that the property sonar.language is valid
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ModuleScanContainer.java
index bca62d8b8f3..d89d897c9e2 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ModuleScanContainer.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,55 +28,55 @@ import org.sonar.api.batch.fs.internal.FileMetadata;
 import org.sonar.api.batch.rule.CheckFactory;
 import org.sonar.api.resources.Project;
 import org.sonar.api.scan.filesystem.FileExclusions;
-import org.sonar.batch.DefaultFileLinesContextFactory;
-import org.sonar.batch.DefaultProjectTree;
-import org.sonar.batch.bootstrap.BatchExtensionDictionnary;
-import org.sonar.batch.bootstrap.ExtensionInstaller;
-import org.sonar.batch.bootstrap.ExtensionMatcher;
-import org.sonar.batch.bootstrap.ExtensionUtils;
-import org.sonar.batch.deprecated.DeprecatedSensorContext;
-import org.sonar.batch.deprecated.perspectives.BatchPerspectives;
-import org.sonar.batch.events.EventBus;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.index.DefaultIndex;
-import org.sonar.batch.issue.IssuableFactory;
-import org.sonar.batch.issue.IssueFilters;
-import org.sonar.batch.issue.ModuleIssues;
-import org.sonar.batch.issue.ignore.EnforceIssuesFilter;
-import org.sonar.batch.issue.ignore.IgnoreIssuesFilter;
-import org.sonar.batch.issue.ignore.pattern.IssueExclusionPatternInitializer;
-import org.sonar.batch.issue.ignore.pattern.IssueInclusionPatternInitializer;
-import org.sonar.batch.issue.ignore.scanner.IssueExclusionsLoader;
-import org.sonar.batch.issue.ignore.scanner.IssueExclusionsRegexpScanner;
-import org.sonar.batch.phases.AbstractPhaseExecutor;
-import org.sonar.batch.phases.InitializersExecutor;
-import org.sonar.batch.phases.IssuesPhaseExecutor;
-import org.sonar.batch.phases.PostJobsExecutor;
-import org.sonar.batch.phases.PublishPhaseExecutor;
-import org.sonar.batch.phases.SensorsExecutor;
-import org.sonar.batch.postjob.DefaultPostJobContext;
-import org.sonar.batch.postjob.PostJobOptimizer;
-import org.sonar.batch.rule.QProfileVerifier;
-import org.sonar.batch.rule.RuleFinderCompatibility;
-import org.sonar.batch.rule.RulesProfileProvider;
-import org.sonar.batch.scan.filesystem.ComponentIndexer;
-import org.sonar.batch.scan.filesystem.DefaultModuleFileSystem;
-import org.sonar.batch.scan.filesystem.DeprecatedFileFilters;
-import org.sonar.batch.scan.filesystem.ExclusionFilters;
-import org.sonar.batch.scan.filesystem.FileIndexer;
-import org.sonar.batch.scan.filesystem.FileSystemLogger;
-import org.sonar.batch.scan.filesystem.InputFileBuilderFactory;
-import org.sonar.batch.scan.filesystem.LanguageDetectionFactory;
-import org.sonar.batch.scan.filesystem.ModuleFileSystemInitializer;
-import org.sonar.batch.scan.filesystem.ModuleInputFileCache;
-import org.sonar.batch.scan.filesystem.StatusDetectionFactory;
-import org.sonar.batch.scan.report.IssuesReports;
-import org.sonar.batch.sensor.DefaultSensorStorage;
-import org.sonar.batch.sensor.SensorOptimizer;
-import org.sonar.batch.sensor.coverage.CoverageExclusions;
-import org.sonar.batch.source.HighlightableBuilder;
-import org.sonar.batch.source.SymbolizableBuilder;
 import org.sonar.core.platform.ComponentContainer;
+import org.sonar.scanner.DefaultFileLinesContextFactory;
+import org.sonar.scanner.DefaultProjectTree;
+import org.sonar.scanner.bootstrap.BatchExtensionDictionnary;
+import org.sonar.scanner.bootstrap.ExtensionInstaller;
+import org.sonar.scanner.bootstrap.ExtensionMatcher;
+import org.sonar.scanner.bootstrap.ExtensionUtils;
+import org.sonar.scanner.deprecated.DeprecatedSensorContext;
+import org.sonar.scanner.deprecated.perspectives.BatchPerspectives;
+import org.sonar.scanner.events.EventBus;
+import org.sonar.scanner.index.BatchComponentCache;
+import org.sonar.scanner.index.DefaultIndex;
+import org.sonar.scanner.issue.IssuableFactory;
+import org.sonar.scanner.issue.IssueFilters;
+import org.sonar.scanner.issue.ModuleIssues;
+import org.sonar.scanner.issue.ignore.EnforceIssuesFilter;
+import org.sonar.scanner.issue.ignore.IgnoreIssuesFilter;
+import org.sonar.scanner.issue.ignore.pattern.IssueExclusionPatternInitializer;
+import org.sonar.scanner.issue.ignore.pattern.IssueInclusionPatternInitializer;
+import org.sonar.scanner.issue.ignore.scanner.IssueExclusionsLoader;
+import org.sonar.scanner.issue.ignore.scanner.IssueExclusionsRegexpScanner;
+import org.sonar.scanner.phases.AbstractPhaseExecutor;
+import org.sonar.scanner.phases.InitializersExecutor;
+import org.sonar.scanner.phases.IssuesPhaseExecutor;
+import org.sonar.scanner.phases.PostJobsExecutor;
+import org.sonar.scanner.phases.PublishPhaseExecutor;
+import org.sonar.scanner.phases.SensorsExecutor;
+import org.sonar.scanner.postjob.DefaultPostJobContext;
+import org.sonar.scanner.postjob.PostJobOptimizer;
+import org.sonar.scanner.rule.QProfileVerifier;
+import org.sonar.scanner.rule.RuleFinderCompatibility;
+import org.sonar.scanner.rule.RulesProfileProvider;
+import org.sonar.scanner.scan.filesystem.ComponentIndexer;
+import org.sonar.scanner.scan.filesystem.DefaultModuleFileSystem;
+import org.sonar.scanner.scan.filesystem.DeprecatedFileFilters;
+import org.sonar.scanner.scan.filesystem.ExclusionFilters;
+import org.sonar.scanner.scan.filesystem.FileIndexer;
+import org.sonar.scanner.scan.filesystem.FileSystemLogger;
+import org.sonar.scanner.scan.filesystem.InputFileBuilderFactory;
+import org.sonar.scanner.scan.filesystem.LanguageDetectionFactory;
+import org.sonar.scanner.scan.filesystem.ModuleFileSystemInitializer;
+import org.sonar.scanner.scan.filesystem.ModuleInputFileCache;
+import org.sonar.scanner.scan.filesystem.StatusDetectionFactory;
+import org.sonar.scanner.scan.report.IssuesReports;
+import org.sonar.scanner.sensor.DefaultSensorStorage;
+import org.sonar.scanner.sensor.SensorOptimizer;
+import org.sonar.scanner.sensor.coverage.CoverageExclusions;
+import org.sonar.scanner.source.HighlightableBuilder;
+import org.sonar.scanner.source.SymbolizableBuilder;
 
 public class ModuleScanContainer extends ComponentContainer {
   private static final Logger LOG = LoggerFactory.getLogger(ModuleScanContainer.class);
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ModuleSettings.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ModuleSettings.java
index 8000ab0474b..59bbd4472bc 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ModuleSettings.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ModuleSettings.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
 import com.google.common.collect.Lists;
 import java.util.List;
@@ -25,10 +25,10 @@ import org.sonar.api.CoreProperties;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.config.Settings;
 import org.sonar.api.utils.MessageException;
-import org.sonar.batch.analysis.DefaultAnalysisMode;
-import org.sonar.batch.bootstrap.GlobalSettings;
-import org.sonar.batch.report.AnalysisContextReportPublisher;
-import org.sonar.batch.repository.ProjectRepositories;
+import org.sonar.scanner.analysis.DefaultAnalysisMode;
+import org.sonar.scanner.bootstrap.GlobalSettings;
+import org.sonar.scanner.report.AnalysisContextReportPublisher;
+import org.sonar.scanner.repository.ProjectRepositories;
 
 /**
  * @since 2.12
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/MutableProjectReactorProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/MutableProjectReactorProvider.java
index afde1e18c4d..19bf755efc8 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/MutableProjectReactorProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/MutableProjectReactorProvider.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
 import org.picocontainer.injectors.ProviderAdapter;
 import org.sonar.api.batch.bootstrap.ProjectReactor;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectBuildersExecutor.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectBuildersExecutor.java
index 505a80bc117..b0165b6f0b3 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectBuildersExecutor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectBuildersExecutor.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
 import org.sonar.api.batch.bootstrap.ProjectBuilder;
 import org.sonar.api.batch.bootstrap.ProjectReactor;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectLock.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectLock.java
index d52f49cfd88..757886ddc94 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectLock.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectLock.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
-import org.sonar.batch.bootstrap.Slf4jLogger;
 import org.sonar.home.cache.DirectoryLock;
+import org.sonar.scanner.bootstrap.Slf4jLogger;
 import org.picocontainer.Startable;
 import org.sonar.api.batch.bootstrap.ProjectReactor;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectReactorBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectReactorBuilder.java
index 44bc53afed5..1f6738d716f 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectReactorBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectReactorBuilder.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
@@ -44,9 +44,9 @@ import org.sonar.api.utils.MessageException;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.api.utils.log.Profiler;
-import org.sonar.batch.analysis.AnalysisProperties;
-import org.sonar.batch.bootstrap.DroppedPropertyChecker;
-import org.sonar.batch.util.BatchUtils;
+import org.sonar.scanner.analysis.AnalysisProperties;
+import org.sonar.scanner.bootstrap.DroppedPropertyChecker;
+import org.sonar.scanner.util.BatchUtils;
 
 /**
  * Class that creates a project definition based on a set of properties.
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectReactorValidator.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectReactorValidator.java
index 7e36ab54958..2fe6d00c459 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectReactorValidator.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectReactorValidator.java
@@ -17,11 +17,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
 import org.sonar.api.utils.MessageException;
-
-import org.sonar.batch.analysis.DefaultAnalysisMode;
 import com.google.common.base.Joiner;
 
 import java.util.ArrayList;
@@ -34,6 +32,7 @@ import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.batch.bootstrap.ProjectReactor;
 import org.sonar.api.config.Settings;
 import org.sonar.core.component.ComponentKeys;
+import org.sonar.scanner.analysis.DefaultAnalysisMode;
 
 /**
  * This class aims at validating project reactor
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectScanContainer.java
index f91461fa86b..65a6ff8dada 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectScanContainer.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.sonar.api.CoreProperties;
@@ -29,67 +29,67 @@ import org.sonar.api.resources.ResourceTypes;
 import org.sonar.api.scan.filesystem.PathResolver;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.batch.DefaultProjectTree;
-import org.sonar.batch.ProjectConfigurator;
-import org.sonar.batch.analysis.AnalysisProperties;
-import org.sonar.batch.analysis.AnalysisTempFolderProvider;
-import org.sonar.batch.analysis.DefaultAnalysisMode;
-import org.sonar.batch.bootstrap.ExtensionInstaller;
-import org.sonar.batch.bootstrap.ExtensionMatcher;
-import org.sonar.batch.bootstrap.ExtensionUtils;
-import org.sonar.batch.bootstrap.MetricProvider;
-import org.sonar.batch.cpd.CpdExecutor;
-import org.sonar.batch.cpd.index.SonarCpdBlockIndex;
-import org.sonar.batch.events.EventBus;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.index.Caches;
-import org.sonar.batch.index.DefaultIndex;
-import org.sonar.batch.issue.DefaultIssueCallback;
-import org.sonar.batch.issue.DefaultProjectIssues;
-import org.sonar.batch.issue.IssueCache;
-import org.sonar.batch.issue.tracking.DefaultServerLineHashesLoader;
-import org.sonar.batch.issue.tracking.IssueTransition;
-import org.sonar.batch.issue.tracking.LocalIssueTracking;
-import org.sonar.batch.issue.tracking.ServerIssueRepository;
-import org.sonar.batch.issue.tracking.ServerLineHashesLoader;
-import org.sonar.batch.mediumtest.ScanTaskObservers;
-import org.sonar.batch.phases.PhasesTimeProfiler;
-import org.sonar.batch.profiling.PhasesSumUpTimeProfiler;
-import org.sonar.batch.report.ActiveRulesPublisher;
-import org.sonar.batch.report.AnalysisContextReportPublisher;
-import org.sonar.batch.report.ComponentsPublisher;
-import org.sonar.batch.report.CoveragePublisher;
-import org.sonar.batch.report.MeasuresPublisher;
-import org.sonar.batch.report.MetadataPublisher;
-import org.sonar.batch.report.ReportPublisher;
-import org.sonar.batch.report.SourcePublisher;
-import org.sonar.batch.report.TestExecutionAndCoveragePublisher;
-import org.sonar.batch.repository.DefaultProjectRepositoriesLoader;
-import org.sonar.batch.repository.DefaultQualityProfileLoader;
-import org.sonar.batch.repository.DefaultServerIssuesLoader;
-import org.sonar.batch.repository.ProjectRepositories;
-import org.sonar.batch.repository.ProjectRepositoriesLoader;
-import org.sonar.batch.repository.ProjectRepositoriesProvider;
-import org.sonar.batch.repository.QualityProfileLoader;
-import org.sonar.batch.repository.QualityProfileProvider;
-import org.sonar.batch.repository.ServerIssuesLoader;
-import org.sonar.batch.repository.language.DefaultLanguagesRepository;
-import org.sonar.batch.repository.user.UserRepositoryLoader;
-import org.sonar.batch.rule.ActiveRulesLoader;
-import org.sonar.batch.rule.ActiveRulesProvider;
-import org.sonar.batch.rule.DefaultActiveRulesLoader;
-import org.sonar.batch.rule.DefaultRulesLoader;
-import org.sonar.batch.rule.RulesLoader;
-import org.sonar.batch.rule.RulesProvider;
-import org.sonar.batch.scan.filesystem.InputPathCache;
-import org.sonar.batch.scan.measure.DefaultMetricFinder;
-import org.sonar.batch.scan.measure.DeprecatedMetricFinder;
-import org.sonar.batch.scan.measure.MeasureCache;
-import org.sonar.batch.source.CodeColorizers;
-import org.sonar.batch.test.TestPlanBuilder;
-import org.sonar.batch.test.TestableBuilder;
 import org.sonar.core.metric.ScannerMetrics;
 import org.sonar.core.platform.ComponentContainer;
+import org.sonar.scanner.DefaultProjectTree;
+import org.sonar.scanner.ProjectConfigurator;
+import org.sonar.scanner.analysis.AnalysisProperties;
+import org.sonar.scanner.analysis.AnalysisTempFolderProvider;
+import org.sonar.scanner.analysis.DefaultAnalysisMode;
+import org.sonar.scanner.bootstrap.ExtensionInstaller;
+import org.sonar.scanner.bootstrap.ExtensionMatcher;
+import org.sonar.scanner.bootstrap.ExtensionUtils;
+import org.sonar.scanner.bootstrap.MetricProvider;
+import org.sonar.scanner.cpd.CpdExecutor;
+import org.sonar.scanner.cpd.index.SonarCpdBlockIndex;
+import org.sonar.scanner.events.EventBus;
+import org.sonar.scanner.index.BatchComponentCache;
+import org.sonar.scanner.index.Caches;
+import org.sonar.scanner.index.DefaultIndex;
+import org.sonar.scanner.issue.DefaultIssueCallback;
+import org.sonar.scanner.issue.DefaultProjectIssues;
+import org.sonar.scanner.issue.IssueCache;
+import org.sonar.scanner.issue.tracking.DefaultServerLineHashesLoader;
+import org.sonar.scanner.issue.tracking.IssueTransition;
+import org.sonar.scanner.issue.tracking.LocalIssueTracking;
+import org.sonar.scanner.issue.tracking.ServerIssueRepository;
+import org.sonar.scanner.issue.tracking.ServerLineHashesLoader;
+import org.sonar.scanner.mediumtest.ScanTaskObservers;
+import org.sonar.scanner.phases.PhasesTimeProfiler;
+import org.sonar.scanner.profiling.PhasesSumUpTimeProfiler;
+import org.sonar.scanner.report.ActiveRulesPublisher;
+import org.sonar.scanner.report.AnalysisContextReportPublisher;
+import org.sonar.scanner.report.ComponentsPublisher;
+import org.sonar.scanner.report.CoveragePublisher;
+import org.sonar.scanner.report.MeasuresPublisher;
+import org.sonar.scanner.report.MetadataPublisher;
+import org.sonar.scanner.report.ReportPublisher;
+import org.sonar.scanner.report.SourcePublisher;
+import org.sonar.scanner.report.TestExecutionAndCoveragePublisher;
+import org.sonar.scanner.repository.DefaultProjectRepositoriesLoader;
+import org.sonar.scanner.repository.DefaultQualityProfileLoader;
+import org.sonar.scanner.repository.DefaultServerIssuesLoader;
+import org.sonar.scanner.repository.ProjectRepositories;
+import org.sonar.scanner.repository.ProjectRepositoriesLoader;
+import org.sonar.scanner.repository.ProjectRepositoriesProvider;
+import org.sonar.scanner.repository.QualityProfileLoader;
+import org.sonar.scanner.repository.QualityProfileProvider;
+import org.sonar.scanner.repository.ServerIssuesLoader;
+import org.sonar.scanner.repository.language.DefaultLanguagesRepository;
+import org.sonar.scanner.repository.user.UserRepositoryLoader;
+import org.sonar.scanner.rule.ActiveRulesLoader;
+import org.sonar.scanner.rule.ActiveRulesProvider;
+import org.sonar.scanner.rule.DefaultActiveRulesLoader;
+import org.sonar.scanner.rule.DefaultRulesLoader;
+import org.sonar.scanner.rule.RulesLoader;
+import org.sonar.scanner.rule.RulesProvider;
+import org.sonar.scanner.scan.filesystem.InputPathCache;
+import org.sonar.scanner.scan.measure.DefaultMetricFinder;
+import org.sonar.scanner.scan.measure.DeprecatedMetricFinder;
+import org.sonar.scanner.scan.measure.MeasureCache;
+import org.sonar.scanner.source.CodeColorizers;
+import org.sonar.scanner.test.TestPlanBuilder;
+import org.sonar.scanner.test.TestableBuilder;
 
 public class ProjectScanContainer extends ComponentContainer {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectSettings.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectSettings.java
index 382d02424a3..c4784114b8b 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/ProjectSettings.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectSettings.java
@@ -17,16 +17,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
 import org.sonar.api.CoreProperties;
 import org.sonar.api.batch.bootstrap.ProjectReactor;
 import org.sonar.api.config.PropertyDefinitions;
 import org.sonar.api.config.Settings;
 import org.sonar.api.utils.MessageException;
-import org.sonar.batch.analysis.DefaultAnalysisMode;
-import org.sonar.batch.bootstrap.GlobalSettings;
-import org.sonar.batch.repository.ProjectRepositories;
+import org.sonar.scanner.analysis.DefaultAnalysisMode;
+import org.sonar.scanner.bootstrap.GlobalSettings;
+import org.sonar.scanner.repository.ProjectRepositories;
 
 public class ProjectSettings extends Settings {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/WorkDirectoryCleaner.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/WorkDirectoryCleaner.java
index b4857bf6afb..c2d14632cfa 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/WorkDirectoryCleaner.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/WorkDirectoryCleaner.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
 import org.sonar.api.batch.bootstrap.ProjectReactor;
 import org.sonar.core.util.FileUtils;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/AdditionalFilePredicates.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/AdditionalFilePredicates.java
index b68b6a3625a..77e1bc39827 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/AdditionalFilePredicates.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/AdditionalFilePredicates.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.AbstractFilePredicate;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ComponentIndexer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/ComponentIndexer.java
index 05718cf2c03..4c28ad63ab9 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ComponentIndexer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/ComponentIndexer.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.fs.InputDir;
@@ -26,9 +26,9 @@ import org.sonar.api.resources.File;
 import org.sonar.api.resources.Languages;
 import org.sonar.api.resources.Project;
 import org.sonar.api.resources.Resource;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.index.DefaultIndex;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponentCache;
+import org.sonar.scanner.index.DefaultIndex;
 
 /**
  * Index all files/directories of the module in SQ database and importing source code.
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystem.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/DefaultModuleFileSystem.java
index bf1eedc2206..cc1fa238669 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystem.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/DefaultModuleFileSystem.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
@@ -43,7 +43,7 @@ import org.sonar.api.resources.Project;
 import org.sonar.api.scan.filesystem.FileQuery;
 import org.sonar.api.scan.filesystem.ModuleFileSystem;
 import org.sonar.api.utils.MessageException;
-import org.sonar.batch.analysis.DefaultAnalysisMode;
+import org.sonar.scanner.analysis.DefaultAnalysisMode;
 
 /**
  * @since 3.5
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/DeprecatedFileFilters.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/DeprecatedFileFilters.java
index 29968e7e102..b32ecb5d98a 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/DeprecatedFileFilters.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/DeprecatedFileFilters.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.InputFileFilter;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ExclusionFilters.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/ExclusionFilters.java
index 4a82d9fb933..030e61062ff 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ExclusionFilters.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/ExclusionFilters.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import org.apache.commons.lang.ArrayUtils;
 import org.slf4j.Logger;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/FileIndexer.java
index 21cb362a7ad..8b21817ae2d 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/FileIndexer.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.slf4j.Logger;
@@ -31,8 +31,7 @@ import org.sonar.api.batch.fs.internal.DefaultInputDir;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.scan.filesystem.PathResolver;
 import org.sonar.api.utils.MessageException;
-import org.sonar.batch.util.ProgressReport;
-
+import org.sonar.scanner.util.ProgressReport;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.FileSystemLoopException;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/FileSystemLogger.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/FileSystemLogger.java
index 765465971f6..2bebaa7fd29 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/FileSystemLogger.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/FileSystemLogger.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import com.google.common.annotations.VisibleForTesting;
 import java.io.File;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/InputFileBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/InputFileBuilder.java
index 49cbd423cf9..dd85cecf887 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/InputFileBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/InputFileBuilder.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/InputFileBuilderFactory.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/InputFileBuilderFactory.java
index 42eed0e4653..310484591ab 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/InputFileBuilderFactory.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/InputFileBuilderFactory.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/InputPathCache.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/InputPathCache.java
index 4797b24e922..2aff151cdc9 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/InputPathCache.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/InputPathCache.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import com.google.common.collect.Table;
 import com.google.common.collect.TreeBasedTable;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/LanguageDetection.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/LanguageDetection.java
index db1300e2a97..f17a593add9 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/LanguageDetection.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/LanguageDetection.java
@@ -17,10 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
-
-import org.sonar.batch.repository.language.Language;
-import org.sonar.batch.repository.language.LanguagesRepository;
+package org.sonar.scanner.scan.filesystem;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
@@ -33,7 +30,8 @@ import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.PathPattern;
 import org.sonar.api.config.Settings;
 import org.sonar.api.utils.MessageException;
-
+import org.sonar.scanner.repository.language.Language;
+import org.sonar.scanner.repository.language.LanguagesRepository;
 import javax.annotation.CheckForNull;
 
 import java.text.MessageFormat;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/LanguageDetectionFactory.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/LanguageDetectionFactory.java
index 0503497663d..91e389dbaed 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/LanguageDetectionFactory.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/LanguageDetectionFactory.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.config.Settings;
-import org.sonar.batch.repository.language.LanguagesRepository;
+import org.sonar.scanner.repository.language.LanguagesRepository;
 
 @ScannerSide
 public class LanguageDetectionFactory {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/ModuleFileSystemInitializer.java
index 0e34f8f93df..c6629174ef3 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/ModuleFileSystemInitializer.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import com.google.common.collect.Lists;
 import org.apache.commons.io.FileUtils;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ModuleInputFileCache.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/ModuleInputFileCache.java
index 0788e4fff27..4f421964ca7 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/ModuleInputFileCache.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/ModuleInputFileCache.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/StatusDetection.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/StatusDetection.java
index bd63a81dfe2..e6159df541b 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/StatusDetection.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/StatusDetection.java
@@ -17,13 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
-import org.sonar.batch.repository.FileData;
-
-import org.sonar.batch.repository.ProjectRepositories;
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.batch.fs.InputFile;
+import org.sonar.scanner.repository.FileData;
+import org.sonar.scanner.repository.ProjectRepositories;
 
 class StatusDetection {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/StatusDetectionFactory.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/StatusDetectionFactory.java
index 419611095ef..a6b5ba25598 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/StatusDetectionFactory.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/StatusDetectionFactory.java
@@ -17,11 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
-
-import org.sonar.batch.repository.ProjectRepositories;
+package org.sonar.scanner.scan.filesystem;
 
 import org.sonar.api.batch.ScannerSide;
+import org.sonar.scanner.repository.ProjectRepositories;
 
 @ScannerSide
 public class StatusDetectionFactory {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/package-info.java
index d5f662e81ea..bd301dff5e7 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/filesystem/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/package-info.java
@@ -21,6 +21,6 @@
  * This package is a part of bootstrap process, so we should take care about backward compatibility.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/DefaultMetricFinder.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/measure/DefaultMetricFinder.java
index f31d562bc08..ffc2f64f0de 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/DefaultMetricFinder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/measure/DefaultMetricFinder.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.measure;
+package org.sonar.scanner.scan.measure;
 
 import com.google.common.collect.Lists;
 import java.io.Serializable;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/DeprecatedMetricFinder.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/measure/DeprecatedMetricFinder.java
index 09e6063355c..38de10c1031 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/DeprecatedMetricFinder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/measure/DeprecatedMetricFinder.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.measure;
+package org.sonar.scanner.scan.measure;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/MeasureCache.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/measure/MeasureCache.java
index 28ac18e9f15..8792e32d9b9 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/MeasureCache.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/measure/MeasureCache.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.measure;
+package org.sonar.scanner.scan.measure;
 
 import com.google.common.base.Preconditions;
 import javax.annotation.CheckForNull;
@@ -25,9 +25,9 @@ import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.measure.MetricFinder;
 import org.sonar.api.measures.Measure;
 import org.sonar.api.resources.Resource;
-import org.sonar.batch.index.Cache;
-import org.sonar.batch.index.Cache.Entry;
-import org.sonar.batch.index.Caches;
+import org.sonar.scanner.index.Cache;
+import org.sonar.scanner.index.Caches;
+import org.sonar.scanner.index.Cache.Entry;
 
 /**
  * Cache of all measures. This cache is shared amongst all project modules.
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/MeasureValueCoder.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/measure/MeasureValueCoder.java
index 019410fd06b..f13151a5902 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/MeasureValueCoder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/measure/MeasureValueCoder.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.measure;
+package org.sonar.scanner.scan.measure;
 
 import com.persistit.Value;
 import com.persistit.encoding.CoderContext;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/measure/package-info.java
index f35eb86c95c..fb80f949be1 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/measure/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/measure/package-info.java
@@ -21,6 +21,6 @@
  * This package is a part of bootstrap process, so we should take care about backward compatibility.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.batch.scan.measure;
+package org.sonar.scanner.scan.measure;
 
 import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/package-info.java
index 6fc80086043..4056e3b4ac7 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/index/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/package-info.java
@@ -18,6 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.batch.index;
+package org.sonar.scanner.scan;
 
 import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/ConsoleReport.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/ConsoleReport.java
index 2ae5f5b8cff..6add4c065b6 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/ConsoleReport.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/ConsoleReport.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.report;
+package org.sonar.scanner.scan.report;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.apache.commons.lang.StringUtils;
@@ -28,9 +28,9 @@ import org.sonar.api.config.Settings;
 import org.sonar.api.rule.Severity;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.batch.issue.IssueCache;
-import org.sonar.batch.issue.tracking.TrackedIssue;
-import org.sonar.batch.scan.filesystem.InputPathCache;
+import org.sonar.scanner.issue.IssueCache;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
+import org.sonar.scanner.scan.filesystem.InputPathCache;
 
 @Properties({
   @Property(key = ConsoleReport.CONSOLE_REPORT_ENABLED_KEY, defaultValue = "false", name = "Enable console report",
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/HtmlReport.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/HtmlReport.java
index d032a5582ce..6e5caf6b7e8 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/HtmlReport.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/HtmlReport.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.report;
+package org.sonar.scanner.scan.report;
 
 import com.google.common.collect.Maps;
 import freemarker.template.Template;
@@ -166,7 +166,7 @@ public class HtmlReport implements Reporter {
   }
 
   private void copyDependency(File target, String filename) {
-    try (InputStream input = getClass().getResourceAsStream("/org/sonar/batch/scan/report/issuesreport_files/" + filename);
+    try (InputStream input = getClass().getResourceAsStream("/org/sonar/scanner/scan/report/issuesreport_files/" + filename);
       OutputStream output = new FileOutputStream(new File(target, filename))) {
       IOUtils.copy(input, output);
     } catch (IOException e) {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssueVariation.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/IssueVariation.java
index 23ca58e7d8c..581a1ac70f3 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssueVariation.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/IssueVariation.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.report;
+package org.sonar.scanner.scan.report;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssuesReport.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/IssuesReport.java
index cede7a81d1c..33c3bf7de97 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssuesReport.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/IssuesReport.java
@@ -17,9 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.report;
-
-import org.sonar.batch.issue.tracking.TrackedIssue;
+package org.sonar.scanner.scan.report;
 
 import com.google.common.collect.Maps;
 
@@ -30,7 +28,8 @@ import java.util.Map;
 
 import org.sonar.api.batch.rule.Rule;
 import org.sonar.api.rules.RulePriority;
-import org.sonar.batch.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
 
 public class IssuesReport {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssuesReportBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/IssuesReportBuilder.java
index a87b043bfb8..d598f36c145 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssuesReportBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/IssuesReportBuilder.java
@@ -17,9 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.report;
-
-import org.sonar.batch.issue.tracking.TrackedIssue;
+package org.sonar.scanner.scan.report;
 
 import javax.annotation.CheckForNull;
 
@@ -30,11 +28,12 @@ import org.sonar.api.batch.rule.Rule;
 import org.sonar.api.batch.rule.Rules;
 import org.sonar.api.resources.Project;
 import org.sonar.api.rules.RulePriority;
-import org.sonar.batch.DefaultProjectTree;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.issue.IssueCache;
-import org.sonar.batch.scan.filesystem.InputPathCache;
+import org.sonar.scanner.DefaultProjectTree;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponentCache;
+import org.sonar.scanner.issue.IssueCache;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
+import org.sonar.scanner.scan.filesystem.InputPathCache;
 
 @ScannerSide
 public class IssuesReportBuilder {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssuesReports.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/IssuesReports.java
index a35b32262b4..eb30c186908 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/IssuesReports.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/IssuesReports.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.report;
+package org.sonar.scanner.scan.report;
 
 import org.sonar.api.batch.ScannerSide;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/JSONReport.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/JSONReport.java
index 84184a410a1..1661d591a0d 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/JSONReport.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/JSONReport.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.report;
+package org.sonar.scanner.scan.report;
 
 import com.google.common.annotations.VisibleForTesting;
 import java.io.BufferedWriter;
@@ -50,12 +50,12 @@ import org.sonar.api.platform.Server;
 import org.sonar.api.resources.Project;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.utils.text.JsonWriter;
-import org.sonar.batch.issue.IssueCache;
-import org.sonar.batch.issue.tracking.TrackedIssue;
-import org.sonar.batch.repository.user.UserRepositoryLoader;
-import org.sonar.batch.scan.filesystem.InputPathCache;
+import org.sonar.scanner.issue.IssueCache;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
 import org.sonar.scanner.protocol.input.ScannerInput;
 import org.sonar.scanner.protocol.input.ScannerInput.User;
+import org.sonar.scanner.repository.user.UserRepositoryLoader;
+import org.sonar.scanner.scan.filesystem.InputPathCache;
 
 @Properties({
   @Property(
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/ReportRuleKey.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/ReportRuleKey.java
index 1061d3c3238..061b0a81a00 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/ReportRuleKey.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/ReportRuleKey.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.report;
+package org.sonar.scanner.scan.report;
 
 import org.sonar.api.batch.rule.Rule;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/ReportSummary.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/ReportSummary.java
index 435aee37450..7fb0554de0b 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/ReportSummary.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/ReportSummary.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.report;
+package org.sonar.scanner.scan.report;
 
 import com.google.common.collect.Maps;
 import java.util.ArrayList;
@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.Map;
 import org.sonar.api.batch.rule.Rule;
 import org.sonar.api.rules.RulePriority;
-import org.sonar.batch.issue.tracking.TrackedIssue;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
 
 public class ReportSummary {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/Reporter.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/Reporter.java
index 8a5b3972067..3d1f9e2f3da 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/Reporter.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/Reporter.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.report;
+package org.sonar.scanner.scan.report;
 
 import org.sonar.api.batch.ScannerSide;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/ResourceReport.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/ResourceReport.java
index c2d14b20c35..22ae24470b1 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/ResourceReport.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/ResourceReport.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.report;
+package org.sonar.scanner.scan.report;
 
 import com.google.common.collect.Maps;
 import java.util.ArrayList;
@@ -27,8 +27,8 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.sonar.api.batch.rule.Rule;
 import org.sonar.api.rules.RulePriority;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.issue.tracking.TrackedIssue;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
 
 public final class ResourceReport {
   private final BatchComponent resource;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/RuleNameProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/RuleNameProvider.java
index e4c39188731..73d31c903fc 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/RuleNameProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/RuleNameProvider.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.report;
+package org.sonar.scanner.scan.report;
 
 import org.sonar.api.batch.rule.Rule;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/RuleReport.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/RuleReport.java
index 4026ed387ab..be2632cd548 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/RuleReport.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/RuleReport.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.report;
+package org.sonar.scanner.scan.report;
 
 import org.sonar.api.batch.rule.Rule;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/RuleReportComparator.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/RuleReportComparator.java
index b779537e8fd..dfef1b88d32 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/RuleReportComparator.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/RuleReportComparator.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.report;
+package org.sonar.scanner.scan.report;
 
 import java.io.Serializable;
 import java.util.Comparator;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/SourceProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/SourceProvider.java
index c3b72b6907d..6587e24933c 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scan/report/SourceProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/SourceProvider.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.report;
+package org.sonar.scanner.scan.report;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
 import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.batch.fs.InputFile;
-import org.sonar.batch.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponent;
 
 @ScannerSide
 public class SourceProvider {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/package-info.java
new file mode 100644
index 00000000000..57b6e31bfe2
--- /dev/null
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/report/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.scanner.scan.report;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/DefaultBlameInput.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scm/DefaultBlameInput.java
index a85c6536c92..7b9116362dd 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/DefaultBlameInput.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scm/DefaultBlameInput.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scm;
+package org.sonar.scanner.scm;
 
 import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.batch.fs.InputFile;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/DefaultBlameOutput.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scm/DefaultBlameOutput.java
index cf430a9f840..4cbb59f995f 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/DefaultBlameOutput.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scm/DefaultBlameOutput.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scm;
+package org.sonar.scanner.scm;
 
 import com.google.common.base.Preconditions;
 import java.text.Normalizer;
@@ -35,11 +35,11 @@ import org.sonar.api.batch.scm.BlameCommand.BlameOutput;
 import org.sonar.api.batch.scm.BlameLine;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.util.ProgressReport;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponentCache;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReport.Changesets.Builder;
+import org.sonar.scanner.util.ProgressReport;
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
 class DefaultBlameOutput implements BlameOutput {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/ScmConfiguration.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scm/ScmConfiguration.java
index c5997efa864..8c5e44ae592 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/ScmConfiguration.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scm/ScmConfiguration.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scm;
+package org.sonar.scanner.scm;
 
 import com.google.common.base.Joiner;
 import java.util.LinkedHashMap;
@@ -35,7 +35,7 @@ import org.sonar.api.batch.scm.ScmProvider;
 import org.sonar.api.config.Settings;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.batch.scan.ImmutableProjectReactor;
+import org.sonar.scanner.scan.ImmutableProjectReactor;
 
 @Properties({
   @Property(
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/ScmSensor.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scm/ScmSensor.java
index 1fdae7db5ce..0783726ac94 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/scm/ScmSensor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scm/ScmSensor.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scm;
+package org.sonar.scanner.scm;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -32,13 +32,13 @@ import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.sensor.SensorDescriptor;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.report.ReportPublisher;
-import org.sonar.batch.repository.FileData;
-import org.sonar.batch.repository.ProjectRepositories;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponentCache;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReport.Changesets.Builder;
+import org.sonar.scanner.report.ReportPublisher;
+import org.sonar.scanner.repository.FileData;
+import org.sonar.scanner.repository.ProjectRepositories;
 
 public final class ScmSensor implements Sensor {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scm/package-info.java
index 75db5554d7f..3c86b192861 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/issue/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scm/package-info.java
@@ -18,6 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.batch.issue;
+package org.sonar.scanner.scm;
 
 import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/DefaultSensorContext.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/DefaultSensorContext.java
index f8a88f24b63..801224b4450 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/DefaultSensorContext.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/DefaultSensorContext.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.sensor;
+package org.sonar.scanner.sensor;
 
 import java.io.Serializable;
 import org.sonar.api.SonarQubeVersion;
@@ -41,9 +41,9 @@ import org.sonar.api.batch.sensor.symbol.NewSymbolTable;
 import org.sonar.api.batch.sensor.symbol.internal.DefaultSymbolTable;
 import org.sonar.api.config.Settings;
 import org.sonar.api.utils.Version;
-import org.sonar.batch.sensor.noop.NoOpNewCpdTokens;
-import org.sonar.batch.sensor.noop.NoOpNewHighlighting;
-import org.sonar.batch.sensor.noop.NoOpNewSymbolTable;
+import org.sonar.scanner.sensor.noop.NoOpNewCpdTokens;
+import org.sonar.scanner.sensor.noop.NoOpNewHighlighting;
+import org.sonar.scanner.sensor.noop.NoOpNewSymbolTable;
 
 public class DefaultSensorContext implements SensorContext {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/DefaultSensorStorage.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/DefaultSensorStorage.java
index 7dfddbcf55f..67fe7d9bc4b 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/DefaultSensorStorage.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/DefaultSensorStorage.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.sensor;
+package org.sonar.scanner.sensor;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
@@ -51,19 +51,19 @@ import org.sonar.api.resources.File;
 import org.sonar.api.resources.Resource;
 import org.sonar.api.utils.KeyValueFormat;
 import org.sonar.api.utils.SonarException;
-import org.sonar.batch.cpd.deprecated.DefaultCpdBlockIndexer;
-import org.sonar.batch.cpd.index.SonarCpdBlockIndex;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.issue.ModuleIssues;
-import org.sonar.batch.report.ReportPublisher;
-import org.sonar.batch.report.ScannerReportUtils;
-import org.sonar.batch.scan.measure.MeasureCache;
-import org.sonar.batch.sensor.coverage.CoverageExclusions;
 import org.sonar.duplications.block.Block;
 import org.sonar.duplications.internal.pmd.PmdBlockChunker;
+import org.sonar.scanner.cpd.deprecated.DefaultCpdBlockIndexer;
+import org.sonar.scanner.cpd.index.SonarCpdBlockIndex;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponentCache;
+import org.sonar.scanner.issue.ModuleIssues;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
+import org.sonar.scanner.report.ReportPublisher;
+import org.sonar.scanner.report.ScannerReportUtils;
+import org.sonar.scanner.scan.measure.MeasureCache;
+import org.sonar.scanner.sensor.coverage.CoverageExclusions;
 
 public class DefaultSensorStorage implements SensorStorage {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/SensorOptimizer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/SensorOptimizer.java
index 19ad9cbeab0..68c29375566 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/SensorOptimizer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/SensorOptimizer.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.sensor;
+package org.sonar.scanner.sensor;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/SensorWrapper.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/SensorWrapper.java
index f268a67da27..cafb2adb75a 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/SensorWrapper.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/SensorWrapper.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.sensor;
+package org.sonar.scanner.sensor;
 
 import org.sonar.api.batch.sensor.Sensor;
 import org.sonar.api.batch.sensor.SensorContext;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/coverage/CoverageConstants.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/coverage/CoverageConstants.java
index 569ac157e42..1bf08673dee 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/coverage/CoverageConstants.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/coverage/CoverageConstants.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.sensor.coverage;
+package org.sonar.scanner.sensor.coverage;
 
 import com.google.common.collect.ImmutableList;
 import org.sonar.api.measures.CoreMetrics;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/coverage/CoverageExclusions.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/coverage/CoverageExclusions.java
index 198b61141bb..58e17f9251b 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/coverage/CoverageExclusions.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/coverage/CoverageExclusions.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.sensor.coverage;
+package org.sonar.scanner.sensor.coverage;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/coverage/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/coverage/package-info.java
index b4c6be3d144..3df4e7c0ec7 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/coverage/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/coverage/package-info.java
@@ -18,4 +18,4 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @javax.annotation.ParametersAreNonnullByDefault
-package org.sonar.batch.sensor.coverage;
+package org.sonar.scanner.sensor.coverage;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/noop/NoOpNewCpdTokens.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/noop/NoOpNewCpdTokens.java
index 7ad3056b4ec..6f1b64675d2 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/noop/NoOpNewCpdTokens.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/noop/NoOpNewCpdTokens.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.sensor.noop;
+package org.sonar.scanner.sensor.noop;
 
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.TextRange;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/noop/NoOpNewHighlighting.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/noop/NoOpNewHighlighting.java
index c286107ffe7..92474fe9502 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/noop/NoOpNewHighlighting.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/noop/NoOpNewHighlighting.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.sensor.noop;
+package org.sonar.scanner.sensor.noop;
 
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.TextRange;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/noop/NoOpNewSymbolTable.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/noop/NoOpNewSymbolTable.java
index 46e8ed22e29..eacee670dd0 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/noop/NoOpNewSymbolTable.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/noop/NoOpNewSymbolTable.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.sensor.noop;
+package org.sonar.scanner.sensor.noop;
 
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.TextRange;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/noop/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/noop/package-info.java
index 0a654a40800..f85ff141091 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/sensor/noop/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/noop/package-info.java
@@ -18,4 +18,4 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @javax.annotation.ParametersAreNonnullByDefault
-package org.sonar.batch.sensor.noop;
+package org.sonar.scanner.sensor.noop;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/postjob/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/package-info.java
index 0e8cb6ac72d..683f27af78f 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/postjob/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/package-info.java
@@ -18,4 +18,4 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @javax.annotation.ParametersAreNonnullByDefault
-package org.sonar.batch.postjob;
+package org.sonar.scanner.sensor;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/CodeColorizerSensor.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/CodeColorizerSensor.java
index 616ac48ffef..3b5f2c5ec44 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/CodeColorizerSensor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/CodeColorizerSensor.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.source;
+package org.sonar.scanner.source;
 
 import org.sonar.api.batch.Phase;
 import org.sonar.api.batch.fs.FileSystem;
@@ -25,9 +25,9 @@ import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.sensor.Sensor;
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.sensor.SensorDescriptor;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.report.ReportPublisher;
+import org.sonar.scanner.index.BatchComponentCache;
 import org.sonar.scanner.protocol.output.ScannerReportReader;
+import org.sonar.scanner.report.ReportPublisher;
 
 @Phase(name = Phase.Name.POST)
 public final class CodeColorizerSensor implements Sensor {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/CodeColorizers.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/CodeColorizers.java
index 0f1ebe7c250..847bc99fa95 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/CodeColorizers.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/CodeColorizers.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.source;
+package org.sonar.scanner.source;
 
 import com.google.common.collect.Lists;
 import java.io.BufferedReader;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/DefaultHighlightable.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/DefaultHighlightable.java
index 52e56e4703b..565525067dd 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/DefaultHighlightable.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/DefaultHighlightable.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.source;
+package org.sonar.scanner.source;
 
 import org.sonar.api.batch.AnalysisMode;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/DefaultSymbolizable.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/DefaultSymbolizable.java
index a2a380c71e6..f14604292d7 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/DefaultSymbolizable.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/DefaultSymbolizable.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.source;
+package org.sonar.scanner.source;
 
 import java.util.Collections;
 import java.util.List;
@@ -26,7 +26,7 @@ import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.batch.sensor.symbol.internal.DefaultSymbolTable;
 import org.sonar.api.source.Symbol;
 import org.sonar.api.source.Symbolizable;
-import org.sonar.batch.sensor.DefaultSensorStorage;
+import org.sonar.scanner.sensor.DefaultSensorStorage;
 
 public class DefaultSymbolizable implements Symbolizable {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/DeprecatedDefaultSymbol.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/DeprecatedDefaultSymbol.java
index e63dc70b141..f08bb0314b4 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/DeprecatedDefaultSymbol.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/DeprecatedDefaultSymbol.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.source;
+package org.sonar.scanner.source;
 
 import org.sonar.api.batch.sensor.symbol.NewSymbol;
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/DeprecatedDefaultSymbolTable.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/DeprecatedDefaultSymbolTable.java
index 78ab4ec11ff..a5d061f89e3 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/DeprecatedDefaultSymbolTable.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/DeprecatedDefaultSymbolTable.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.source;
+package org.sonar.scanner.source;
 
 import java.util.List;
 import org.sonar.api.batch.sensor.symbol.internal.DefaultSymbolTable;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/HighlightableBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/HighlightableBuilder.java
index d911516b984..5f062b22946 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/HighlightableBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/HighlightableBuilder.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.source;
+package org.sonar.scanner.source;
 
 import javax.annotation.CheckForNull;
 import org.sonar.api.batch.AnalysisMode;
@@ -25,8 +25,8 @@ import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.batch.sensor.internal.SensorStorage;
 import org.sonar.api.source.Highlightable;
-import org.sonar.batch.deprecated.perspectives.PerspectiveBuilder;
-import org.sonar.batch.index.BatchComponent;
+import org.sonar.scanner.deprecated.perspectives.PerspectiveBuilder;
+import org.sonar.scanner.index.BatchComponent;
 
 public class HighlightableBuilder extends PerspectiveBuilder<Highlightable> {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/HighlightingCodeBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/HighlightingCodeBuilder.java
index b807ee2d5e2..d529351ea58 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/HighlightingCodeBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/HighlightingCodeBuilder.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.source;
+package org.sonar.scanner.source;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/HighlightingRenderer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/HighlightingRenderer.java
index f4b9f3d399f..aef6408e56f 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/HighlightingRenderer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/HighlightingRenderer.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.source;
+package org.sonar.scanner.source;
 
 import org.sonar.api.batch.sensor.highlighting.NewHighlighting;
 import org.sonar.channel.Channel;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/LinesSensor.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/LinesSensor.java
index d27c90953a0..6017d05ca7e 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/LinesSensor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/LinesSensor.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.source;
+package org.sonar.scanner.source;
 
 import org.sonar.api.batch.Phase;
 import org.sonar.api.batch.fs.FileSystem;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/SymbolizableBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/SymbolizableBuilder.java
index fda6c4c7166..e805c6dbcc4 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/SymbolizableBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/SymbolizableBuilder.java
@@ -17,16 +17,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.source;
+package org.sonar.scanner.source;
 
 import javax.annotation.CheckForNull;
 import org.sonar.api.batch.AnalysisMode;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.source.Symbolizable;
-import org.sonar.batch.deprecated.perspectives.PerspectiveBuilder;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.sensor.DefaultSensorStorage;
+import org.sonar.scanner.deprecated.perspectives.PerspectiveBuilder;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.sensor.DefaultSensorStorage;
 
 public class SymbolizableBuilder extends PerspectiveBuilder<Symbolizable> {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/ZeroCoverageSensor.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/ZeroCoverageSensor.java
index f211050dabc..432ba9ba932 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/source/ZeroCoverageSensor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/ZeroCoverageSensor.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.source;
+package org.sonar.scanner.source;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Sets;
@@ -37,7 +37,7 @@ import org.sonar.api.batch.sensor.coverage.NewCoverage;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.Measure;
 import org.sonar.api.utils.KeyValueFormat;
-import org.sonar.batch.scan.measure.MeasureCache;
+import org.sonar.scanner.scan.measure.MeasureCache;
 
 import static com.google.common.collect.Iterables.concat;
 import static com.google.common.collect.Iterables.transform;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/package-info.java
new file mode 100644
index 00000000000..ffdcb62dcce
--- /dev/null
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/source/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.scanner.source;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/task/ListTask.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/task/ListTask.java
index 7c535674d82..46e0ecd77d4 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/task/ListTask.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/task/ListTask.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.task;
+package org.sonar.scanner.task;
 
 import org.sonar.api.task.Task;
 import org.sonar.api.task.TaskDefinition;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/task/ScanTask.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/task/ScanTask.java
index 80b338e0a6e..765e4b17acb 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/task/ScanTask.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/task/ScanTask.java
@@ -17,14 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.task;
+package org.sonar.scanner.task;
 
 import org.sonar.api.CoreProperties;
 import org.sonar.api.task.Task;
 import org.sonar.api.task.TaskDefinition;
-import org.sonar.batch.analysis.AnalysisProperties;
-import org.sonar.batch.scan.ProjectScanContainer;
 import org.sonar.core.platform.ComponentContainer;
+import org.sonar.scanner.analysis.AnalysisProperties;
+import org.sonar.scanner.scan.ProjectScanContainer;
 
 public class ScanTask implements Task {
   public static final TaskDefinition DEFINITION = TaskDefinition.builder()
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/task/TaskContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/task/TaskContainer.java
index d730536a8f0..7804744b8b6 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/task/TaskContainer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/task/TaskContainer.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.task;
+package org.sonar.scanner.task;
 
 import java.util.Map;
 import org.apache.commons.lang.StringUtils;
@@ -27,11 +27,11 @@ import org.sonar.api.config.EmailSettings;
 import org.sonar.api.task.Task;
 import org.sonar.api.task.TaskDefinition;
 import org.sonar.api.utils.MessageException;
-import org.sonar.batch.bootstrap.ExtensionInstaller;
-import org.sonar.batch.bootstrap.ExtensionMatcher;
-import org.sonar.batch.bootstrap.ExtensionUtils;
-import org.sonar.batch.bootstrap.GlobalProperties;
 import org.sonar.core.platform.ComponentContainer;
+import org.sonar.scanner.bootstrap.ExtensionInstaller;
+import org.sonar.scanner.bootstrap.ExtensionMatcher;
+import org.sonar.scanner.bootstrap.ExtensionUtils;
+import org.sonar.scanner.bootstrap.GlobalProperties;
 
 public class TaskContainer extends ComponentContainer {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/task/TaskProperties.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/task/TaskProperties.java
index b8470ce4d00..b9a74a76aeb 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/task/TaskProperties.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/task/TaskProperties.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.task;
+package org.sonar.scanner.task;
 
 import java.util.Map;
 import javax.annotation.Nullable;
-import org.sonar.batch.bootstrap.UserProperties;
+import org.sonar.scanner.bootstrap.UserProperties;
 
 /**
  * Batch properties that are specific to a task (for example
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/task/Tasks.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/task/Tasks.java
index 7689e23ec8c..3f86d7cf3e9 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/task/Tasks.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/task/Tasks.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.task;
+package org.sonar.scanner.task;
 
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Maps;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/task/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/task/package-info.java
new file mode 100644
index 00000000000..bd6577a8e21
--- /dev/null
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/task/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.scanner.task;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/test/DefaultCoverageBlock.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/DefaultCoverageBlock.java
index 52c3ca7a76f..003a099b8d6 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/test/DefaultCoverageBlock.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/DefaultCoverageBlock.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.test;
+package org.sonar.scanner.test;
 
 import java.util.List;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/test/DefaultTestCase.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/DefaultTestCase.java
index 652d11a0ddb..b87cee936d5 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/test/DefaultTestCase.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/DefaultTestCase.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.test;
+package org.sonar.scanner.test;
 
 import com.google.common.base.Preconditions;
 import java.util.LinkedHashMap;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/test/DefaultTestPlan.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/DefaultTestPlan.java
index 85b26082424..65f7da160a9 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/test/DefaultTestPlan.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/DefaultTestPlan.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.test;
+package org.sonar.scanner.test;
 
 import com.google.common.collect.Lists;
 import java.util.ArrayList;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/test/DefaultTestable.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/DefaultTestable.java
index c672253920e..cf99ba2cc75 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/test/DefaultTestable.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/DefaultTestable.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.test;
+package org.sonar.scanner.test;
 
 import java.util.List;
 import java.util.Map;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/test/TestPlanBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/TestPlanBuilder.java
index b3bab1ee6f5..7376eb0a174 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/test/TestPlanBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/TestPlanBuilder.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.test;
+package org.sonar.scanner.test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -25,8 +25,8 @@ import javax.annotation.CheckForNull;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.InputFile.Type;
 import org.sonar.api.test.MutableTestPlan;
-import org.sonar.batch.deprecated.perspectives.PerspectiveBuilder;
-import org.sonar.batch.index.BatchComponent;
+import org.sonar.scanner.deprecated.perspectives.PerspectiveBuilder;
+import org.sonar.scanner.index.BatchComponent;
 
 public class TestPlanBuilder extends PerspectiveBuilder<MutableTestPlan> {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/test/TestableBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/TestableBuilder.java
index 261b0b15a1d..2f327a344f2 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/test/TestableBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/TestableBuilder.java
@@ -17,15 +17,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.test;
+package org.sonar.scanner.test;
 
 import javax.annotation.CheckForNull;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.InputFile.Type;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.test.MutableTestable;
-import org.sonar.batch.deprecated.perspectives.PerspectiveBuilder;
-import org.sonar.batch.index.BatchComponent;
+import org.sonar.scanner.deprecated.perspectives.PerspectiveBuilder;
+import org.sonar.scanner.index.BatchComponent;
 
 public class TestableBuilder extends PerspectiveBuilder<MutableTestable> {
 
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/package-info.java
new file mode 100644
index 00000000000..e52c37000b7
--- /dev/null
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.scanner.test;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/util/BatchUtils.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/util/BatchUtils.java
index 5b0a8f85437..527e889fd62 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/util/BatchUtils.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/util/BatchUtils.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.util;
+package org.sonar.scanner.util;
 
 import com.google.common.base.Strings;
 import java.io.BufferedReader;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/util/ProgressReport.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/util/ProgressReport.java
index f2ea0406a01..28a69aa6dc7 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/util/ProgressReport.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/util/ProgressReport.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.util;
+package org.sonar.scanner.util;
 
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/util/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/util/package-info.java
index 42cf7aa9450..d7bc9f6d9cc 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/util/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/util/package-info.java
@@ -18,5 +18,5 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @javax.annotation.ParametersAreNonnullByDefault
-package org.sonar.batch.util;
+package org.sonar.scanner.util;
 
diff --git a/sonar-scanner-engine/src/main/resources/org/sonar/batch/logback.xml b/sonar-scanner-engine/src/main/resources/org/sonar/batch/logback.xml
index 198cd9c1bc6..6771813bfcd 100644
--- a/sonar-scanner-engine/src/main/resources/org/sonar/batch/logback.xml
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/batch/logback.xml
@@ -4,7 +4,7 @@
   <!--
   
   This file is deprecated. It's replaced by org/sonar/batch/bootstrapper/logback.xml.
-  It can't be deleted as long as Ant Task and Java Runner do not use org.sonar.batch.bootstrapper.LoggingConfiguration.
+  It can't be deleted as long as SonarQube Scanner 2.4 is still supported.
 
   -->
 
@@ -19,25 +19,10 @@
     <level value="WARN"/>
   </logger>
 
-  <!-- sonar.showSql -->
-  <!-- see also org.sonar.db.MyBatis#configureLogback() -->
-  <logger name="org.apache.ibatis">
-    <level value="WARN"/>
-  </logger>
-  <logger name="org.mybatis">
-    <level value="WARN"/>
-  </logger>
-  <logger name="java.sql">
-    <level value="WARN"/>
-  </logger>
-  <logger name="java.sql.ResultSet">
-    <level value="WARN"/>
-  </logger>
   <logger name="PERSISTIT">
     <level value="WARN"/>
   </logger>
 
-
   <root>
     <!-- sonar.verbose -->
     <level value="${ROOT_LOGGER_LEVEL}"/>
diff --git a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport.ftl b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport.ftl
index b0679c50529..b0679c50529 100644
--- a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport.ftl
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport.ftl
diff --git a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/DIR.png b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/DIR.png
index b135ef92eec..b135ef92eec 100644
--- a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/DIR.png
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/DIR.png
diff --git a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/FIL.png b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/FIL.png
index 1664e25c8b5..1664e25c8b5 100644
--- a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/FIL.png
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/FIL.png
diff --git a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/PRJ.png b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/PRJ.png
index b32e51c5f42..b32e51c5f42 100644
--- a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/PRJ.png
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/PRJ.png
diff --git a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/favicon.ico b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/favicon.ico
index c6d382d9823..c6d382d9823 100644
--- a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/favicon.ico
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/favicon.ico
diff --git a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/jquery.min.js b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/jquery.min.js
index 53763631337..53763631337 100644
--- a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/jquery.min.js
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/jquery.min.js
diff --git a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sep12.png b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/sep12.png
index bb10431c778..bb10431c778 100644
--- a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sep12.png
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/sep12.png
diff --git a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.css b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/sonar.css
index c367c1377c8..c367c1377c8 100644
--- a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.css
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/sonar.css
diff --git a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.eot b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/sonar.eot
index 189f7b56818..189f7b56818 100755
--- a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.eot
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/sonar.eot
diff --git a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.svg b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/sonar.svg
index 36965167290..36965167290 100755
--- a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.svg
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/sonar.svg
diff --git a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.ttf b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/sonar.ttf
index 5a876906e10..5a876906e10 100755
--- a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.ttf
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/sonar.ttf
diff --git a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.woff b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/sonar.woff
index bf0cf103cd0..bf0cf103cd0 100755
--- a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.woff
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/sonar.woff
diff --git a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonarqube-24x100.png b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/sonarqube-24x100.png
index b2ff23bf288..b2ff23bf288 100644
--- a/sonar-scanner-engine/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonarqube-24x100.png
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/scanner/scan/report/issuesreport_files/sonarqube-24x100.png
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/BatchTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/BatchTest.java
index b9696631f89..1353a3baf0f 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/BatchTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/BatchTest.java
@@ -20,6 +20,9 @@
 package org.sonar.batch.bootstrapper;
 
 import org.junit.Test;
+import org.sonar.batch.bootstrapper.Batch;
+import org.sonar.batch.bootstrapper.EnvironmentInformation;
+import org.sonar.batch.bootstrapper.LogOutput;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertNotNull;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/EnvironmentInformationTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/EnvironmentInformationTest.java
index 71dd0495d49..77cdcb378ad 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/EnvironmentInformationTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/EnvironmentInformationTest.java
@@ -20,6 +20,7 @@
 package org.sonar.batch.bootstrapper;
 
 import org.junit.Test;
+import org.sonar.batch.bootstrapper.EnvironmentInformation;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/LogCallbackAppenderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/LogCallbackAppenderTest.java
index 14dc014a2ae..62924471eeb 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/LogCallbackAppenderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/LogCallbackAppenderTest.java
@@ -23,6 +23,8 @@ import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import org.junit.Before;
 import org.junit.Test;
+import org.sonar.batch.bootstrapper.LogCallbackAppender;
+import org.sonar.batch.bootstrapper.LogOutput;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/LoggingConfigurationTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/LoggingConfigurationTest.java
index 920af566e93..d792e346d90 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/LoggingConfigurationTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/LoggingConfigurationTest.java
@@ -45,14 +45,12 @@ public class LoggingConfigurationTest {
     Map<String, String> globalProps = Maps.newHashMap();
     LoggingConfiguration conf = new LoggingConfiguration(null).setProperties(globalProps);
     assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_ROOT_LOGGER_LEVEL)).isEqualTo(LoggingConfiguration.LEVEL_ROOT_DEFAULT);
-    assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_SQL_LOGGER_LEVEL)).isEqualTo("WARN");
 
     Map<String, String> analysisProperties = Maps.newHashMap();
     analysisProperties.put("sonar.verbose", "true");
 
     conf.setProperties(analysisProperties, globalProps);
     assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_ROOT_LOGGER_LEVEL)).isEqualTo(LoggingConfiguration.LEVEL_ROOT_VERBOSE);
-    assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_SQL_LOGGER_LEVEL)).isEqualTo("WARN");
   }
 
   @Test
@@ -61,14 +59,12 @@ public class LoggingConfigurationTest {
     globalProps.put("sonar.verbose", "true");
     LoggingConfiguration conf = new LoggingConfiguration(null).setProperties(globalProps);
     assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_ROOT_LOGGER_LEVEL)).isEqualTo(LoggingConfiguration.LEVEL_ROOT_VERBOSE);
-    assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_SQL_LOGGER_LEVEL)).isEqualTo("WARN");
 
     Map<String, String> analysisProperties = Maps.newHashMap();
     analysisProperties.put("sonar.verbose", "false");
 
     conf.setProperties(analysisProperties, globalProps);
     assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_ROOT_LOGGER_LEVEL)).isEqualTo(LoggingConfiguration.LEVEL_ROOT_DEFAULT);
-    assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_SQL_LOGGER_LEVEL)).isEqualTo("WARN");
   }
 
   @Test
@@ -92,24 +88,20 @@ public class LoggingConfigurationTest {
     properties.put("sonar.verbose", "true");
     LoggingConfiguration conf = new LoggingConfiguration(null).setProperties(properties);
     assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_ROOT_LOGGER_LEVEL)).isEqualTo(LoggingConfiguration.LEVEL_ROOT_VERBOSE);
-    assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_SQL_LOGGER_LEVEL)).isEqualTo("WARN");
 
     properties.put("sonar.verbose", "false");
     conf = new LoggingConfiguration(null).setProperties(properties);
     assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_ROOT_LOGGER_LEVEL)).isEqualTo(LoggingConfiguration.LEVEL_ROOT_DEFAULT);
-    assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_SQL_LOGGER_LEVEL)).isEqualTo("WARN");
 
     properties.put("sonar.verbose", "false");
     properties.put("sonar.log.profilingLevel", "FULL");
     conf = new LoggingConfiguration(null).setProperties(properties);
     assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_ROOT_LOGGER_LEVEL)).isEqualTo("DEBUG");
-    assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_SQL_LOGGER_LEVEL)).isEqualTo("TRACE");
 
     properties.put("sonar.verbose", "false");
     properties.put("sonar.log.profilingLevel", "BASIC");
     conf = new LoggingConfiguration(null).setProperties(properties);
     assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_ROOT_LOGGER_LEVEL)).isEqualTo("DEBUG");
-    assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_SQL_LOGGER_LEVEL)).isEqualTo("WARN");
   }
 
   @Test
@@ -117,22 +109,18 @@ public class LoggingConfigurationTest {
     Map<String, String> properties = Maps.newHashMap();
     LoggingConfiguration conf = new LoggingConfiguration(null).setProperties(properties);
     assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_ROOT_LOGGER_LEVEL)).isEqualTo("INFO");
-    assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_SQL_LOGGER_LEVEL)).isEqualTo("WARN");
 
     properties.put("sonar.log.level", "INFO");
     conf = new LoggingConfiguration(null).setProperties(properties);
     assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_ROOT_LOGGER_LEVEL)).isEqualTo("INFO");
-    assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_SQL_LOGGER_LEVEL)).isEqualTo("WARN");
 
     properties.put("sonar.log.level", "DEBUG");
     conf = new LoggingConfiguration(null).setProperties(properties);
     assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_ROOT_LOGGER_LEVEL)).isEqualTo("DEBUG");
-    assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_SQL_LOGGER_LEVEL)).isEqualTo("WARN");
 
     properties.put("sonar.log.level", "TRACE");
     conf = new LoggingConfiguration(null).setProperties(properties);
     assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_ROOT_LOGGER_LEVEL)).isEqualTo("DEBUG");
-    assertThat(conf.getSubstitutionVariable(LoggingConfiguration.PROPERTY_SQL_LOGGER_LEVEL)).isEqualTo("TRACE");
   }
 
   @Test
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/LoggingConfiguratorTest.java b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/LoggingConfiguratorTest.java
index 2d719e4a657..5fe1cadc131 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/LoggingConfiguratorTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrapper/LoggingConfiguratorTest.java
@@ -142,21 +142,6 @@ public class LoggingConfiguratorTest {
   }
 
   @Test
-  public void testSqlClasspath() throws UnsupportedEncodingException {
-    String classpath = "/org/sonar/batch/bootstrapper/logback.xml";
-
-    conf.setLogOutput(listener);
-    conf.setShowSql(true);
-
-    LoggingConfigurator.apply(conf, classpath);
-
-    Logger logger = LoggerFactory.getLogger("java.sql");
-    logger.info("foo");
-
-    assertThat(listener.msg).endsWith(TEST_STR);
-  }
-
-  @Test
   public void testNoListener() throws UnsupportedEncodingException {
     System.setOut(new PrintStream(out, false, StandardCharsets.UTF_8.name()));
     LoggingConfigurator.apply(conf);
@@ -167,18 +152,4 @@ public class LoggingConfiguratorTest {
     assertThat(new String(out.toByteArray(), StandardCharsets.UTF_8)).contains("info");
   }
 
-  @Test
-  public void testNoSqlClasspath() throws UnsupportedEncodingException {
-    String classpath = "/org/sonar/batch/bootstrapper/logback.xml";
-
-    conf.setLogOutput(listener);
-    conf.setShowSql(false);
-
-    LoggingConfigurator.apply(conf, classpath);
-
-    Logger logger = LoggerFactory.getLogger("java.sql");
-    logger.info("foo");
-
-    assertThat(listener.msg).isNull();
-  }
 }
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/DefaultFileLinesContextTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/DefaultFileLinesContextTest.java
index 41f62087eeb..647b67e110d 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/DefaultFileLinesContextTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/DefaultFileLinesContextTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch;
+package org.sonar.scanner;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -29,7 +29,8 @@ import org.sonar.api.batch.measure.MetricFinder;
 import org.sonar.api.batch.sensor.internal.SensorContextTester;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.Measure;
-import org.sonar.batch.scan.measure.MeasureCache;
+import org.sonar.scanner.DefaultFileLinesContext;
+import org.sonar.scanner.scan.measure.MeasureCache;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.is;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/FakeJava.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/FakeJava.java
index 95c2244ab54..15c35e1bf30 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/FakeJava.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/FakeJava.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,

  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

  */

-package org.sonar.batch;

+package org.sonar.scanner;

 

 import org.sonar.api.resources.AbstractLanguage;

 

diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/ProjectConfiguratorTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/ProjectConfiguratorTest.java
index 7a4d248ca21..7e291ee34d3 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/ProjectConfiguratorTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/ProjectConfiguratorTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch;
+package org.sonar.scanner;
 
 import java.text.SimpleDateFormat;
 import java.util.TimeZone;
@@ -27,6 +27,7 @@ import org.sonar.api.CoreProperties;
 import org.sonar.api.config.Settings;
 import org.sonar.api.resources.Project;
 import org.sonar.api.utils.System2;
+import org.sonar.scanner.ProjectConfigurator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/WsTestUtil.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/WsTestUtil.java
index ffe7e82fc26..180e447d5ca 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/WsTestUtil.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/WsTestUtil.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch;
+package org.sonar.scanner;
 
 import org.apache.commons.lang.StringUtils;
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
-import org.sonar.batch.bootstrap.BatchWsClient;
+import org.sonar.scanner.bootstrap.BatchWsClient;
 import org.sonarqube.ws.client.WsRequest;
 import org.sonarqube.ws.client.WsResponse;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/analysis/AnalysisTempFolderProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/analysis/AnalysisTempFolderProviderTest.java
index 058ea4fd34c..67806fe9afe 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/analysis/AnalysisTempFolderProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/analysis/AnalysisTempFolderProviderTest.java
@@ -17,14 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.analysis;
+package org.sonar.scanner.analysis;
 
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 
 import org.sonar.api.batch.bootstrap.ProjectReactor;
 import org.junit.Before;
-import org.sonar.batch.analysis.AnalysisTempFolderProvider;
 import org.sonar.api.utils.TempFolder;
+import org.sonar.scanner.analysis.AnalysisTempFolderProvider;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/analysis/DefaultAnalysisModeTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/analysis/DefaultAnalysisModeTest.java
index 67734ed62fa..52183c1ecc7 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/analysis/DefaultAnalysisModeTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/analysis/DefaultAnalysisModeTest.java
@@ -17,19 +17,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.analysis;
+package org.sonar.scanner.analysis;
 
 import org.junit.Rule;
 import org.junit.rules.ExpectedException;
-import org.sonar.batch.analysis.DefaultAnalysisMode;
-import org.sonar.batch.analysis.AnalysisProperties;
-
 import javax.annotation.Nullable;
-
-import org.sonar.batch.bootstrap.GlobalProperties;
 import org.junit.Test;
 import org.sonar.api.CoreProperties;
-
+import org.sonar.scanner.analysis.AnalysisProperties;
+import org.sonar.scanner.analysis.DefaultAnalysisMode;
+import org.sonar.scanner.bootstrap.GlobalProperties;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchExtensionDictionnaryTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/BatchExtensionDictionnaryTest.java
index 77a0021ef31..bcd5ce59dc7 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchExtensionDictionnaryTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/BatchExtensionDictionnaryTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import com.google.common.collect.Lists;
 import java.util.Arrays;
@@ -36,10 +36,12 @@ import org.sonar.api.batch.Sensor;
 import org.sonar.api.batch.SensorContext;
 import org.sonar.api.batch.postjob.PostJobContext;
 import org.sonar.api.resources.Project;
-import org.sonar.batch.postjob.PostJobOptimizer;
-import org.sonar.batch.sensor.DefaultSensorContext;
-import org.sonar.batch.sensor.SensorOptimizer;
 import org.sonar.core.platform.ComponentContainer;
+import org.sonar.scanner.bootstrap.BatchExtensionDictionnary;
+import org.sonar.scanner.bootstrap.ExtensionMatcher;
+import org.sonar.scanner.postjob.PostJobOptimizer;
+import org.sonar.scanner.sensor.DefaultSensorContext;
+import org.sonar.scanner.sensor.SensorOptimizer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchPluginInstallerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/BatchPluginInstallerTest.java
index 4c2deee6ebb..26ce5733907 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchPluginInstallerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/BatchPluginInstallerTest.java
@@ -17,20 +17,19 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import java.io.File;
 import java.io.StringReader;
 import java.util.List;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
-import org.sonar.batch.WsTestUtil;
 import org.sonar.core.platform.RemotePlugin;
 import org.sonar.home.cache.FileCache;
+import org.sonar.scanner.WsTestUtil;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchPluginJarExploderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/BatchPluginJarExploderTest.java
index fe991f5d406..2230f8cf739 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchPluginJarExploderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/BatchPluginJarExploderTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import java.io.File;
 import java.io.IOException;
@@ -30,6 +30,8 @@ import org.sonar.core.platform.ExplodedPlugin;
 import org.sonar.core.platform.PluginInfo;
 import org.sonar.home.cache.FileCache;
 import org.sonar.home.cache.FileCacheBuilder;
+import org.sonar.scanner.bootstrap.BatchPluginJarExploder;
+import org.sonar.scanner.bootstrap.Slf4jLogger;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchPluginPredicateTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/BatchPluginPredicateTest.java
index 0e8f29a1609..99f9d9eb981 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchPluginPredicateTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/BatchPluginPredicateTest.java
@@ -17,11 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import org.junit.Test;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.config.Settings;
+import org.sonar.scanner.bootstrap.BatchPluginPredicate;
+import org.sonar.scanner.bootstrap.GlobalMode;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/BatchPluginRepositoryTest.java
index 58233e9b2be..9ccbcf6c52e 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/BatchPluginRepositoryTest.java
@@ -17,13 +17,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import com.google.common.collect.ImmutableMap;
 import org.junit.Test;
 import org.sonar.api.Plugin;
 import org.sonar.core.platform.PluginInfo;
 import org.sonar.core.platform.PluginLoader;
+import org.sonar.scanner.bootstrap.BatchPluginRepository;
+import org.sonar.scanner.bootstrap.PluginInstaller;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchWsClientProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/BatchWsClientProviderTest.java
index 76fa07167ab..89ae9049260 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchWsClientProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/BatchWsClientProviderTest.java
@@ -17,12 +17,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.Test;
 import org.sonar.batch.bootstrapper.EnvironmentInformation;
+import org.sonar.scanner.bootstrap.BatchWsClient;
+import org.sonar.scanner.bootstrap.BatchWsClientProvider;
+import org.sonar.scanner.bootstrap.GlobalProperties;
 import org.sonarqube.ws.client.HttpConnector;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchWsClientTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/BatchWsClientTest.java
index 41270557b66..bc1459e6924 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/BatchWsClientTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/BatchWsClientTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import java.util.List;
 import org.junit.Rule;
@@ -27,6 +27,7 @@ import org.mockito.Mockito;
 import org.sonar.api.utils.MessageException;
 import org.sonar.api.utils.log.LogTester;
 import org.sonar.api.utils.log.LoggerLevel;
+import org.sonar.scanner.bootstrap.BatchWsClient;
 import org.sonarqube.ws.client.GetRequest;
 import org.sonarqube.ws.client.MockWsResponse;
 import org.sonarqube.ws.client.WsClient;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/DroppedPropertyCheckerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/DroppedPropertyCheckerTest.java
index e6cd758d253..83b23639732 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/DroppedPropertyCheckerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/DroppedPropertyCheckerTest.java
@@ -17,13 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import com.google.common.collect.ImmutableMap;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.api.utils.log.LogTester;
 import org.sonar.api.utils.log.LoggerLevel;
+import org.sonar.scanner.bootstrap.DroppedPropertyChecker;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/ExtensionInstallerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/ExtensionInstallerTest.java
index 6b09a5d24f7..1ebd459f0eb 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/ExtensionInstallerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/ExtensionInstallerTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import java.util.Arrays;
 import java.util.List;
@@ -31,6 +31,10 @@ import org.sonar.api.SonarQubeVersion;
 import org.sonar.api.batch.AnalysisMode;
 import org.sonar.core.platform.ComponentContainer;
 import org.sonar.core.platform.PluginInfo;
+import org.sonar.scanner.bootstrap.BatchPluginRepository;
+import org.sonar.scanner.bootstrap.ExtensionInstaller;
+import org.sonar.scanner.bootstrap.ExtensionMatcher;
+import org.sonar.scanner.bootstrap.GlobalMode;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/ExtensionUtilsTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/ExtensionUtilsTest.java
index 328abd324f3..35f848b9a0e 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/ExtensionUtilsTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/ExtensionUtilsTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import org.junit.Test;
 import org.sonar.api.BatchComponent;
@@ -26,6 +26,7 @@ import org.sonar.api.batch.InstantiationStrategy;
 import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.server.ServerSide;
+import org.sonar.scanner.bootstrap.ExtensionUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/FileCacheProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/FileCacheProviderTest.java
index 09ce7835e0c..251b8c84b28 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/FileCacheProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/FileCacheProviderTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,6 +27,8 @@ import org.junit.rules.TemporaryFolder;
 import org.junit.Test;
 import org.sonar.api.config.Settings;
 import org.sonar.home.cache.FileCache;
+import org.sonar.scanner.bootstrap.FileCacheProvider;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class FileCacheProviderTest {
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/GlobalContainerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalContainerTest.java
index 168ebd6a844..9143af92249 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/GlobalContainerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalContainerTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
@@ -31,6 +31,7 @@ import org.sonar.api.CoreProperties;
 import org.sonar.api.batch.BatchSide;
 import org.sonar.api.utils.TempFolder;
 import org.sonar.core.util.UuidFactory;
+import org.sonar.scanner.bootstrap.GlobalContainer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/GlobalModeTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalModeTest.java
index 5da1858e33b..18665cf6e3a 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/GlobalModeTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalModeTest.java
@@ -17,11 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import org.junit.Rule;
 import org.junit.rules.ExpectedException;
 import org.sonar.api.CoreProperties;
+import org.sonar.scanner.bootstrap.GlobalMode;
+import org.sonar.scanner.bootstrap.GlobalProperties;
 import org.junit.Test;
 
 import java.util.HashMap;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/GlobalPropertiesTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalPropertiesTest.java
index 4f3fd5cebca..89f95ea3ff1 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/GlobalPropertiesTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalPropertiesTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import com.google.common.collect.Maps;
 import org.junit.Test;
-
+import org.sonar.scanner.bootstrap.GlobalProperties;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/GlobalSettingsTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalSettingsTest.java
index aa13b14ccb5..b4613a837b3 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/GlobalSettingsTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalSettingsTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import java.util.Collections;
 
@@ -28,6 +28,9 @@ import org.junit.rules.ExpectedException;
 import org.sonar.api.config.PropertyDefinitions;
 import org.sonar.api.utils.log.LogTester;
 import org.sonar.api.utils.log.LoggerLevel;
+import org.sonar.scanner.bootstrap.GlobalMode;
+import org.sonar.scanner.bootstrap.GlobalProperties;
+import org.sonar.scanner.bootstrap.GlobalSettings;
 import org.sonar.scanner.protocol.input.GlobalRepositories;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/GlobalTempFolderProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalTempFolderProviderTest.java
index e0d4ee9d3ea..6cf9a729c22 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/GlobalTempFolderProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/GlobalTempFolderProviderTest.java
@@ -17,11 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import org.sonar.api.utils.System2;
 import org.apache.commons.io.FileUtils;
 import org.sonar.api.utils.TempFolder;
+import org.sonar.scanner.bootstrap.GlobalProperties;
+import org.sonar.scanner.bootstrap.GlobalTempFolderProvider;
 import com.google.common.collect.ImmutableMap;
 import org.sonar.api.CoreProperties;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/MetricProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/MetricProviderTest.java
index 8d1ab306b8d..b21edd3f77f 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/MetricProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/MetricProviderTest.java
@@ -17,13 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import org.junit.Test;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.Metric;
 import org.sonar.api.measures.Metrics;
-
+import org.sonar.scanner.bootstrap.MetricProvider;
 import java.util.Arrays;
 import java.util.List;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/MockHttpServer.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/MockHttpServer.java
index 99f10de2c9e..f225f99049f 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/bootstrap/MockHttpServer.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/bootstrap/MockHttpServer.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.bootstrap;
+package org.sonar.scanner.bootstrap;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/CpdComponentsTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/cpd/CpdComponentsTest.java
index 814e7d69d38..744220e35bf 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/CpdComponentsTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/cpd/CpdComponentsTest.java
@@ -17,9 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.cpd;
+package org.sonar.scanner.cpd;
 
 import org.junit.Test;
+import org.sonar.scanner.cpd.CpdComponents;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/CpdExecutorTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/cpd/CpdExecutorTest.java
index aa25e27b137..4ae6eaf0e82 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/CpdExecutorTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/cpd/CpdExecutorTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.cpd;
+package org.sonar.scanner.cpd;
 
 import java.io.File;
 import java.io.IOException;
@@ -35,15 +35,16 @@ import org.sonar.api.config.Settings;
 import org.sonar.api.resources.Project;
 import org.sonar.api.utils.log.LogTester;
 import org.sonar.api.utils.log.LoggerLevel;
-import org.sonar.batch.cpd.index.SonarCpdBlockIndex;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.report.ReportPublisher;
 import org.sonar.core.util.CloseableIterator;
 import org.sonar.duplications.index.CloneGroup;
 import org.sonar.duplications.index.ClonePart;
 import org.sonar.scanner.protocol.output.ScannerReport.Duplicate;
 import org.sonar.scanner.protocol.output.ScannerReport.Duplication;
+import org.sonar.scanner.report.ReportPublisher;
+import org.sonar.scanner.cpd.CpdExecutor;
+import org.sonar.scanner.cpd.index.SonarCpdBlockIndex;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponentCache;
 import org.sonar.scanner.protocol.output.ScannerReportReader;
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/DuplicationPredicatesTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/cpd/DuplicationPredicatesTest.java
index 6b6fa4fa0e8..f57a88ad501 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/DuplicationPredicatesTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/cpd/DuplicationPredicatesTest.java
@@ -17,11 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.cpd;
+package org.sonar.scanner.cpd;
 
 import com.google.common.base.Predicate;
 import org.junit.Test;
 import org.sonar.duplications.index.CloneGroup;
+import org.sonar.scanner.cpd.DuplicationPredicates;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/deprecated/DefaultCpdBlockIndexerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/cpd/deprecated/DefaultCpdBlockIndexerTest.java
index 5dc28fde04c..17338bab8af 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/deprecated/DefaultCpdBlockIndexerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/cpd/deprecated/DefaultCpdBlockIndexerTest.java
@@ -17,13 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.cpd.deprecated;
+package org.sonar.scanner.cpd.deprecated;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.sonar.api.config.Settings;
-import org.sonar.batch.cpd.deprecated.DefaultCpdBlockIndexer;
+import org.sonar.scanner.cpd.deprecated.DefaultCpdBlockIndexer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.anyString;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/deprecated/DeprecatedCpdBlockIndexerSensorTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/cpd/deprecated/DeprecatedCpdBlockIndexerSensorTest.java
index b9f53ef7603..092a3499c10 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/deprecated/DeprecatedCpdBlockIndexerSensorTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/cpd/deprecated/DeprecatedCpdBlockIndexerSensorTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.cpd.deprecated;
+package org.sonar.scanner.cpd.deprecated;
 
 import java.io.IOException;
 import org.junit.Before;
@@ -27,8 +27,8 @@ import org.junit.rules.TemporaryFolder;
 import org.sonar.api.batch.fs.internal.DefaultFileSystem;
 import org.sonar.api.config.PropertyDefinitions;
 import org.sonar.api.config.Settings;
-import org.sonar.batch.FakeJava;
-import org.sonar.batch.cpd.CpdComponents;
+import org.sonar.scanner.FakeJava;
+import org.sonar.scanner.cpd.CpdComponents;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/deprecated/JavaCpdBlockIndexerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/cpd/deprecated/JavaCpdBlockIndexerTest.java
index b42843d91aa..d59fb62a858 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/cpd/deprecated/JavaCpdBlockIndexerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/cpd/deprecated/JavaCpdBlockIndexerTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.cpd.deprecated;
+package org.sonar.scanner.cpd.deprecated;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;
@@ -33,11 +33,10 @@ import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.batch.fs.internal.DefaultFileSystem;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.config.Settings;
-import org.sonar.batch.cpd.deprecated.JavaCpdBlockIndexer;
-import org.sonar.batch.cpd.index.SonarCpdBlockIndex;
-import org.sonar.batch.index.BatchComponentCache;
 import org.sonar.duplications.block.Block;
-
+import org.sonar.scanner.cpd.deprecated.JavaCpdBlockIndexer;
+import org.sonar.scanner.cpd.index.SonarCpdBlockIndex;
+import org.sonar.scanner.index.BatchComponentCache;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/deprecated/perspectives/PerspectiveBuilderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/deprecated/perspectives/PerspectiveBuilderTest.java
index b07671362ce..791db326ae7 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/deprecated/perspectives/PerspectiveBuilderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/deprecated/perspectives/PerspectiveBuilderTest.java
@@ -17,11 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.deprecated.perspectives;
+package org.sonar.scanner.deprecated.perspectives;
 
 import org.junit.Test;
 import org.sonar.api.component.Perspective;
-import org.sonar.batch.index.BatchComponent;
+import org.sonar.scanner.deprecated.perspectives.PerspectiveBuilder;
+import org.sonar.scanner.index.BatchComponent;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/events/BatchStepEventTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/events/BatchStepEventTest.java
index 3f3738b3900..04fcd28b6a9 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/events/BatchStepEventTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/events/BatchStepEventTest.java
@@ -17,9 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.events;
+package org.sonar.scanner.events;
 
 import org.junit.Test;
+import org.sonar.scanner.events.BatchStepEvent;
+import org.sonar.scanner.events.BatchStepHandler;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/events/EventBusTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/events/EventBusTest.java
index 78fcd4926c2..9ab4be839e4 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/events/EventBusTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/events/EventBusTest.java
@@ -17,10 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.events;
+package org.sonar.scanner.events;
 
 import org.junit.Test;
 import org.sonar.api.batch.events.EventHandler;
+import org.sonar.scanner.events.BatchEvent;
+import org.sonar.scanner.events.EventBus;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/index/AbstractCachesTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/index/AbstractCachesTest.java
index b3e6592d9d2..d15905dbb82 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/index/AbstractCachesTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/index/AbstractCachesTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.index;
+package org.sonar.scanner.index;
 
 import org.junit.After;
 
@@ -26,9 +26,10 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import com.google.common.collect.ImmutableMap;
 import org.sonar.api.CoreProperties;
-import org.sonar.batch.bootstrap.GlobalProperties;
-import org.sonar.batch.bootstrap.GlobalTempFolderProvider;
-
+import org.sonar.scanner.bootstrap.GlobalProperties;
+import org.sonar.scanner.bootstrap.GlobalTempFolderProvider;
+import org.sonar.scanner.index.Caches;
+import org.sonar.scanner.index.CachesManager;
 import java.util.Map;
 
 import org.junit.ClassRule;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/index/BatchComponentCacheTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/index/BatchComponentCacheTest.java
index 8d014b67321..b7c5a956593 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/index/BatchComponentCacheTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/index/BatchComponentCacheTest.java
@@ -17,11 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.index;
+package org.sonar.scanner.index;
 
 import org.junit.Test;
 import org.sonar.api.resources.File;
 import org.sonar.api.resources.Resource;
+import org.sonar.scanner.index.BatchComponentCache;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/index/BucketTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/index/BucketTest.java
index a6a5f900088..9c5a0fc0359 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/index/BucketTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/index/BucketTest.java
@@ -17,12 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.index;
+package org.sonar.scanner.index;
 
 import org.junit.Test;
 import org.sonar.api.measures.Metric;
 import org.sonar.api.resources.Directory;
 import org.sonar.api.resources.File;
+import org.sonar.scanner.index.Bucket;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/index/CacheTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/index/CacheTest.java
index 95ddcb8b766..3c2765a2aee 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/index/CacheTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/index/CacheTest.java
@@ -17,11 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.index;
+package org.sonar.scanner.index;
 
 import com.google.common.collect.Iterables;
 import org.junit.Test;
-import org.sonar.batch.index.Cache.Entry;
+import org.sonar.scanner.index.Cache;
+import org.sonar.scanner.index.Cache.Entry;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/index/CachesManagerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/index/CachesManagerTest.java
index 177c6f1e357..48dc3397a42 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/index/CachesManagerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/index/CachesManagerTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.index;
+package org.sonar.scanner.index;
 
 import org.junit.Test;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/index/CachesTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/index/CachesTest.java
index 2a01ac38025..1a001c54cf1 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/index/CachesTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/index/CachesTest.java
@@ -17,12 +17,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.index;
+package org.sonar.scanner.index;
 
 import java.io.Serializable;
 
 import com.persistit.exception.PersistitException;
 import org.junit.Test;
+import org.sonar.scanner.index.Cache;
+import org.sonar.scanner.index.Caches;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/index/DefaultIndexTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/index/DefaultIndexTest.java
index 3c50e057ebe..33462983e62 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/index/DefaultIndexTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/index/DefaultIndexTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.index;
+package org.sonar.scanner.index;
 
 import java.io.IOException;
 import org.apache.commons.io.FileUtils;
@@ -34,10 +34,12 @@ import org.sonar.api.resources.Project;
 import org.sonar.api.resources.Resource;
 import org.sonar.api.rules.Rule;
 import org.sonar.api.rules.RuleFinder;
-import org.sonar.batch.DefaultProjectTree;
-import org.sonar.batch.FakeJava;
-import org.sonar.batch.scan.measure.MeasureCache;
-import org.sonar.batch.sensor.DefaultSensorStorage;
+import org.sonar.scanner.FakeJava;
+import org.sonar.scanner.DefaultProjectTree;
+import org.sonar.scanner.index.BatchComponentCache;
+import org.sonar.scanner.index.DefaultIndex;
+import org.sonar.scanner.scan.measure.MeasureCache;
+import org.sonar.scanner.sensor.DefaultSensorStorage;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DefaultFilterableIssueTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/DefaultFilterableIssueTest.java
index d6b759a4edb..98f90f14b6c 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DefaultFilterableIssueTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/DefaultFilterableIssueTest.java
@@ -17,12 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import java.util.Date;
 import org.junit.Before;
 import org.junit.Test;
 import org.sonar.api.resources.Project;
+import org.sonar.scanner.issue.DefaultFilterableIssue;
 import org.sonar.scanner.protocol.Constants.Severity;
 import org.sonar.scanner.protocol.output.ScannerReport.Issue;
 import org.sonar.scanner.protocol.output.ScannerReport.TextRange;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DefaultIssueCallbackTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/DefaultIssueCallbackTest.java
index 7be36bd3bc5..6bde07dd80a 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DefaultIssueCallbackTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/DefaultIssueCallbackTest.java
@@ -17,22 +17,23 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.sonar.batch.issue.tracking.TrackedIssue;
-
 import org.sonar.api.batch.rule.Rule;
 import org.sonar.api.rule.RuleKey;
+import org.sonar.batch.bootstrapper.IssueListener;
 import org.sonar.batch.bootstrapper.IssueListener.Issue;
 import org.mockito.MockitoAnnotations;
 import org.mockito.Mock;
 import org.sonar.api.batch.rule.Rules;
-import org.sonar.batch.repository.user.UserRepositoryLoader;
+import org.sonar.scanner.issue.DefaultIssueCallback;
+import org.sonar.scanner.issue.IssueCache;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
 import org.sonar.scanner.protocol.input.ScannerInput;
-import org.sonar.batch.bootstrapper.IssueListener;
+import org.sonar.scanner.repository.user.UserRepositoryLoader;
 import org.junit.Before;
 import com.google.common.collect.ImmutableList;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DefaultIssueFilterChainTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/DefaultIssueFilterChainTest.java
index 041bc8493a2..2403b52f70f 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DefaultIssueFilterChainTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/DefaultIssueFilterChainTest.java
@@ -17,13 +17,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import org.sonar.api.scan.issue.filter.FilterableIssue;
 
 import org.junit.Test;
 import org.sonar.api.scan.issue.filter.IssueFilter;
 import org.sonar.api.scan.issue.filter.IssueFilterChain;
+import org.sonar.scanner.issue.DefaultIssueFilterChain;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DefaultProjectIssuesTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/DefaultProjectIssuesTest.java
index 9448206b1d6..1948ff4152f 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DefaultProjectIssuesTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/DefaultProjectIssuesTest.java
@@ -17,14 +17,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
-
-import org.sonar.batch.issue.tracking.TrackedIssue;
+package org.sonar.scanner.issue;
 
 import com.google.common.collect.Lists;
 import org.junit.Test;
 import org.sonar.api.issue.Issue;
 import org.sonar.core.issue.DefaultIssue;
+import org.sonar.scanner.issue.DefaultProjectIssues;
+import org.sonar.scanner.issue.IssueCache;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rule.Severity;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DeprecatedIssueAdapterForFilterTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/DeprecatedIssueAdapterForFilterTest.java
index 5baf8932b2a..c3cc585c04a 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DeprecatedIssueAdapterForFilterTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/DeprecatedIssueAdapterForFilterTest.java
@@ -17,13 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import java.util.Date;
 import org.junit.Test;
 import org.sonar.api.issue.Issue;
 import org.sonar.api.resources.Project;
 import org.sonar.api.rule.RuleKey;
+import org.sonar.scanner.issue.DeprecatedIssueAdapterForFilter;
 import org.sonar.scanner.protocol.Constants.Severity;
 import org.sonar.scanner.protocol.output.ScannerReport.TextRange;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DeprecatedIssueFilterChainTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/DeprecatedIssueFilterChainTest.java
index c80b1d64a82..69c4d7c30f8 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/DeprecatedIssueFilterChainTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/DeprecatedIssueFilterChainTest.java
@@ -17,12 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import org.junit.Test;
 import org.sonar.api.issue.Issue;
 import org.sonar.api.issue.batch.IssueFilter;
 import org.sonar.api.issue.batch.IssueFilterChain;
+import org.sonar.scanner.issue.DeprecatedIssueFilterChain;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/IssuableFactoryTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/IssuableFactoryTest.java
index 65856e1e808..07038c5832f 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/IssuableFactoryTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/IssuableFactoryTest.java
@@ -17,15 +17,17 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import org.junit.Test;
 import org.sonar.api.issue.Issuable;
 import org.sonar.api.resources.File;
 import org.sonar.api.resources.Project;
-import org.sonar.batch.DefaultProjectTree;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.sensor.DefaultSensorContext;
+import org.sonar.scanner.DefaultProjectTree;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.issue.IssuableFactory;
+import org.sonar.scanner.issue.ModuleIssues;
+import org.sonar.scanner.sensor.DefaultSensorContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/IssueCacheTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/IssueCacheTest.java
index 6d9f42a8ede..b6ecc3b6379 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/IssueCacheTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/IssueCacheTest.java
@@ -17,21 +17,18 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
-import org.sonar.batch.issue.tracking.TrackedIssue;
-
-import org.sonar.batch.index.AbstractCachesTest;
 import com.google.common.base.Function;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
-import org.junit.Test;
-import org.sonar.api.rule.Severity;
-
-import javax.annotation.Nullable;
-
 import java.util.Collection;
 import java.util.List;
+import javax.annotation.Nullable;
+import org.junit.Test;
+import org.sonar.api.rule.Severity;
+import org.sonar.scanner.index.AbstractCachesTest;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ModuleIssuesTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ModuleIssuesTest.java
index 47726bc8a2e..61ac1a0fadd 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ModuleIssuesTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ModuleIssuesTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -35,9 +35,11 @@ import org.sonar.api.resources.File;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rule.Severity;
 import org.sonar.api.utils.MessageException;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.report.ReportPublisher;
+import org.sonar.scanner.index.BatchComponentCache;
+import org.sonar.scanner.issue.IssueFilters;
+import org.sonar.scanner.issue.ModuleIssues;
 import org.sonar.scanner.protocol.output.ScannerReport;
+import org.sonar.scanner.report.ReportPublisher;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/TrackedIssueAdapterTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/TrackedIssueAdapterTest.java
index f87035fa719..bd80d18172e 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/TrackedIssueAdapterTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/TrackedIssueAdapterTest.java
@@ -17,13 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue;
+package org.sonar.scanner.issue;
 
 import java.util.Date;
 import org.junit.Test;
 import org.sonar.api.issue.Issue;
 import org.sonar.api.rule.RuleKey;
-import org.sonar.batch.issue.tracking.TrackedIssue;
+import org.sonar.scanner.issue.TrackedIssueAdapter;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/EnforceIssuesFilterTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/EnforceIssuesFilterTest.java
index 28df728657d..87d58f57ff1 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/EnforceIssuesFilterTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/EnforceIssuesFilterTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore;
+package org.sonar.scanner.issue.ignore;
 
 import org.sonar.api.scan.issue.filter.FilterableIssue;
 
@@ -27,8 +27,10 @@ import org.junit.Test;
 import org.sonar.api.scan.issue.filter.IssueFilterChain;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.utils.WildcardPattern;
-import org.sonar.batch.issue.ignore.pattern.IssueInclusionPatternInitializer;
-import org.sonar.batch.issue.ignore.pattern.IssuePattern;
+import org.sonar.scanner.issue.ignore.EnforceIssuesFilter;
+import org.sonar.scanner.issue.ignore.pattern.IssueInclusionPatternInitializer;
+import org.sonar.scanner.issue.ignore.pattern.IssuePattern;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/IgnoreIssuesFilterTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/IgnoreIssuesFilterTest.java
index 6cf431e215c..59c3e64c051 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/IgnoreIssuesFilterTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/IgnoreIssuesFilterTest.java
@@ -17,16 +17,18 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore;
+package org.sonar.scanner.issue.ignore;
 
 import org.sonar.api.scan.issue.filter.FilterableIssue;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.sonar.api.scan.issue.filter.IssueFilterChain;
-import org.sonar.batch.issue.ignore.pattern.IssueExclusionPatternInitializer;
-import org.sonar.batch.issue.ignore.pattern.IssuePattern;
-import org.sonar.batch.issue.ignore.pattern.PatternMatcher;
+import org.sonar.scanner.issue.ignore.IgnoreIssuesFilter;
+import org.sonar.scanner.issue.ignore.pattern.IssueExclusionPatternInitializer;
+import org.sonar.scanner.issue.ignore.pattern.IssuePattern;
+import org.sonar.scanner.issue.ignore.pattern.PatternMatcher;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/IssueExclusionPatternInitializerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/pattern/IssueExclusionPatternInitializerTest.java
index 13e1646bb9d..c9fbc50229e 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/IssueExclusionPatternInitializerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/pattern/IssueExclusionPatternInitializerTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore.pattern;
+package org.sonar.scanner.issue.ignore.pattern;
 
 
 import org.junit.Before;
@@ -26,6 +26,7 @@ import org.sonar.api.config.PropertyDefinitions;
 import org.sonar.api.config.Settings;
 import org.sonar.api.utils.SonarException;
 import org.sonar.core.config.IssueExclusionProperties;
+import org.sonar.scanner.issue.ignore.pattern.IssueExclusionPatternInitializer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/IssueInclusionPatternInitializerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/pattern/IssueInclusionPatternInitializerTest.java
index 25c74587522..e34f19ea649 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/IssueInclusionPatternInitializerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/pattern/IssueInclusionPatternInitializerTest.java
@@ -17,13 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore.pattern;
+package org.sonar.scanner.issue.ignore.pattern;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.sonar.api.config.PropertyDefinitions;
 import org.sonar.api.config.Settings;
 import org.sonar.core.config.IssueExclusionProperties;
+import org.sonar.scanner.issue.ignore.pattern.IssueInclusionPatternInitializer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/IssuePatternTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/pattern/IssuePatternTest.java
index e67111d0f9c..bb14aa84f96 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/IssuePatternTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/pattern/IssuePatternTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore.pattern;
+package org.sonar.scanner.issue.ignore.pattern;
 
 import org.sonar.api.scan.issue.filter.FilterableIssue;
-
+import org.sonar.scanner.issue.ignore.pattern.IssuePattern;
 import org.junit.Test;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rules.Rule;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/LineRangeTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/pattern/LineRangeTest.java
index 8af95b5d4ad..2895a437a1d 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/LineRangeTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/pattern/LineRangeTest.java
@@ -17,9 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore.pattern;
+package org.sonar.scanner.issue.ignore.pattern;
 
 import org.junit.Test;
+import org.sonar.scanner.issue.ignore.pattern.LineRange;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/PatternDecoderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/pattern/PatternDecoderTest.java
index 3501d1a2326..289617de1a8 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/PatternDecoderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/pattern/PatternDecoderTest.java
@@ -17,13 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore.pattern;
+package org.sonar.scanner.issue.ignore.pattern;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.sonar.api.utils.SonarException;
-
+import org.sonar.scanner.issue.ignore.pattern.IssuePattern;
+import org.sonar.scanner.issue.ignore.pattern.PatternDecoder;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/PatternMatcherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/pattern/PatternMatcherTest.java
index 1d69a30c371..b231e3ff4ee 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/pattern/PatternMatcherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/pattern/PatternMatcherTest.java
@@ -17,10 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore.pattern;
+package org.sonar.scanner.issue.ignore.pattern;
 
 import org.sonar.api.scan.issue.filter.FilterableIssue;
-
+import org.sonar.scanner.issue.ignore.pattern.IssuePattern;
+import org.sonar.scanner.issue.ignore.pattern.LineRange;
+import org.sonar.scanner.issue.ignore.pattern.PatternDecoder;
+import org.sonar.scanner.issue.ignore.pattern.PatternMatcher;
 import com.google.common.collect.Sets;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsLoaderTest.java
index 52a0e59cbbe..0ba0ee0178d 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsLoaderTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore.scanner;
+package org.sonar.scanner.issue.ignore.scanner;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -29,10 +29,11 @@ import org.mockito.MockitoAnnotations;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.DefaultFileSystem;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
-import org.sonar.batch.issue.ignore.pattern.IssueExclusionPatternInitializer;
-import org.sonar.batch.issue.ignore.pattern.IssueInclusionPatternInitializer;
-import org.sonar.batch.issue.ignore.pattern.PatternMatcher;
-
+import org.sonar.scanner.issue.ignore.pattern.IssueExclusionPatternInitializer;
+import org.sonar.scanner.issue.ignore.pattern.IssueInclusionPatternInitializer;
+import org.sonar.scanner.issue.ignore.pattern.PatternMatcher;
+import org.sonar.scanner.issue.ignore.scanner.IssueExclusionsLoader;
+import org.sonar.scanner.issue.ignore.scanner.IssueExclusionsRegexpScanner;
 import java.io.File;
 import java.io.IOException;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest.java
index f4aa4ebd9f1..7560267d434 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.ignore.scanner;
+package org.sonar.scanner.issue.ignore.scanner;
 
 import com.google.common.collect.Sets;
 import com.google.common.io.Resources;
@@ -25,11 +25,11 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.sonar.batch.issue.ignore.pattern.IssueExclusionPatternInitializer;
-import org.sonar.batch.issue.ignore.pattern.IssuePattern;
-import org.sonar.batch.issue.ignore.pattern.LineRange;
-import org.sonar.batch.issue.ignore.pattern.PatternMatcher;
-
+import org.sonar.scanner.issue.ignore.pattern.IssueExclusionPatternInitializer;
+import org.sonar.scanner.issue.ignore.pattern.IssuePattern;
+import org.sonar.scanner.issue.ignore.pattern.LineRange;
+import org.sonar.scanner.issue.ignore.pattern.PatternMatcher;
+import org.sonar.scanner.issue.ignore.scanner.IssueExclusionsRegexpScanner;
 import java.io.File;
 import java.util.Arrays;
 import java.util.Set;
@@ -79,7 +79,7 @@ public class IssueExclusionsRegexpScannerTest {
   @Test
   public void shouldDoNothing() throws Exception {
     regexpScanner.scan(javaFile, new File(Resources.getResource(
-      "org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-no-regexp.txt").toURI()), UTF_8);
+      "org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-no-regexp.txt").toURI()), UTF_8);
 
     verifyNoMoreInteractions(patternsInitializer);
   }
@@ -87,7 +87,7 @@ public class IssueExclusionsRegexpScannerTest {
   @Test
   public void shouldAddPatternToExcludeFile() throws Exception {
     regexpScanner.scan(javaFile, new File(Resources.getResource(
-      "org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-single-regexp.txt").toURI()), UTF_8);
+      "org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-single-regexp.txt").toURI()), UTF_8);
 
     verify(patternsInitializer).getPatternMatcher();
     verify(patternMatcher, times(1)).addPatternToExcludeResource(javaFile);
@@ -97,7 +97,7 @@ public class IssueExclusionsRegexpScannerTest {
   @Test
   public void shouldAddPatternToExcludeFileEvenIfAlsoDoubleRegexps() throws Exception {
     regexpScanner.scan(javaFile, new File(Resources.getResource(
-      "org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-single-regexp-and-double-regexp.txt").toURI()), UTF_8);
+      "org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-single-regexp-and-double-regexp.txt").toURI()), UTF_8);
 
     verify(patternsInitializer).getPatternMatcher();
     verify(patternMatcher, times(1)).addPatternToExcludeResource(javaFile);
@@ -107,7 +107,7 @@ public class IssueExclusionsRegexpScannerTest {
   @Test
   public void shouldAddPatternToExcludeLines() throws Exception {
     regexpScanner.scan(javaFile, new File(Resources.getResource(
-      "org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp.txt").toURI()), UTF_8);
+      "org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp.txt").toURI()), UTF_8);
 
     Set<LineRange> lineRanges = Sets.newHashSet();
     lineRanges.add(new LineRange(21, 25));
@@ -119,7 +119,7 @@ public class IssueExclusionsRegexpScannerTest {
   @Test
   public void shouldAddPatternToExcludeLinesTillTheEnd() throws Exception {
     regexpScanner.scan(javaFile, new File(Resources.getResource(
-      "org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-unfinished.txt").toURI()), UTF_8);
+      "org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-unfinished.txt").toURI()), UTF_8);
 
     Set<LineRange> lineRanges = Sets.newHashSet();
     lineRanges.add(new LineRange(21, 34));
@@ -131,7 +131,7 @@ public class IssueExclusionsRegexpScannerTest {
   @Test
   public void shouldAddPatternToExcludeSeveralLineRanges() throws Exception {
     regexpScanner.scan(javaFile, new File(Resources.getResource(
-      "org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-twice.txt").toURI()), UTF_8);
+      "org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-twice.txt").toURI()), UTF_8);
 
     Set<LineRange> lineRanges = Sets.newHashSet();
     lineRanges.add(new LineRange(21, 25));
@@ -144,7 +144,7 @@ public class IssueExclusionsRegexpScannerTest {
   @Test
   public void shouldAddPatternToExcludeLinesWithWrongOrder() throws Exception {
     regexpScanner.scan(javaFile, new File(Resources.getResource(
-      "org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-wrong-order.txt").toURI()), UTF_8);
+      "org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-wrong-order.txt").toURI()), UTF_8);
 
     Set<LineRange> lineRanges = Sets.newHashSet();
     lineRanges.add(new LineRange(25, 35));
@@ -156,7 +156,7 @@ public class IssueExclusionsRegexpScannerTest {
   @Test
   public void shouldAddPatternToExcludeLinesWithMess() throws Exception {
     regexpScanner.scan(javaFile, new File(Resources.getResource(
-      "org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-mess.txt").toURI()), UTF_8);
+      "org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-mess.txt").toURI()), UTF_8);
 
     Set<LineRange> lineRanges = Sets.newHashSet();
     lineRanges.add(new LineRange(21, 29));
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/tracking/DefaultServerLineHashesLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/tracking/DefaultServerLineHashesLoaderTest.java
index 38102f6a5dc..3d57fc54334 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/tracking/DefaultServerLineHashesLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/tracking/DefaultServerLineHashesLoaderTest.java
@@ -17,19 +17,18 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.tracking;
+package org.sonar.scanner.issue.tracking;
 
+import java.io.StringReader;
+import java.net.URI;
+import java.net.URISyntaxException;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.sonar.api.utils.HttpDownloader;
-import org.sonar.batch.WsTestUtil;
-import org.sonar.batch.bootstrap.BatchWsClient;
-
-import java.io.StringReader;
-import java.net.URI;
-import java.net.URISyntaxException;
+import org.sonar.scanner.WsTestUtil;
+import org.sonar.scanner.bootstrap.BatchWsClient;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/tracking/RollingFileHashesTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/tracking/RollingFileHashesTest.java
index 8648fba48d1..b2da4bfd79a 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/tracking/RollingFileHashesTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/tracking/RollingFileHashesTest.java
@@ -17,9 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.tracking;
+package org.sonar.scanner.issue.tracking;
 
 import org.junit.Test;
+import org.sonar.scanner.issue.tracking.FileHashes;
+import org.sonar.scanner.issue.tracking.RollingFileHashes;
 
 import static org.apache.commons.codec.digest.DigestUtils.md5Hex;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/tracking/SourceHashHolderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/tracking/SourceHashHolderTest.java
index d49cb46c9d7..553494722d3 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/tracking/SourceHashHolderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/tracking/SourceHashHolderTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.tracking;
+package org.sonar.scanner.issue.tracking;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;
@@ -27,7 +27,8 @@ import org.junit.rules.TemporaryFolder;
 import org.mockito.Mockito;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
-
+import org.sonar.scanner.issue.tracking.ServerLineHashesLoader;
+import org.sonar.scanner.issue.tracking.SourceHashHolder;
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/tracking/TrackedIssueTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/tracking/TrackedIssueTest.java
index 4228f912b94..d62403aee48 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/issue/tracking/TrackedIssueTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/tracking/TrackedIssueTest.java
@@ -17,11 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.issue.tracking;
+package org.sonar.scanner.issue.tracking;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
+import org.sonar.scanner.issue.tracking.FileHashes;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
 
 public class TrackedIssueTest {
   @Test
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/BatchMediumTester.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/BatchMediumTester.java
index 8055f7baae6..4c5f93bad41 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/BatchMediumTester.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/BatchMediumTester.java
@@ -17,30 +17,39 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest;
+package org.sonar.scanner.mediumtest;
 
 import org.sonar.api.rule.RuleKey;
-
-import org.sonar.batch.rule.LoadedActiveRule;
-import org.sonar.batch.repository.FileData;
 import org.sonar.api.utils.DateUtils;
+import org.sonar.batch.bootstrapper.Batch;
+import org.sonar.batch.bootstrapper.EnvironmentInformation;
+import org.sonar.batch.bootstrapper.IssueListener;
+import org.sonar.batch.bootstrapper.LogOutput;
 import com.google.common.collect.Table;
 import com.google.common.collect.HashBasedTable;
-import org.sonar.batch.repository.ProjectRepositories;
-import org.sonar.batch.rule.ActiveRulesLoader;
 import org.sonarqube.ws.QualityProfiles.SearchWsResponse.QualityProfile;
-import org.sonar.batch.repository.QualityProfileLoader;
 import org.apache.commons.io.FileUtils;
 
 import javax.annotation.Nullable;
 
 import org.sonarqube.ws.Rules.ListResponse.Rule;
-import org.sonar.batch.bootstrapper.IssueListener;
 import org.sonar.api.server.rule.RulesDefinition.Repository;
 import org.sonar.api.server.rule.RulesDefinition;
-import org.sonar.batch.rule.RulesLoader;
+import org.sonar.scanner.issue.tracking.ServerLineHashesLoader;
+import org.sonar.scanner.mediumtest.FakePluginInstaller;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.scanner.protocol.input.GlobalRepositories;
 import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
+import org.sonar.scanner.report.ReportPublisher;
+import org.sonar.scanner.repository.FileData;
+import org.sonar.scanner.repository.GlobalRepositoriesLoader;
+import org.sonar.scanner.repository.ProjectRepositories;
+import org.sonar.scanner.repository.ProjectRepositoriesLoader;
+import org.sonar.scanner.repository.QualityProfileLoader;
+import org.sonar.scanner.repository.ServerIssuesLoader;
+import org.sonar.scanner.rule.ActiveRulesLoader;
+import org.sonar.scanner.rule.LoadedActiveRule;
+import org.sonar.scanner.rule.RulesLoader;
 import com.google.common.base.Function;
 import java.io.File;
 import java.io.FileInputStream;
@@ -61,14 +70,6 @@ import org.sonar.api.Plugin;
 import org.sonar.api.batch.debt.internal.DefaultDebtModel;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.Metric;
-import org.sonar.batch.bootstrapper.Batch;
-import org.sonar.batch.bootstrapper.EnvironmentInformation;
-import org.sonar.batch.bootstrapper.LogOutput;
-import org.sonar.batch.issue.tracking.ServerLineHashesLoader;
-import org.sonar.batch.report.ReportPublisher;
-import org.sonar.batch.repository.GlobalRepositoriesLoader;
-import org.sonar.batch.repository.ProjectRepositoriesLoader;
-import org.sonar.batch.repository.ServerIssuesLoader;
 
 /**
  * Main utility class for writing batch medium tests.
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/LogOutputRecorder.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/LogOutputRecorder.java
index edae5e47fb1..e720681e671 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/LogOutputRecorder.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/LogOutputRecorder.java
@@ -17,15 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest;
+package org.sonar.scanner.mediumtest;
 
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
-
+import org.sonar.batch.bootstrapper.LogOutput;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.HashMultimap;
-import org.sonar.batch.bootstrapper.LogOutput;
 
 public class LogOutputRecorder implements LogOutput {
   private Multimap<String, String> recordedByLevel = HashMultimap.create();
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/branch/BranchMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/branch/BranchMediumTest.java
index a0bd7cdf35a..0422dc07f57 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/branch/BranchMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/branch/BranchMediumTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.branch;
+package org.sonar.scanner.mediumtest.branch;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.File;
@@ -32,8 +32,8 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.TaskResult;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.xoo.XooPlugin;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/coverage/CoverageMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/coverage/CoverageMediumTest.java
index 68cae60f218..e5c5f0e99db 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/coverage/CoverageMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/coverage/CoverageMediumTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.coverage;
+package org.sonar.scanner.mediumtest.coverage;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.File;
@@ -31,8 +31,8 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.measures.CoreMetrics;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.TaskResult;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.xoo.XooPlugin;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/cpd/CpdMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/cpd/CpdMediumTest.java
index 19e2600ed25..81f3c2b451d 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/cpd/CpdMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/cpd/CpdMediumTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.cpd;
+package org.sonar.scanner.mediumtest.cpd;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.File;
@@ -25,7 +25,6 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 import org.apache.commons.io.FileUtils;
 import org.junit.After;
 import org.junit.Before;
@@ -38,16 +37,13 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
-import org.sonar.api.measures.CoreMetrics;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.TaskResult;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.scanner.protocol.output.ScannerReport;
-import org.sonar.scanner.protocol.output.ScannerReport.Measure;
 import org.sonar.xoo.XooPlugin;
 import org.sonar.xoo.lang.CpdTokenizerSensor;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.groups.Tuple.tuple;
 
 @RunWith(Parameterized.class)
 public class CpdMediumTest {
@@ -299,43 +295,6 @@ public class CpdMediumTest {
     assertThat(duplicationBlocks.get(0).getHash()).isNotEmpty();
   }
 
-  // SONAR-6000
-  @Test
-  public void truncateDuplication() throws IOException {
-    File srcDir = new File(baseDir, "src");
-    srcDir.mkdir();
-
-    String duplicatedStuff = "Sample xoo\n";
-
-    int blockCount = 10000;
-    File xooFile1 = new File(srcDir, "sample.xoo");
-    for (int i = 0; i < blockCount; i++) {
-      FileUtils.write(xooFile1, duplicatedStuff, true);
-      FileUtils.write(xooFile1, "" + i + "\n", true);
-    }
-
-    TaskResult result = tester.newTask()
-      .properties(builder
-        .put("sonar.sources", "src")
-        .put("sonar.cpd.xoo.minimumTokens", "1")
-        .put("sonar.cpd.xoo.minimumLines", "1")
-        .build())
-      .start();
-
-    Map<String, List<Measure>> allMeasures = result.allMeasures();
-
-    assertThat(allMeasures.get("com.foo.project")).extracting("metricKey").isEmpty();
-
-    assertThat(allMeasures.get("com.foo.project:src/sample.xoo")).extracting("metricKey", "intValue.value").containsOnly(
-      tuple(CoreMetrics.LINES_KEY, blockCount * 2 + 1));
-
-    List<org.sonar.scanner.protocol.output.ScannerReport.Duplication> duplicationGroups = result.duplicationsFor(result.inputFile("src/sample.xoo"));
-    assertThat(duplicationGroups).hasSize(1);
-
-    org.sonar.scanner.protocol.output.ScannerReport.Duplication cloneGroup = duplicationGroups.get(0);
-    assertThat(cloneGroup.getDuplicateList()).hasSize(100);
-  }
-
   @Test
   public void testIntraFileDuplications() throws IOException {
     File srcDir = new File(baseDir, "src");
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/deprecated/DeprecatedApiMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/deprecated/DeprecatedApiMediumTest.java
index 886647742bf..e8b8fa07735 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/deprecated/DeprecatedApiMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/deprecated/DeprecatedApiMediumTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.deprecated;
+package org.sonar.scanner.mediumtest.deprecated;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.File;
@@ -27,8 +27,8 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.TaskResult;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.xoo.XooPlugin;
 import org.sonar.xoo.rule.XooRulesDefinition;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/fs/FileSystemMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java
index dcb32c1030e..ae9795a9538 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/fs/FileSystemMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.fs;
+package org.sonar.scanner.mediumtest.fs;
 
 import com.google.common.collect.ImmutableMap;
 import org.apache.commons.io.FileUtils;
@@ -31,8 +31,8 @@ import org.junit.rules.TemporaryFolder;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.utils.MessageException;
 import org.sonar.api.utils.System2;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.TaskResult;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.xoo.XooPlugin;
 
 import java.io.File;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/fs/NoLanguagesPluginsMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/NoLanguagesPluginsMediumTest.java
index 90502c54ae8..c1e156e8af2 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/fs/NoLanguagesPluginsMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/NoLanguagesPluginsMediumTest.java
@@ -17,14 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.fs;
+package org.sonar.scanner.mediumtest.fs;
 
 import org.junit.rules.ExpectedException;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.FileFilterUtils;
-import org.sonar.batch.mediumtest.issuesmode.IssueModeAndReportsMediumTest;
-
 import java.io.File;
 
 import org.junit.After;
@@ -32,7 +30,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.Rule;
 import org.junit.rules.TemporaryFolder;
-import org.sonar.batch.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.issuesmode.IssueModeAndReportsMediumTest;
 
 public class NoLanguagesPluginsMediumTest {
   @Rule
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/fs/ProjectBuilderMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/ProjectBuilderMediumTest.java
index dc1ed8f9dce..b59787880a8 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/fs/ProjectBuilderMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/ProjectBuilderMediumTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.fs;
+package org.sonar.scanner.mediumtest.fs;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.File;
@@ -32,8 +32,8 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.utils.MessageException;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.TaskResult;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.scanner.protocol.output.ScannerReport.Issue;
 import org.sonar.xoo.XooPlugin;
 import org.sonar.xoo.rule.XooRulesDefinition;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/highlighting/HighlightingMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/highlighting/HighlightingMediumTest.java
index 3c83ed61fcf..aa07798bfaa 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/highlighting/HighlightingMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/highlighting/HighlightingMediumTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.highlighting;
+package org.sonar.scanner.mediumtest.highlighting;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.File;
@@ -33,8 +33,8 @@ import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.sensor.highlighting.TypeOfText;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.TaskResult;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.xoo.XooPlugin;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/ChecksMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/ChecksMediumTest.java
index 9a30bec5016..ac429a5ae9a 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/ChecksMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/ChecksMediumTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.issues;
+package org.sonar.scanner.mediumtest.issues;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.File;
@@ -32,10 +32,10 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.rule.RuleKey;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.TaskResult;
-import org.sonar.batch.rule.LoadedActiveRule;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.scanner.protocol.output.ScannerReport.Issue;
+import org.sonar.scanner.rule.LoadedActiveRule;
 import org.sonar.xoo.XooPlugin;
 import org.sonar.xoo.rule.XooRulesDefinition;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/IssuesIssuesModeMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/IssuesIssuesModeMediumTest.java
index cae361869cb..e126fd6e471 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/IssuesIssuesModeMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/IssuesIssuesModeMediumTest.java
@@ -17,21 +17,20 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.issues;
+package org.sonar.scanner.mediumtest.issues;
 
 import org.junit.rules.TemporaryFolder;
-import org.sonar.batch.bootstrapper.IssueListener;
 import org.junit.After;
 import org.junit.Before;
 import com.google.common.collect.ImmutableMap;
 import org.sonar.api.CoreProperties;
-import org.sonar.batch.mediumtest.BatchMediumTester;
+import org.sonar.batch.bootstrapper.IssueListener;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.xoo.XooPlugin;
 import org.sonar.xoo.rule.XooRulesDefinition;
 import org.apache.commons.io.FileUtils;
 import org.junit.Test;
-import org.sonar.batch.mediumtest.TaskResult;
-
 import java.io.File;
 import java.util.Date;
 import java.util.LinkedList;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/IssuesMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/IssuesMediumTest.java
index 69f3099977e..ffa97e299f5 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/IssuesMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/IssuesMediumTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.issues;
+package org.sonar.scanner.mediumtest.issues;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.File;
@@ -30,8 +30,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.batch.bootstrapper.IssueListener;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.TaskResult;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.scanner.protocol.output.ScannerReport.Issue;
 import org.sonar.xoo.XooPlugin;
 import org.sonar.xoo.rule.XooRulesDefinition;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/IssuesOnDirMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/IssuesOnDirMediumTest.java
index aae11ca0e39..e9ee9fa2bef 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/IssuesOnDirMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/IssuesOnDirMediumTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.issues;
+package org.sonar.scanner.mediumtest.issues;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.File;
@@ -27,8 +27,8 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.TaskResult;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.xoo.XooPlugin;
 import org.sonar.xoo.rule.XooRulesDefinition;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/IssuesOnModuleMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/IssuesOnModuleMediumTest.java
index 73434ed872d..eb35142bd4a 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/IssuesOnModuleMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/IssuesOnModuleMediumTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.issues;
+package org.sonar.scanner.mediumtest.issues;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.File;
@@ -27,8 +27,8 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.TaskResult;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.xoo.XooPlugin;
 import org.sonar.xoo.rule.XooRulesDefinition;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/MultilineIssuesMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/MultilineIssuesMediumTest.java
index 476266c0868..fcb00486a56 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issues/MultilineIssuesMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/MultilineIssuesMediumTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.issues;
+package org.sonar.scanner.mediumtest.issues;
 
 import java.io.File;
 import java.util.List;
@@ -26,8 +26,8 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.TaskResult;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.scanner.protocol.output.ScannerReport.Flow;
 import org.sonar.scanner.protocol.output.ScannerReport.Issue;
 import org.sonar.scanner.protocol.output.ScannerReport.IssueLocation;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issuesmode/EmptyFileTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/EmptyFileTest.java
index 22eb34b4c22..9bd3670e6bb 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issuesmode/EmptyFileTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/EmptyFileTest.java
@@ -17,9 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.issuesmode;
-
-import org.sonar.batch.issue.tracking.TrackedIssue;
+package org.sonar.scanner.mediumtest.issuesmode;
 
 import org.apache.commons.io.filefilter.FileFilterUtils;
 import org.apache.commons.io.FileUtils;
@@ -32,8 +30,9 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.utils.log.LogTester;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.TaskResult;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.xoo.XooPlugin;
 
 import java.io.File;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issuesmode/IssueModeAndReportsMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/IssueModeAndReportsMediumTest.java
index c3ba10d7abc..031c2cf4472 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issuesmode/IssueModeAndReportsMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/IssueModeAndReportsMediumTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.issuesmode;
+package org.sonar.scanner.mediumtest.issuesmode;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.File;
@@ -40,12 +40,12 @@ import org.sonar.api.CoreProperties;
 import org.sonar.api.utils.log.LogTester;
 import org.sonar.api.utils.log.LoggerLevel;
 import org.sonar.batch.bootstrapper.IssueListener;
-import org.sonar.batch.issue.tracking.TrackedIssue;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.TaskResult;
-import org.sonar.batch.scan.report.ConsoleReport;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.scanner.protocol.Constants.Severity;
 import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
+import org.sonar.scanner.scan.report.ConsoleReport;
 import org.sonar.xoo.XooPlugin;
 import org.sonar.xoo.rule.XooRulesDefinition;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issuesmode/NoPreviousAnalysisTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/NoPreviousAnalysisTest.java
index fa133979562..00762818175 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issuesmode/NoPreviousAnalysisTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/NoPreviousAnalysisTest.java
@@ -17,9 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.issuesmode;
+package org.sonar.scanner.mediumtest.issuesmode;
 
-import org.sonar.batch.mediumtest.TaskResult;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.FileFilterUtils;
 
@@ -35,7 +34,8 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.utils.log.LogTester;
-import org.sonar.batch.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.xoo.XooPlugin;
 import org.sonar.xoo.rule.XooRulesDefinition;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issuesmode/ScanOnlyChangedTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/ScanOnlyChangedTest.java
index 26d1c3653cc..d67d035627f 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/issuesmode/ScanOnlyChangedTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/ScanOnlyChangedTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.issuesmode;
+package org.sonar.scanner.mediumtest.issuesmode;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Resources;
@@ -36,12 +36,12 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.utils.log.LogTester;
-import org.sonar.batch.issue.tracking.TrackedIssue;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.TaskResult;
-import org.sonar.batch.repository.FileData;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.scanner.protocol.Constants.Severity;
 import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
+import org.sonar.scanner.repository.FileData;
 import org.sonar.xoo.XooPlugin;
 import org.sonar.xoo.rule.XooRulesDefinition;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/log/ExceptionHandlingMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/log/ExceptionHandlingMediumTest.java
index 2e2d8ea4c47..f552f33f421 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/log/ExceptionHandlingMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/log/ExceptionHandlingMediumTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.log;
+package org.sonar.scanner.mediumtest.log;
 
 import java.util.Collections;
 
@@ -25,11 +25,11 @@ import org.hamcrest.Matchers;
 import org.hamcrest.Description;
 import org.hamcrest.TypeSafeMatcher;
 import org.junit.BeforeClass;
-import org.sonar.batch.bootstrapper.EnvironmentInformation;
 import org.sonar.api.utils.MessageException;
-import org.sonar.batch.repository.GlobalRepositoriesLoader;
-import org.sonar.scanner.protocol.input.GlobalRepositories;
 import org.sonar.batch.bootstrapper.Batch;
+import org.sonar.batch.bootstrapper.EnvironmentInformation;
+import org.sonar.scanner.protocol.input.GlobalRepositories;
+import org.sonar.scanner.repository.GlobalRepositoriesLoader;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/log/LogListenerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/log/LogListenerTest.java
index eae87fdaa2d..2719c3361bd 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/log/LogListenerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/log/LogListenerTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.log;
+package org.sonar.scanner.mediumtest.log;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.ByteArrayOutputStream;
@@ -39,7 +39,7 @@ import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.batch.bootstrapper.LogOutput;
 import org.sonar.batch.bootstrapper.LogOutput.Level;
-import org.sonar.batch.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
 import org.sonar.xoo.XooPlugin;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/measures/MeasuresMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/measures/MeasuresMediumTest.java
index 00e7ee34ab5..c2f6158a808 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/measures/MeasuresMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/measures/MeasuresMediumTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.measures;
+package org.sonar.scanner.mediumtest.measures;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.File;
@@ -30,8 +30,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.measures.CoreMetrics;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.TaskResult;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.scanner.protocol.output.ScannerReport.Measure;
 import org.sonar.xoo.XooPlugin;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/scm/ScmMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/scm/ScmMediumTest.java
index 2f045e2adfb..9adf9ad9c34 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/scm/ScmMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/scm/ScmMediumTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.scm;
+package org.sonar.scanner.mediumtest.scm;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.File;
@@ -32,11 +32,11 @@ import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.utils.PathUtils;
 import org.sonar.api.utils.log.LogTester;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.BatchMediumTester.TaskBuilder;
-import org.sonar.batch.repository.FileData;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.BatchMediumTester.TaskBuilder;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReport.Changesets.Changeset;
+import org.sonar.scanner.repository.FileData;
 import org.sonar.scanner.protocol.output.ScannerReport.Component;
 import org.sonar.scanner.protocol.output.ScannerReportReader;
 import org.sonar.xoo.XooPlugin;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/symbol/SymbolMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/symbol/SymbolMediumTest.java
index 8d9836f994d..7988dd42542 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/symbol/SymbolMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/symbol/SymbolMediumTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.symbol;
+package org.sonar.scanner.mediumtest.symbol;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.File;
@@ -28,8 +28,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.batch.fs.InputFile;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.TaskResult;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.xoo.XooPlugin;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/tasks/TasksMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/tasks/TasksMediumTest.java
index 0918a21db03..735d5ed0b43 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/tasks/TasksMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/tasks/TasksMediumTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.tasks;
+package org.sonar.scanner.mediumtest.tasks;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Arrays;
@@ -32,8 +32,8 @@ import org.sonar.api.task.Task;
 import org.sonar.api.task.TaskDefinition;
 import org.sonar.api.utils.MessageException;
 import org.sonar.api.utils.log.LogTester;
-import org.sonar.batch.bootstrap.MockHttpServer;
-import org.sonar.batch.mediumtest.BatchMediumTester;
+import org.sonar.scanner.bootstrap.MockHttpServer;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -86,7 +86,7 @@ public class TasksMediumTest {
 
     thrown.expect(IllegalStateException.class);
     thrown.expectMessage(
-      "Unable to load component class org.sonar.batch.mediumtest.tasks.TasksMediumTest$BrokenTask");
+      "Unable to load component class org.sonar.scanner.mediumtest.tasks.TasksMediumTest$BrokenTask");
 
     tester.newTask()
       .properties(ImmutableMap.<String, String>builder()
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/tests/CoveragePerTestMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/tests/CoveragePerTestMediumTest.java
index d62d978ecaf..bc32a1c5ac6 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/tests/CoveragePerTestMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/tests/CoveragePerTestMediumTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.tests;
+package org.sonar.scanner.mediumtest.tests;
 
 import org.hamcrest.Description;
 
@@ -31,8 +31,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.batch.fs.InputFile;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.TaskResult;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.xoo.XooPlugin;
 
 import java.io.File;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/tests/TestExecutionMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/tests/TestExecutionMediumTest.java
index 328ba392561..22d858e8671 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/mediumtest/tests/TestExecutionMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/tests/TestExecutionMediumTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.mediumtest.tests;
+package org.sonar.scanner.mediumtest.tests;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.File;
@@ -28,8 +28,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.batch.fs.InputFile;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.TaskResult;
+import org.sonar.scanner.mediumtest.BatchMediumTester;
+import org.sonar.scanner.mediumtest.TaskResult;
 import org.sonar.scanner.protocol.output.ScannerReport.Test.TestStatus;
 import org.sonar.xoo.XooPlugin;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/phases/PostJobsExecutorTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/phases/PostJobsExecutorTest.java
index f9fda97b21c..fff15a158d9 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/phases/PostJobsExecutorTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/phases/PostJobsExecutorTest.java
@@ -17,16 +17,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.phases;
+package org.sonar.scanner.phases;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.sonar.api.batch.PostJob;
 import org.sonar.api.batch.SensorContext;
 import org.sonar.api.resources.Project;
-import org.sonar.batch.bootstrap.BatchExtensionDictionnary;
-import org.sonar.batch.events.EventBus;
-
+import org.sonar.scanner.bootstrap.BatchExtensionDictionnary;
+import org.sonar.scanner.events.EventBus;
+import org.sonar.scanner.phases.PostJobsExecutor;
 import java.util.Arrays;
 
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/platform/DefaultServerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/platform/DefaultServerTest.java
index c3df69af094..59fbb89ff8c 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/platform/DefaultServerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/platform/DefaultServerTest.java
@@ -17,12 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.platform;
+package org.sonar.scanner.platform;
 
 import org.junit.Test;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.config.Settings;
-import org.sonar.batch.bootstrap.BatchWsClient;
+import org.sonar.scanner.bootstrap.BatchWsClient;
+import org.sonar.scanner.platform.DefaultServer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/postjob/DefaultPostJobContextTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/postjob/DefaultPostJobContextTest.java
index 803b6177eb7..caa182c49c2 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/postjob/DefaultPostJobContextTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/postjob/DefaultPostJobContextTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.postjob;
+package org.sonar.scanner.postjob;
 
 import java.util.Arrays;
 import org.junit.Before;
@@ -28,9 +28,10 @@ import org.sonar.api.batch.postjob.issue.PostJobIssue;
 import org.sonar.api.batch.rule.Severity;
 import org.sonar.api.config.Settings;
 import org.sonar.api.resources.File;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.issue.IssueCache;
-import org.sonar.batch.issue.tracking.TrackedIssue;
+import org.sonar.scanner.index.BatchComponentCache;
+import org.sonar.scanner.issue.IssueCache;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
+import org.sonar.scanner.postjob.DefaultPostJobContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/postjob/PostJobOptimizerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/postjob/PostJobOptimizerTest.java
index 3420e45f209..3875f6974f0 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/postjob/PostJobOptimizerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/postjob/PostJobOptimizerTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.postjob;
+package org.sonar.scanner.postjob;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -25,6 +25,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.sonar.api.batch.postjob.internal.DefaultPostJobDescriptor;
 import org.sonar.api.config.Settings;
+import org.sonar.scanner.postjob.PostJobOptimizer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/profiling/PhasesSumUpTimeProfilerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/profiling/PhasesSumUpTimeProfilerTest.java
index 9c8e4ed8d56..9f31c75f631 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/profiling/PhasesSumUpTimeProfilerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/profiling/PhasesSumUpTimeProfilerTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.profiling;
+package org.sonar.scanner.profiling;
 
 import com.google.common.collect.Maps;
 import java.util.Arrays;
@@ -48,8 +48,11 @@ import org.sonar.api.batch.events.SensorsPhaseHandler;
 import org.sonar.api.batch.events.SensorsPhaseHandler.SensorsPhaseEvent;
 import org.sonar.api.resources.Project;
 import org.sonar.api.utils.System2;
-import org.sonar.batch.bootstrap.GlobalProperties;
-import org.sonar.batch.events.BatchStepEvent;
+import org.sonar.scanner.bootstrap.GlobalProperties;
+import org.sonar.scanner.events.BatchStepEvent;
+import org.sonar.scanner.profiling.AbstractTimeProfiling;
+import org.sonar.scanner.profiling.Phase;
+import org.sonar.scanner.profiling.PhasesSumUpTimeProfiler;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.spy;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/report/ActiveRulesPublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/ActiveRulesPublisherTest.java
index eb747ac0a2c..b5331114a05 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/report/ActiveRulesPublisherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/ActiveRulesPublisherTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.report;
+package org.sonar.scanner.report;
 
 import java.io.File;
 import java.util.Arrays;
@@ -34,6 +34,7 @@ import org.sonar.scanner.protocol.Constants;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReportReader;
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
+import org.sonar.scanner.report.ActiveRulesPublisher;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/report/AnalysisContextReportPublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/AnalysisContextReportPublisherTest.java
index 15bae3ea270..67a4906f974 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/report/AnalysisContextReportPublisherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/AnalysisContextReportPublisherTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.report;
+package org.sonar.scanner.report;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Arrays;
@@ -34,11 +34,12 @@ import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.log.LogTester;
 import org.sonar.api.utils.log.LoggerLevel;
-import org.sonar.batch.bootstrap.BatchPluginRepository;
-import org.sonar.batch.repository.ProjectRepositories;
 import org.sonar.core.platform.PluginInfo;
+import org.sonar.scanner.bootstrap.BatchPluginRepository;
 import org.sonar.scanner.protocol.input.GlobalRepositories;
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
+import org.sonar.scanner.report.AnalysisContextReportPublisher;
+import org.sonar.scanner.repository.ProjectRepositories;
 import org.sonar.updatecenter.common.Version;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/report/ComponentsPublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/ComponentsPublisherTest.java
index d2260c3e070..7929b0ebe4f 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/report/ComponentsPublisherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/ComponentsPublisherTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.report;
+package org.sonar.scanner.report;
 
 import java.io.File;
 import org.junit.Rule;
@@ -31,12 +31,13 @@ import org.sonar.api.batch.fs.internal.DefaultInputModule;
 import org.sonar.api.resources.Directory;
 import org.sonar.api.resources.Project;
 import org.sonar.api.utils.DateUtils;
-import org.sonar.batch.FakeJava;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.scan.ImmutableProjectReactor;
+import org.sonar.scanner.FakeJava;
+import org.sonar.scanner.index.BatchComponentCache;
 import org.sonar.scanner.protocol.output.FileStructure;
 import org.sonar.scanner.protocol.output.ScannerReport.Component;
 import org.sonar.scanner.protocol.output.ScannerReport.ComponentLink.ComponentLinkType;
+import org.sonar.scanner.report.ComponentsPublisher;
+import org.sonar.scanner.scan.ImmutableProjectReactor;
 import org.sonar.scanner.protocol.output.ScannerReportReader;
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/report/CoveragePublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/CoveragePublisherTest.java
index b040483a57b..d465419e59b 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/report/CoveragePublisherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/CoveragePublisherTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.report;
+package org.sonar.scanner.report;
 
 import java.io.File;
 import java.util.Date;
@@ -30,10 +30,11 @@ import org.sonar.api.batch.fs.internal.DefaultInputModule;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.Measure;
 import org.sonar.api.resources.Project;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.scan.measure.MeasureCache;
 import org.sonar.core.util.CloseableIterator;
 import org.sonar.scanner.protocol.output.ScannerReport.LineCoverage;
+import org.sonar.scanner.report.CoveragePublisher;
+import org.sonar.scanner.scan.measure.MeasureCache;
+import org.sonar.scanner.index.BatchComponentCache;
 import org.sonar.scanner.protocol.output.ScannerReportReader;
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/report/MeasuresPublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/MeasuresPublisherTest.java
index 268538acff8..b11d262f7eb 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/report/MeasuresPublisherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/MeasuresPublisherTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.report;
+package org.sonar.scanner.report;
 
 import java.io.File;
 import java.util.Collections;
@@ -32,13 +32,14 @@ import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.Measure;
 import org.sonar.api.resources.Project;
 import org.sonar.api.resources.Resource;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.scan.measure.MeasureCache;
 import org.sonar.core.metric.ScannerMetrics;
 import org.sonar.core.util.CloseableIterator;
+import org.sonar.scanner.index.BatchComponentCache;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReportReader;
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
+import org.sonar.scanner.report.MeasuresPublisher;
+import org.sonar.scanner.scan.measure.MeasureCache;
 
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/report/MetadataPublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/MetadataPublisherTest.java
index dd2fe0b7b6d..d88135649a9 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/report/MetadataPublisherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/MetadataPublisherTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.report;
+package org.sonar.scanner.report;
 
 import java.io.File;
 import java.util.Date;
@@ -29,13 +29,14 @@ import org.sonar.api.CoreProperties;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.config.Settings;
 import org.sonar.api.resources.Project;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.rule.ModuleQProfiles;
-import org.sonar.batch.rule.QProfile;
-import org.sonar.batch.scan.ImmutableProjectReactor;
+import org.sonar.scanner.index.BatchComponentCache;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReportReader;
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
+import org.sonar.scanner.report.MetadataPublisher;
+import org.sonar.scanner.rule.ModuleQProfiles;
+import org.sonar.scanner.rule.QProfile;
+import org.sonar.scanner.scan.ImmutableProjectReactor;
 
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/report/ReportPublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/ReportPublisherTest.java
index f48e7f05717..4f8dcd58f19 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/report/ReportPublisherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/ReportPublisherTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.report;
+package org.sonar.scanner.report;
 
 import java.io.File;
 import java.io.IOException;
@@ -37,10 +37,13 @@ import org.sonar.api.utils.MessageException;
 import org.sonar.api.utils.TempFolder;
 import org.sonar.api.utils.log.LogTester;
 import org.sonar.api.utils.log.LoggerLevel;
-import org.sonar.batch.analysis.DefaultAnalysisMode;
-import org.sonar.batch.bootstrap.BatchWsClient;
-import org.sonar.batch.scan.ImmutableProjectReactor;
 import org.sonar.core.config.CorePropertyDefinitions;
+import org.sonar.scanner.analysis.DefaultAnalysisMode;
+import org.sonar.scanner.bootstrap.BatchWsClient;
+import org.sonar.scanner.report.AnalysisContextReportPublisher;
+import org.sonar.scanner.report.ReportPublisher;
+import org.sonar.scanner.report.ReportPublisherStep;
+import org.sonar.scanner.scan.ImmutableProjectReactor;
 
 import static org.apache.commons.io.FileUtils.readFileToString;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/report/SourcePublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/SourcePublisherTest.java
index 683d6fecb8a..e16b36173ef 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/report/SourcePublisherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/SourcePublisherTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.report;
+package org.sonar.scanner.report;
 
 import java.io.File;
 import java.io.IOException;
@@ -32,8 +32,9 @@ import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.batch.fs.internal.DefaultInputModule;
 import org.sonar.api.resources.Project;
 import org.sonar.api.resources.Qualifiers;
-import org.sonar.batch.index.BatchComponentCache;
+import org.sonar.scanner.index.BatchComponentCache;
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
+import org.sonar.scanner.report.SourcePublisher;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/DefaultGlobalRepositoriesLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultGlobalRepositoriesLoaderTest.java
index b85f3d6481c..bca63c154e8 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/DefaultGlobalRepositoriesLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultGlobalRepositoriesLoaderTest.java
@@ -17,16 +17,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository;
+package org.sonar.scanner.repository;
 
+import java.io.StringReader;
 import org.junit.Before;
 import org.junit.Test;
-import org.sonar.batch.WsTestUtil;
-import org.sonar.batch.bootstrap.BatchWsClient;
+import org.sonar.scanner.WsTestUtil;
+import org.sonar.scanner.bootstrap.BatchWsClient;
 import org.sonar.scanner.protocol.input.GlobalRepositories;
 
-import java.io.StringReader;
-
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultProjectRepositoriesLoaderTest.java
index b92301c2647..b66e883ebe1 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultProjectRepositoriesLoaderTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository;
+package org.sonar.scanner.repository;
 
 import com.google.common.io.Resources;
 import java.io.ByteArrayInputStream;
@@ -29,8 +29,11 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.sonar.api.utils.MessageException;
-import org.sonar.batch.WsTestUtil;
-import org.sonar.batch.bootstrap.BatchWsClient;
+import org.sonar.scanner.WsTestUtil;
+import org.sonar.scanner.bootstrap.BatchWsClient;
+import org.sonar.scanner.repository.DefaultProjectRepositoriesLoader;
+import org.sonar.scanner.repository.FileData;
+import org.sonar.scanner.repository.ProjectRepositories;
 import org.sonarqube.ws.WsBatch.WsProjectResponse;
 import org.sonarqube.ws.client.HttpException;
 import org.sonarqube.ws.client.WsRequest;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/DefaultQualityProfileLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultQualityProfileLoaderTest.java
index 8110c2a273f..448b47c1426 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/DefaultQualityProfileLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultQualityProfileLoaderTest.java
@@ -17,15 +17,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository;
+package org.sonar.scanner.repository;
 
 import org.sonar.api.utils.MessageException;
 
 import org.sonarqube.ws.QualityProfiles;
 import com.google.common.io.Resources;
 import org.sonarqube.ws.QualityProfiles.SearchWsResponse.QualityProfile;
-import org.sonar.batch.WsTestUtil;
-import org.sonar.batch.bootstrap.BatchWsClient;
+import org.sonar.scanner.WsTestUtil;
+import org.sonar.scanner.bootstrap.BatchWsClient;
+import org.sonar.scanner.repository.DefaultQualityProfileLoader;
 import org.junit.Rule;
 import org.junit.rules.ExpectedException;
 import org.junit.Before;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/DefaultServerIssuesLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultServerIssuesLoaderTest.java
index a2e978b3b4d..1eade771f6a 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/DefaultServerIssuesLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultServerIssuesLoaderTest.java
@@ -17,12 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository;
+package org.sonar.scanner.repository;
 
-import org.sonar.batch.WsTestUtil;
-import org.sonar.batch.bootstrap.BatchWsClient;
+import org.sonar.scanner.WsTestUtil;
+import org.sonar.scanner.bootstrap.BatchWsClient;
 import org.sonar.scanner.protocol.input.ScannerInput;
 import org.sonar.scanner.protocol.input.ScannerInput.ServerIssue;
+import org.sonar.scanner.repository.DefaultServerIssuesLoader;
 import com.google.common.base.Function;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/ProjectRepositoriesProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/ProjectRepositoriesProviderTest.java
index cb0490f79f5..c170a4fdd2a 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/ProjectRepositoriesProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/ProjectRepositoriesProviderTest.java
@@ -17,11 +17,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository;
+package org.sonar.scanner.repository;
 
 import java.util.Date;
-
-import org.sonar.batch.repository.FileData;
 import com.google.common.collect.Table;
 import com.google.common.collect.HashBasedTable;
 import org.junit.Before;
@@ -29,7 +27,12 @@ import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.sonar.api.batch.bootstrap.ProjectKey;
-import org.sonar.batch.analysis.DefaultAnalysisMode;
+import org.sonar.scanner.analysis.DefaultAnalysisMode;
+import org.sonar.scanner.repository.FileData;
+import org.sonar.scanner.repository.ProjectRepositories;
+import org.sonar.scanner.repository.ProjectRepositoriesLoader;
+import org.sonar.scanner.repository.ProjectRepositoriesProvider;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.times;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/QualityProfileProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/QualityProfileProviderTest.java
index bdbdb0ea703..e48ae464e58 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/QualityProfileProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/QualityProfileProviderTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository;
+package org.sonar.scanner.repository;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
@@ -30,9 +30,12 @@ import org.mockito.MockitoAnnotations;
 import org.sonar.api.batch.bootstrap.ProjectKey;
 import org.sonar.api.utils.log.LogTester;
 import org.sonar.api.utils.log.LoggerLevel;
-import org.sonar.batch.analysis.AnalysisProperties;
-import org.sonar.batch.analysis.DefaultAnalysisMode;
-import org.sonar.batch.rule.ModuleQProfiles;
+import org.sonar.scanner.analysis.AnalysisProperties;
+import org.sonar.scanner.analysis.DefaultAnalysisMode;
+import org.sonar.scanner.repository.ProjectRepositories;
+import org.sonar.scanner.repository.QualityProfileLoader;
+import org.sonar.scanner.repository.QualityProfileProvider;
+import org.sonar.scanner.rule.ModuleQProfiles;
 import org.sonarqube.ws.QualityProfiles.SearchWsResponse.QualityProfile;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/user/UserRepositoryLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/user/UserRepositoryLoaderTest.java
index 4b8982a8e74..3195a904e68 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/repository/user/UserRepositoryLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/user/UserRepositoryLoaderTest.java
@@ -17,13 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.repository.user;
+package org.sonar.scanner.repository.user;
 
 import org.assertj.core.util.Lists;
-
+import org.sonar.scanner.bootstrap.BatchWsClient;
 import org.sonar.scanner.protocol.input.ScannerInput;
-import org.sonar.batch.WsTestUtil;
-import org.sonar.batch.bootstrap.BatchWsClient;
+import org.sonar.scanner.repository.user.UserRepositoryLoader;
+import org.sonar.scanner.WsTestUtil;
 import org.junit.Before;
 import com.google.common.collect.ImmutableMap;
 import org.junit.rules.ExpectedException;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/ActiveRulesProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/ActiveRulesProviderTest.java
index 9e1c3b70504..8a749037dee 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/ActiveRulesProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/ActiveRulesProviderTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.rule;
+package org.sonar.scanner.rule;
 
 import com.google.common.collect.ImmutableList;
 import java.util.LinkedList;
@@ -29,6 +29,10 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.sonar.api.batch.rule.ActiveRules;
 import org.sonar.api.rule.RuleKey;
+import org.sonar.scanner.rule.ActiveRulesProvider;
+import org.sonar.scanner.rule.DefaultActiveRulesLoader;
+import org.sonar.scanner.rule.LoadedActiveRule;
+import org.sonar.scanner.rule.ModuleQProfiles;
 import org.sonarqube.ws.QualityProfiles.SearchWsResponse.QualityProfile;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/DefaultActiveRulesLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/DefaultActiveRulesLoaderTest.java
index 40f2c462dd2..5b7f1b6bc61 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/DefaultActiveRulesLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/DefaultActiveRulesLoaderTest.java
@@ -17,11 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.rule;
+package org.sonar.scanner.rule;
 
 import org.sonar.api.rule.RuleKey;
-import org.sonar.batch.WsTestUtil;
-import org.sonar.batch.bootstrap.BatchWsClient;
+import org.sonar.scanner.WsTestUtil;
+import org.sonar.scanner.bootstrap.BatchWsClient;
+import org.sonar.scanner.rule.DefaultActiveRulesLoader;
+import org.sonar.scanner.rule.LoadedActiveRule;
 import com.google.common.io.Resources;
 import org.junit.Test;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/DefaultRulesLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/DefaultRulesLoaderTest.java
index ceaa22a494b..93b88fada89 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/DefaultRulesLoaderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/DefaultRulesLoaderTest.java
@@ -17,12 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.rule;
+package org.sonar.scanner.rule;
 
 import static org.mockito.Mockito.mock;
 import org.junit.rules.ExpectedException;
-import org.sonar.batch.WsTestUtil;
-import org.sonar.batch.bootstrap.BatchWsClient;
+import org.sonar.scanner.WsTestUtil;
+import org.sonar.scanner.bootstrap.BatchWsClient;
+import org.sonar.scanner.rule.DefaultRulesLoader;
 import org.sonarqube.ws.Rules.ListResponse.Rule;
 import com.google.common.io.ByteSource;
 import com.google.common.io.Resources;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/QProfileVerifierTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/QProfileVerifierTest.java
index 9df8cd75491..00c9ea3d8dd 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/QProfileVerifierTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/QProfileVerifierTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.rule;
+package org.sonar.scanner.rule;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -28,6 +28,9 @@ import org.slf4j.Logger;
 import org.sonar.api.batch.fs.internal.DefaultFileSystem;
 import org.sonar.api.config.Settings;
 import org.sonar.api.utils.MessageException;
+import org.sonar.scanner.rule.ModuleQProfiles;
+import org.sonar.scanner.rule.QProfile;
+import org.sonar.scanner.rule.QProfileVerifier;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/RuleFinderCompatibilityTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/RuleFinderCompatibilityTest.java
index abc5f5dfd75..b3ced1534fb 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/RuleFinderCompatibilityTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/RuleFinderCompatibilityTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.rule;
+package org.sonar.scanner.rule;
 
 import org.sonar.api.batch.rule.internal.RulesBuilder;
 
@@ -28,6 +28,8 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rules.RuleQuery;
+import org.sonar.scanner.rule.RuleFinderCompatibility;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class RuleFinderCompatibilityTest {
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/RulesProfileProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/RulesProfileProviderTest.java
index 208a187a966..3dc3651276b 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/RulesProfileProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/RulesProfileProviderTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.rule;
+package org.sonar.scanner.rule;
 
 import java.util.Arrays;
 import org.junit.Test;
@@ -25,6 +25,10 @@ import org.sonar.api.batch.rule.internal.ActiveRulesBuilder;
 import org.sonar.api.config.Settings;
 import org.sonar.api.profiles.RulesProfile;
 import org.sonar.api.rule.RuleKey;
+import org.sonar.scanner.rule.ModuleQProfiles;
+import org.sonar.scanner.rule.QProfile;
+import org.sonar.scanner.rule.RulesProfileProvider;
+import org.sonar.scanner.rule.RulesProfileWrapper;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/RulesProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/RulesProviderTest.java
index fcf2133be83..d1ac293ccfc 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/rule/RulesProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/RulesProviderTest.java
@@ -17,10 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.rule;
+package org.sonar.scanner.rule;
 
 import com.google.common.collect.Lists;
 import org.sonar.api.batch.rule.Rules;
+import org.sonar.scanner.rule.RulesLoader;
+import org.sonar.scanner.rule.RulesProvider;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/LanguageVerifierTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/LanguageVerifierTest.java
index 55d8264b3ef..652a7c106a7 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/LanguageVerifierTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/LanguageVerifierTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -28,9 +28,9 @@ import org.sonar.api.batch.fs.internal.DefaultFileSystem;
 import org.sonar.api.config.Settings;
 import org.sonar.api.resources.Languages;
 import org.sonar.api.utils.MessageException;
-import org.sonar.batch.FakeJava;
-import org.sonar.batch.repository.language.DefaultLanguagesRepository;
-import org.sonar.batch.repository.language.LanguagesRepository;
+import org.sonar.scanner.FakeJava;
+import org.sonar.scanner.repository.language.DefaultLanguagesRepository;
+import org.sonar.scanner.repository.language.LanguagesRepository;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ModuleSettingsTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ModuleSettingsTest.java
index 88fb18f06a4..05c1e9f5724 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ModuleSettingsTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ModuleSettingsTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.ImmutableMap;
@@ -32,11 +32,12 @@ import org.junit.rules.ExpectedException;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.config.PropertyDefinitions;
 import org.sonar.api.utils.MessageException;
-import org.sonar.batch.analysis.DefaultAnalysisMode;
-import org.sonar.batch.bootstrap.GlobalSettings;
-import org.sonar.batch.report.AnalysisContextReportPublisher;
-import org.sonar.batch.repository.FileData;
-import org.sonar.batch.repository.ProjectRepositories;
+import org.sonar.scanner.analysis.DefaultAnalysisMode;
+import org.sonar.scanner.bootstrap.GlobalSettings;
+import org.sonar.scanner.report.AnalysisContextReportPublisher;
+import org.sonar.scanner.repository.FileData;
+import org.sonar.scanner.repository.ProjectRepositories;
+import org.sonar.scanner.scan.ModuleSettings;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectLockTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ProjectLockTest.java
index c03240b7341..dc72bc55305 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectLockTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ProjectLockTest.java
@@ -17,13 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
 import org.junit.rules.ExpectedException;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.batch.bootstrap.ProjectReactor;
 import org.sonar.home.cache.DirectoryLock;
-
+import org.sonar.scanner.scan.ProjectLock;
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectReactorBuilderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ProjectReactorBuilderTest.java
index f796cd246a8..f87dc5db8db 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectReactorBuilderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ProjectReactorBuilderTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
 import com.google.common.collect.Maps;
 import java.io.File;
@@ -38,7 +38,8 @@ import org.sonar.api.batch.bootstrap.ProjectReactor;
 import org.sonar.api.utils.MessageException;
 import org.sonar.api.utils.log.LogTester;
 import org.sonar.api.utils.log.LoggerLevel;
-import org.sonar.batch.analysis.AnalysisProperties;
+import org.sonar.scanner.analysis.AnalysisProperties;
+import org.sonar.scanner.scan.ProjectReactorBuilder;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectReactorValidatorTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ProjectReactorValidatorTest.java
index fd5882467b5..35648c6c72e 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectReactorValidatorTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ProjectReactorValidatorTest.java
@@ -17,12 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
 import static org.mockito.Mockito.when;
 
 import org.sonar.api.utils.MessageException;
-
+import org.sonar.scanner.analysis.DefaultAnalysisMode;
+import org.sonar.scanner.scan.ProjectReactorValidator;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -31,7 +32,7 @@ import org.sonar.api.CoreProperties;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.batch.bootstrap.ProjectReactor;
 import org.sonar.api.config.Settings;
-import org.sonar.batch.analysis.DefaultAnalysisMode;
+
 import static org.mockito.Mockito.mock;
 
 public class ProjectReactorValidatorTest {
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectScanContainerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ProjectScanContainerTest.java
index 512462923a1..22c294a78ca 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectScanContainerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ProjectScanContainerTest.java
@@ -17,13 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
 import org.junit.Test;
 import org.sonar.api.BatchExtension;
 import org.sonar.api.ServerExtension;
 import org.sonar.api.batch.InstantiationStrategy;
 import org.sonar.api.task.TaskExtension;
+import org.sonar.scanner.scan.ProjectScanContainer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectSettingsTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ProjectSettingsTest.java
index 7f9c6eecc4c..e28b44a5f61 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/ProjectSettingsTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ProjectSettingsTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.ImmutableTable;
@@ -33,13 +33,14 @@ import org.sonar.api.batch.bootstrap.ProjectReactor;
 import org.sonar.api.config.PropertyDefinitions;
 import org.sonar.api.utils.MessageException;
 import org.sonar.api.utils.log.LogTester;
-import org.sonar.batch.analysis.DefaultAnalysisMode;
-import org.sonar.batch.bootstrap.GlobalMode;
-import org.sonar.batch.bootstrap.GlobalProperties;
-import org.sonar.batch.bootstrap.GlobalSettings;
-import org.sonar.batch.repository.FileData;
-import org.sonar.batch.repository.ProjectRepositories;
+import org.sonar.scanner.analysis.DefaultAnalysisMode;
+import org.sonar.scanner.bootstrap.GlobalMode;
+import org.sonar.scanner.bootstrap.GlobalProperties;
+import org.sonar.scanner.bootstrap.GlobalSettings;
 import org.sonar.scanner.protocol.input.GlobalRepositories;
+import org.sonar.scanner.repository.FileData;
+import org.sonar.scanner.repository.ProjectRepositories;
+import org.sonar.scanner.scan.ProjectSettings;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/WorkDirectoryCleanerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/WorkDirectoryCleanerTest.java
index 8bd3d5c4e3a..c8b1cf38008 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/WorkDirectoryCleanerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/WorkDirectoryCleanerTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan;
+package org.sonar.scanner.scan;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -26,7 +26,7 @@ import org.junit.rules.TemporaryFolder;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.batch.bootstrap.ProjectReactor;
 import org.sonar.home.cache.DirectoryLock;
-
+import org.sonar.scanner.scan.WorkDirectoryCleaner;
 import java.io.File;
 import java.io.IOException;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/AdditionalFilePredicatesTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/AdditionalFilePredicatesTest.java
index c093056c2eb..4d4e77f8814 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/AdditionalFilePredicatesTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/AdditionalFilePredicatesTest.java
@@ -17,11 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import org.junit.Test;
 import org.sonar.api.batch.fs.FilePredicate;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
+import org.sonar.scanner.scan.filesystem.AdditionalFilePredicates;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/ComponentIndexerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/ComponentIndexerTest.java
index 01228186217..dc09e7942d9 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/ComponentIndexerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/ComponentIndexerTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import java.io.File;
 import java.io.IOException;
@@ -37,11 +37,15 @@ import org.sonar.api.resources.Languages;
 import org.sonar.api.resources.Project;
 import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.resources.Resource;
-import org.sonar.batch.FakeJava;
-import org.sonar.batch.analysis.DefaultAnalysisMode;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.index.DefaultIndex;
+import org.sonar.scanner.FakeJava;
+import org.sonar.scanner.analysis.DefaultAnalysisMode;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponentCache;
+import org.sonar.scanner.index.DefaultIndex;
+import org.sonar.scanner.scan.filesystem.ComponentIndexer;
+import org.sonar.scanner.scan.filesystem.DefaultModuleFileSystem;
+import org.sonar.scanner.scan.filesystem.FileIndexer;
+import org.sonar.scanner.scan.filesystem.ModuleFileSystemInitializer;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.argThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystemTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/DefaultModuleFileSystemTest.java
index b6e50899d57..b0982ee2de2 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystemTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/DefaultModuleFileSystemTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import com.google.common.collect.Lists;
 import java.io.File;
@@ -36,7 +36,12 @@ import org.sonar.api.batch.fs.InputFile.Status;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.config.Settings;
 import org.sonar.api.resources.Project;
-import org.sonar.batch.analysis.DefaultAnalysisMode;
+import org.sonar.scanner.analysis.DefaultAnalysisMode;
+import org.sonar.scanner.scan.filesystem.ComponentIndexer;
+import org.sonar.scanner.scan.filesystem.DefaultModuleFileSystem;
+import org.sonar.scanner.scan.filesystem.FileIndexer;
+import org.sonar.scanner.scan.filesystem.ModuleFileSystemInitializer;
+import org.sonar.scanner.scan.filesystem.ModuleInputFileCache;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/DeprecatedFileFiltersTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/DeprecatedFileFiltersTest.java
index e1905a12a9e..1108e0732ba 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/DeprecatedFileFiltersTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/DeprecatedFileFiltersTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import org.apache.commons.io.FilenameUtils;
 import org.junit.Rule;
@@ -28,7 +28,7 @@ import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.scan.filesystem.FileSystemFilter;
 import org.sonar.api.scan.filesystem.FileType;
-
+import org.sonar.scanner.scan.filesystem.DeprecatedFileFilters;
 import java.io.File;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/ExclusionFiltersTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/ExclusionFiltersTest.java
index c7b4e6eaa5e..c084c7c78e8 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/ExclusionFiltersTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/ExclusionFiltersTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -27,7 +27,7 @@ import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.config.Settings;
 import org.sonar.api.scan.filesystem.FileExclusions;
-
+import org.sonar.scanner.scan.filesystem.ExclusionFilters;
 import java.io.File;
 import java.io.IOException;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/InputFileBuilderFactoryTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/InputFileBuilderFactoryTest.java
index b9c627e1ea8..5dd278b89db 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/InputFileBuilderFactoryTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/InputFileBuilderFactoryTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -25,6 +25,12 @@ import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.batch.fs.internal.FileMetadata;
 import org.sonar.api.config.Settings;
 import org.sonar.api.scan.filesystem.PathResolver;
+import org.sonar.scanner.scan.filesystem.DefaultModuleFileSystem;
+import org.sonar.scanner.scan.filesystem.InputFileBuilder;
+import org.sonar.scanner.scan.filesystem.InputFileBuilderFactory;
+import org.sonar.scanner.scan.filesystem.LanguageDetectionFactory;
+import org.sonar.scanner.scan.filesystem.StatusDetectionFactory;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/InputFileBuilderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/InputFileBuilderTest.java
index eaec22ca37a..0e496f4fe16 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/InputFileBuilderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/InputFileBuilderTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.Rule;
@@ -29,7 +29,10 @@ import org.sonar.api.batch.fs.internal.FileMetadata;
 import org.sonar.api.config.Settings;
 import org.sonar.api.scan.filesystem.PathResolver;
 import org.sonar.api.utils.PathUtils;
-
+import org.sonar.scanner.scan.filesystem.DefaultModuleFileSystem;
+import org.sonar.scanner.scan.filesystem.InputFileBuilder;
+import org.sonar.scanner.scan.filesystem.LanguageDetection;
+import org.sonar.scanner.scan.filesystem.StatusDetection;
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/InputPathCacheTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/InputPathCacheTest.java
index 23269eef7d3..7d5b242ac0d 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/InputPathCacheTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/InputPathCacheTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import org.junit.After;
 import org.junit.Before;
@@ -28,7 +28,7 @@ import org.sonar.api.batch.fs.InputFile.Status;
 import org.sonar.api.batch.fs.InputFile.Type;
 import org.sonar.api.batch.fs.InputPath;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
-
+import org.sonar.scanner.scan.filesystem.InputPathCache;
 import java.nio.charset.StandardCharsets;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/LanguageDetectionFactoryTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/LanguageDetectionFactoryTest.java
index 2f7d3f01434..82c47c1aa0b 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/LanguageDetectionFactoryTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/LanguageDetectionFactoryTest.java
@@ -17,14 +17,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import org.junit.Test;
 import org.sonar.api.config.Settings;
 import org.sonar.api.resources.Languages;
-import org.sonar.batch.FakeJava;
-import org.sonar.batch.repository.language.DefaultLanguagesRepository;
-import org.sonar.batch.repository.language.LanguagesRepository;
+import org.sonar.scanner.FakeJava;
+import org.sonar.scanner.repository.language.DefaultLanguagesRepository;
+import org.sonar.scanner.repository.language.LanguagesRepository;
+import org.sonar.scanner.scan.filesystem.LanguageDetection;
+import org.sonar.scanner.scan.filesystem.LanguageDetectionFactory;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/LanguageDetectionTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/LanguageDetectionTest.java
index 01a6a8aef3c..d5013ed0ba7 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/LanguageDetectionTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/LanguageDetectionTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -30,9 +30,9 @@ import org.sonar.api.config.Settings;
 import org.sonar.api.resources.Language;
 import org.sonar.api.resources.Languages;
 import org.sonar.api.utils.MessageException;
-import org.sonar.batch.repository.language.DefaultLanguagesRepository;
-import org.sonar.batch.repository.language.LanguagesRepository;
-
+import org.sonar.scanner.repository.language.DefaultLanguagesRepository;
+import org.sonar.scanner.repository.language.LanguagesRepository;
+import org.sonar.scanner.scan.filesystem.LanguageDetection;
 import java.io.File;
 import java.io.IOException;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/ModuleFileSystemInitializerTest.java
index e7418c6a2d1..9be5891960f 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/ModuleFileSystemInitializerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/ModuleFileSystemInitializerTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
+package org.sonar.scanner.scan.filesystem;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
@@ -27,7 +27,7 @@ import org.junit.rules.TemporaryFolder;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.scan.filesystem.PathResolver;
 import org.sonar.api.utils.TempFolder;
-
+import org.sonar.scanner.scan.filesystem.ModuleFileSystemInitializer;
 import java.io.File;
 import java.io.IOException;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/StatusDetectionFactoryTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/StatusDetectionFactoryTest.java
index b741f1eb344..e5a5f128bb1 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/StatusDetectionFactoryTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/StatusDetectionFactoryTest.java
@@ -17,11 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
-
-import org.sonar.batch.repository.ProjectRepositories;
+package org.sonar.scanner.scan.filesystem;
 
 import org.junit.Test;
+import org.sonar.scanner.repository.ProjectRepositories;
+import org.sonar.scanner.scan.filesystem.StatusDetection;
+import org.sonar.scanner.scan.filesystem.StatusDetectionFactory;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/StatusDetectionTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/StatusDetectionTest.java
index 0601fa26b3b..3533910d6b4 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/filesystem/StatusDetectionTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/StatusDetectionTest.java
@@ -17,16 +17,17 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.filesystem;
-
-import org.sonar.batch.repository.FileData;
+package org.sonar.scanner.scan.filesystem;
 
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.ImmutableTable;
 import com.google.common.collect.Table;
 import org.junit.Test;
 import org.sonar.api.batch.fs.InputFile;
-import org.sonar.batch.repository.ProjectRepositories;
+import org.sonar.scanner.repository.FileData;
+import org.sonar.scanner.repository.ProjectRepositories;
+import org.sonar.scanner.scan.filesystem.StatusDetection;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class StatusDetectionTest {
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/measure/MeasureCacheTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/measure/MeasureCacheTest.java
index 02ec903e2ce..555baa35173 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/measure/MeasureCacheTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/measure/MeasureCacheTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.measure;
+package org.sonar.scanner.scan.measure;
 
 import java.util.Date;
 import java.util.Iterator;
@@ -34,8 +34,8 @@ import org.sonar.api.resources.Directory;
 import org.sonar.api.resources.File;
 import org.sonar.api.resources.Project;
 import org.sonar.api.resources.Resource;
-import org.sonar.batch.index.AbstractCachesTest;
-import org.sonar.batch.index.Cache.Entry;
+import org.sonar.scanner.index.AbstractCachesTest;
+import org.sonar.scanner.index.Cache.Entry;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/report/ConsoleReportTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/report/ConsoleReportTest.java
index 86b655323a5..ba0bd7ff7c7 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/report/ConsoleReportTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/report/ConsoleReportTest.java
@@ -17,11 +17,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.report;
+package org.sonar.scanner.scan.report;
 
 import javax.annotation.Nullable;
-
-import org.sonar.batch.issue.tracking.TrackedIssue;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -30,9 +28,10 @@ import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.config.Settings;
 import org.sonar.api.rule.Severity;
 import org.sonar.api.utils.log.LogTester;
-import org.sonar.batch.issue.IssueCache;
-import org.sonar.batch.scan.filesystem.InputPathCache;
-
+import org.sonar.scanner.issue.IssueCache;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
+import org.sonar.scanner.scan.filesystem.InputPathCache;
+import org.sonar.scanner.scan.report.ConsoleReport;
 import java.util.Arrays;
 import java.util.Collections;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/report/JSONReportTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/report/JSONReportTest.java
index 03cc40cc3a2..c8f8bef4113 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/report/JSONReportTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/report/JSONReportTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.report;
+package org.sonar.scanner.scan.report;
 
 import com.google.common.collect.Lists;
 import java.io.File;
@@ -44,11 +44,12 @@ import org.sonar.api.platform.Server;
 import org.sonar.api.resources.Project;
 import org.sonar.api.resources.Resource;
 import org.sonar.api.rule.RuleKey;
-import org.sonar.batch.issue.IssueCache;
-import org.sonar.batch.issue.tracking.TrackedIssue;
-import org.sonar.batch.repository.user.UserRepositoryLoader;
-import org.sonar.batch.scan.filesystem.InputPathCache;
+import org.sonar.scanner.issue.IssueCache;
+import org.sonar.scanner.issue.tracking.TrackedIssue;
 import org.sonar.scanner.protocol.input.ScannerInput;
+import org.sonar.scanner.repository.user.UserRepositoryLoader;
+import org.sonar.scanner.scan.filesystem.InputPathCache;
+import org.sonar.scanner.scan.report.JSONReport;
 
 import static net.javacrumbs.jsonunit.assertj.JsonAssert.assertThatJson;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/report/RuleNameProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/report/RuleNameProviderTest.java
index 3c3af0e689c..49522ab85cb 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scan/report/RuleNameProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/report/RuleNameProviderTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scan.report;
+package org.sonar.scanner.scan.report;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -26,6 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
 
 import org.sonar.api.rule.RuleKey;
+import org.sonar.scanner.scan.report.RuleNameProvider;
 import org.sonar.api.batch.rule.Rule;
 import org.junit.Test;
 import org.junit.Before;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/scm/DefaultBlameOutputTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scm/DefaultBlameOutputTest.java
index 743f9175ba4..5ee591b3995 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/scm/DefaultBlameOutputTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scm/DefaultBlameOutputTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.scm;
+package org.sonar.scanner.scm;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -29,8 +29,9 @@ import org.sonar.api.batch.fs.InputComponent;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.batch.scm.BlameLine;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.index.BatchComponentCache;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponentCache;
+import org.sonar.scanner.scm.DefaultBlameOutput;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/sensor/DefaultSensorContextTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/sensor/DefaultSensorContextTest.java
index cd32cbfeae3..0f28d6e42f8 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/sensor/DefaultSensorContextTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/sensor/DefaultSensorContextTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.sensor;
+package org.sonar.scanner.sensor;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -35,6 +35,7 @@ import org.sonar.api.batch.sensor.internal.SensorStorage;
 import org.sonar.api.config.Settings;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.utils.Version;
+import org.sonar.scanner.sensor.DefaultSensorContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/sensor/DefaultSensorStorageTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/sensor/DefaultSensorStorageTest.java
index 76afdb23661..4f825e9743b 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/sensor/DefaultSensorStorageTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/sensor/DefaultSensorStorageTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.sensor;
+package org.sonar.scanner.sensor;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -36,12 +36,13 @@ import org.sonar.api.measures.Measure;
 import org.sonar.api.resources.File;
 import org.sonar.api.resources.Project;
 import org.sonar.api.resources.Resource;
-import org.sonar.batch.cpd.index.SonarCpdBlockIndex;
-import org.sonar.batch.index.BatchComponentCache;
-import org.sonar.batch.issue.ModuleIssues;
-import org.sonar.batch.report.ReportPublisher;
-import org.sonar.batch.scan.measure.MeasureCache;
-import org.sonar.batch.sensor.coverage.CoverageExclusions;
+import org.sonar.scanner.cpd.index.SonarCpdBlockIndex;
+import org.sonar.scanner.index.BatchComponentCache;
+import org.sonar.scanner.issue.ModuleIssues;
+import org.sonar.scanner.report.ReportPublisher;
+import org.sonar.scanner.scan.measure.MeasureCache;
+import org.sonar.scanner.sensor.DefaultSensorStorage;
+import org.sonar.scanner.sensor.coverage.CoverageExclusions;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/sensor/SensorOptimizerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/sensor/SensorOptimizerTest.java
index 0fac9a72139..582ba2576fb 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/sensor/SensorOptimizerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/sensor/SensorOptimizerTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.sensor;
+package org.sonar.scanner.sensor;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -32,6 +32,7 @@ import org.sonar.api.batch.rule.internal.ActiveRulesBuilder;
 import org.sonar.api.batch.sensor.internal.DefaultSensorDescriptor;
 import org.sonar.api.config.Settings;
 import org.sonar.api.rule.RuleKey;
+import org.sonar.scanner.sensor.SensorOptimizer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/sensor/coverage/CoverageExclusionsTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/sensor/coverage/CoverageExclusionsTest.java
index 284226f9af0..b2238fe214a 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/sensor/coverage/CoverageExclusionsTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/sensor/coverage/CoverageExclusionsTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.sensor.coverage;
+package org.sonar.scanner.sensor.coverage;
 
 import org.junit.rules.TemporaryFolder;
 
@@ -36,7 +36,7 @@ import org.sonar.api.resources.File;
 import org.sonar.api.resources.Resource;
 import org.sonar.api.utils.KeyValueFormat;
 import org.sonar.core.config.ExclusionProperties;
-
+import org.sonar.scanner.sensor.coverage.CoverageExclusions;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/source/CodeColorizersTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/source/CodeColorizersTest.java
index 2a9530e1142..22f8d2b98de 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/source/CodeColorizersTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/source/CodeColorizersTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.source;
+package org.sonar.scanner.source;
 
 import com.google.common.collect.ImmutableList;
 import java.io.File;
@@ -44,6 +44,7 @@ import org.sonar.colorizer.MultilinesDocTokenizer;
 import org.sonar.colorizer.RegexpTokenizer;
 import org.sonar.colorizer.StringTokenizer;
 import org.sonar.colorizer.Tokenizer;
+import org.sonar.scanner.source.CodeColorizers;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/source/DefaultHighlightableTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/source/DefaultHighlightableTest.java
index d1f20eb1d16..9f4672a80a8 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/source/DefaultHighlightableTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/source/DefaultHighlightableTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.source;
+package org.sonar.scanner.source;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -27,6 +27,7 @@ import org.sonar.api.batch.AnalysisMode;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.batch.sensor.highlighting.internal.DefaultHighlighting;
 import org.sonar.api.batch.sensor.internal.SensorStorage;
+import org.sonar.scanner.source.DefaultHighlightable;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/source/DefaultSymbolizableTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/source/DefaultSymbolizableTest.java
index 3f16b9331a6..2e199df452d 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/source/DefaultSymbolizableTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/source/DefaultSymbolizableTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.source;
+package org.sonar.scanner.source;
 
 import com.google.common.base.Strings;
 import org.junit.Test;
@@ -27,7 +27,8 @@ import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.batch.sensor.symbol.internal.DefaultSymbolTable;
 import org.sonar.api.source.Symbol;
 import org.sonar.api.source.Symbolizable;
-import org.sonar.batch.sensor.DefaultSensorStorage;
+import org.sonar.scanner.sensor.DefaultSensorStorage;
+import org.sonar.scanner.source.DefaultSymbolizable;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/source/DeprecatedDefaultSymbolTableTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/source/DeprecatedDefaultSymbolTableTest.java
index 7c24a2384b0..88f55e1e3f2 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/source/DeprecatedDefaultSymbolTableTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/source/DeprecatedDefaultSymbolTableTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.source;
+package org.sonar.scanner.source;
 
 import com.google.common.base.Strings;
 import java.util.Set;
@@ -30,6 +30,7 @@ import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.batch.sensor.symbol.internal.DefaultSymbolTable;
 import org.sonar.api.source.Symbol;
 import org.sonar.api.source.Symbolizable;
+import org.sonar.scanner.source.DeprecatedDefaultSymbolTable;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/source/HighlightableBuilderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/source/HighlightableBuilderTest.java
index 07ca60048b3..fd07607430d 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/source/HighlightableBuilderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/source/HighlightableBuilderTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.source;
+package org.sonar.scanner.source;
 
 import org.junit.Test;
 import org.sonar.api.batch.AnalysisMode;
@@ -28,7 +28,9 @@ import org.sonar.api.resources.File;
 import org.sonar.api.resources.Project;
 import org.sonar.api.resources.Resource;
 import org.sonar.api.source.Highlightable;
-import org.sonar.batch.index.BatchComponent;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.source.DefaultHighlightable;
+import org.sonar.scanner.source.HighlightableBuilder;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/source/SymbolizableBuilderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/source/SymbolizableBuilderTest.java
index 5cc7fe2d06b..c2f2f0aeb58 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/source/SymbolizableBuilderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/source/SymbolizableBuilderTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.source;
+package org.sonar.scanner.source;
 
 import org.junit.Test;
 import org.sonar.api.batch.AnalysisMode;
@@ -28,8 +28,9 @@ import org.sonar.api.resources.File;
 import org.sonar.api.resources.Project;
 import org.sonar.api.resources.Resource;
 import org.sonar.api.source.Symbolizable;
-import org.sonar.batch.index.BatchComponent;
-import org.sonar.batch.sensor.DefaultSensorStorage;
+import org.sonar.scanner.index.BatchComponent;
+import org.sonar.scanner.sensor.DefaultSensorStorage;
+import org.sonar.scanner.source.SymbolizableBuilder;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/task/ListTaskTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/task/ListTaskTest.java
index 0bf7ef0afc2..131bb7ca05e 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/task/ListTaskTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/task/ListTaskTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.task;
+package org.sonar.scanner.task;
 
 import java.util.Arrays;
 import org.junit.Rule;
@@ -26,6 +26,8 @@ import org.sonar.api.task.Task;
 import org.sonar.api.task.TaskDefinition;
 import org.sonar.api.utils.log.LogTester;
 import org.sonar.api.utils.log.LoggerLevel;
+import org.sonar.scanner.task.ListTask;
+import org.sonar.scanner.task.Tasks;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/task/TasksTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/task/TasksTest.java
index b2d52b253f2..5875d1cf764 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/task/TasksTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/task/TasksTest.java
@@ -17,13 +17,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.task;
+package org.sonar.scanner.task;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.sonar.api.task.Task;
 import org.sonar.api.task.TaskDefinition;
+import org.sonar.scanner.task.ListTask;
+import org.sonar.scanner.task.ScanTask;
+import org.sonar.scanner.task.Tasks;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -71,7 +74,7 @@ public class TasksTest {
     });
 
     thrown.expect(IllegalStateException.class);
-    thrown.expectMessage("Task 'org.sonar.batch.task.TasksTest$FakeTask1' is defined twice: first by 'foo1' and then by 'foo2'");
+    thrown.expectMessage("Task 'org.sonar.scanner.task.TasksTest$FakeTask1' is defined twice: first by 'foo1' and then by 'foo2'");
 
     tasks.start();
   }
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/util/BatchUtilsTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/util/BatchUtilsTest.java
index eeab4f402a1..f0f0085b897 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/util/BatchUtilsTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/util/BatchUtilsTest.java
@@ -17,9 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.util;
+package org.sonar.scanner.util;
 
 import org.junit.Test;
+import org.sonar.scanner.util.BatchUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/batch/util/ProgressReportTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/util/ProgressReportTest.java
index b21ad736fde..36ce89a392c 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/batch/util/ProgressReportTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/util/ProgressReportTest.java
@@ -17,13 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.batch.util;
+package org.sonar.scanner.util;
 
 import java.util.Set;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.api.utils.log.LogTester;
+import org.sonar.scanner.util.ProgressReport;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/bootstrap/BatchPluginJarExploderTest/sonar-checkstyle-plugin-2.8.jar b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/bootstrap/BatchPluginJarExploderTest/sonar-checkstyle-plugin-2.8.jar
index f937399bec5..f937399bec5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/bootstrap/BatchPluginJarExploderTest/sonar-checkstyle-plugin-2.8.jar
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/bootstrap/BatchPluginJarExploderTest/sonar-checkstyle-plugin-2.8.jar
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/cpd/deprecated/ManyStatements.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/cpd/deprecated/ManyStatements.java
index ed2297068e4..ed2297068e4 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/cpd/deprecated/ManyStatements.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/cpd/deprecated/ManyStatements.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-mess.txt b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-mess.txt
index 48d30c92f97..48d30c92f97 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-mess.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-mess.txt
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-twice.txt b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-twice.txt
index 9ae63dc57f9..9ae63dc57f9 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-twice.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-twice.txt
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-unfinished.txt b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-unfinished.txt
index dd7656180ab..dd7656180ab 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-unfinished.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-unfinished.txt
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-wrong-order.txt b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-wrong-order.txt
index 7cac0b98aed..7cac0b98aed 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-wrong-order.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp-wrong-order.txt
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp.txt b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp.txt
index 002169fe031..002169fe031 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-double-regexp.txt
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-no-regexp.txt b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-no-regexp.txt
index f18fa5b90ad..f18fa5b90ad 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-no-regexp.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-no-regexp.txt
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-single-regexp-and-double-regexp.txt b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-single-regexp-and-double-regexp.txt
index e09ecd7a323..e09ecd7a323 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-single-regexp-and-double-regexp.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-single-regexp-and-double-regexp.txt
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-single-regexp.txt b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-single-regexp.txt
index ef135ebc50c..ef135ebc50c 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-single-regexp.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/issue/ignore/scanner/IssueExclusionsRegexpScannerTest/file-with-single-regexp.txt
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/repository/DefaultProjectRepositoriesLoaderTest/project.protobuf b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/repository/DefaultProjectRepositoriesLoaderTest/project.protobuf
index ce579fdbd5e..ce579fdbd5e 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/repository/DefaultProjectRepositoriesLoaderTest/project.protobuf
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/repository/DefaultProjectRepositoriesLoaderTest/project.protobuf
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/repository/DefaultQualityProfileLoaderTest/quality_profile_search_default b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/repository/DefaultQualityProfileLoaderTest/quality_profile_search_default
index 6780d7338a1..6780d7338a1 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/repository/DefaultQualityProfileLoaderTest/quality_profile_search_default
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/repository/DefaultQualityProfileLoaderTest/quality_profile_search_default
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/rule/DefaultActiveRulesLoaderTest/active_rule_search1.protobuf b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/rule/DefaultActiveRulesLoaderTest/active_rule_search1.protobuf
index 5544968df4b..5544968df4b 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/rule/DefaultActiveRulesLoaderTest/active_rule_search1.protobuf
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/rule/DefaultActiveRulesLoaderTest/active_rule_search1.protobuf
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/rule/DefaultActiveRulesLoaderTest/active_rule_search2.protobuf b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/rule/DefaultActiveRulesLoaderTest/active_rule_search2.protobuf
index a23bd1d5d81..a23bd1d5d81 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/rule/DefaultActiveRulesLoaderTest/active_rule_search2.protobuf
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/rule/DefaultActiveRulesLoaderTest/active_rule_search2.protobuf
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/rule/DefaultRulesLoader/response.protobuf b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/rule/DefaultRulesLoader/response.protobuf
index 3c24dd83d29..3c24dd83d29 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/rule/DefaultRulesLoader/response.protobuf
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/rule/DefaultRulesLoader/response.protobuf
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/rule/ModuleQProfilesTest/shared.xml b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/rule/ModuleQProfilesTest/shared.xml
index feb234f20e8..feb234f20e8 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/rule/ModuleQProfilesTest/shared.xml
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/rule/ModuleQProfilesTest/shared.xml
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module1/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module1/sonar-project.properties
index 7bace22a204..7bace22a204 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module1/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module1/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module1/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module1/sources/Fake.java
index 9d445f04fc6..9d445f04fc6 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module1/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module1/sources/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module2/newBaseDir/src/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module2/newBaseDir/src/Fake.java
index 22d579be381..22d579be381 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module2/newBaseDir/src/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module2/newBaseDir/src/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module2/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module2/sonar-project.properties
index d25a9e9e1f5..d25a9e9e1f5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module2/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/module2/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/sonar-project.properties
index 4744284e7bf..4744284e7bf 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module-inherited/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module1/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module1/sonar-project.properties
index ec642a9443a..ec642a9443a 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module1/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module1/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module1/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module1/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module1/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module1/sources/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module2/newBaseDir/src/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module2/newBaseDir/src/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module2/newBaseDir/src/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module2/newBaseDir/src/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module2/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module2/sonar-project.properties
index d25a9e9e1f5..d25a9e9e1f5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module2/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/module2/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/sonar-project.properties
index 2f16886c91d..2f16886c91d 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-definitions-in-each-module/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/generated/any-file.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/generated/any-file.properties
index c50d50b50f7..c50d50b50f7 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/generated/any-file.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/generated/any-file.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/any-folder/sources/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/sonar-project.properties
index c1640b15cba..c1640b15cba 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile-and-overwritten-basedir/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/any-folder/any-file.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/any-folder/any-file.properties
index 460d3495a89..460d3495a89 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/any-folder/any-file.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/any-folder/any-file.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/any-folder/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/any-folder/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/any-folder/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/any-folder/sources/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/sonar-project.properties
index e246f8c2af8..e246f8c2af8 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-configfile/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-unexisting-file/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-unexisting-file/sonar-project.properties
index e246f8c2af8..e246f8c2af8 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-unexisting-file/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/DeprecatedProjectReactorBuilderTest/multi-module-with-unexisting-file/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module1/module11/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module1/module11/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module1/module11/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module1/module11/sources/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module1/module12/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module1/module12/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module1/module12/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module1/module12/sources/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module2/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module2/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module2/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/module2/sources/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/sonar-project.properties
index e14567d26af..e14567d26af 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/big-multi-module-definitions-all-in-root/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/sonar-project.properties
index 53aacb54061..53aacb54061 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/src/main/groovy/Fake.groovy b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/src/main/groovy/Fake.groovy
index e69de29bb2d..e69de29bb2d 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/src/main/groovy/Fake.groovy
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/src/main/groovy/Fake.groovy
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/src/main/java/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/src/main/java/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/src/main/java/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-language-definitions-all-in-root/src/main/java/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/module1/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/module1/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/module1/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/module1/sources/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/module2/src/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/module2/src/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/module2/src/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/module2/src/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/sonar-project.properties
index 0f06d31466e..0f06d31466e 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-definitions-all-in-root/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/module1/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/module1/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/module1/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/module1/sources/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/module2/src/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/module2/src/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/module2/src/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/module2/src/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/sonar-project.properties
index 6def8070d6f..6def8070d6f 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-definitions-moduleKey/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1.feature/src/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1.feature/src/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1.feature/src/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1.feature/src/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/module1/sources/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/sonar-project.properties
index 2a6221a3757..2a6221a3757 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-definitions-same-prefix/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-duplicate-id/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-duplicate-id/sonar-project.properties
index 0a971805d13..0a971805d13 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-duplicate-id/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-duplicate-id/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-repeated-id/modules/module1/module1/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-repeated-id/modules/module1/module1/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-repeated-id/modules/module1/module1/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-repeated-id/modules/module1/module1/sources/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-repeated-id/modules/module1/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-repeated-id/modules/module1/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-repeated-id/modules/module1/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-repeated-id/modules/module1/sources/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-repeated-id/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-repeated-id/sonar-project.properties
index e63d3da926c..e63d3da926c 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-repeated-id/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-repeated-id/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-sonar-module/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-sonar-module/sonar-project.properties
index 3f297090471..3f297090471 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-sonar-module/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-sonar-module/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir-not-associated/modules/module1/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-with-basedir-not-associated/modules/module1/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir-not-associated/modules/module1/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-with-basedir-not-associated/modules/module1/sources/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir-not-associated/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-with-basedir-not-associated/sonar-project.properties
index c572ef1f9e5..c572ef1f9e5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir-not-associated/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-with-basedir-not-associated/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir/modules/module1/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-with-basedir/modules/module1/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir/modules/module1/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-with-basedir/modules/module1/sources/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-with-basedir/sonar-project.properties
index 615f5c77a7f..615f5c77a7f 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-basedir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-with-basedir/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-explicit-unexisting-test-dir/module1/src/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-with-explicit-unexisting-test-dir/module1/src/Fake.java
index 8b137891791..8b137891791 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-explicit-unexisting-test-dir/module1/src/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-with-explicit-unexisting-test-dir/module1/src/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-explicit-unexisting-test-dir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-with-explicit-unexisting-test-dir/sonar-project.properties
index 09cb2208fcd..09cb2208fcd 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-explicit-unexisting-test-dir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-with-explicit-unexisting-test-dir/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-basedir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-basedir/sonar-project.properties
index 67fbf347c0e..67fbf347c0e 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-basedir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-basedir/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-source-dir/module1/src/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-source-dir/module1/src/Fake.java
index 8b137891791..8b137891791 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-source-dir/module1/src/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-source-dir/module1/src/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-source-dir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-source-dir/sonar-project.properties
index 04ea08a89a1..04ea08a89a1 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-source-dir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/multi-module-with-unexisting-source-dir/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/shouldGetFile/foo.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/shouldGetFile/foo.properties
index 8fbb104c92d..8fbb104c92d 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/shouldGetFile/foo.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/shouldGetFile/foo.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/shouldGetList/foo.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/shouldGetList/foo.properties
index 8fbb104c92d..8fbb104c92d 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/shouldGetList/foo.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/shouldGetList/foo.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-blank-source-dir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-blank-source-dir/sonar-project.properties
index ba79992d5a0..ba79992d5a0 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-blank-source-dir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-blank-source-dir/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/build/report.txt b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/build/report.txt
index e69de29bb2d..e69de29bb2d 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/build/report.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/build/report.txt
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/sonar-project.properties
index 35b33996ea7..35b33996ea7 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/sources/Fake.java
index aee03e60b4a..aee03e60b4a 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-build-dir/sources/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/lib/Fake.class b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/lib/Fake.class
index bf2c3a09e07..bf2c3a09e07 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/lib/Fake.class
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/lib/Fake.class
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/sonar-project.properties
index 0cada50b51f..0cada50b51f 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/sources/Fake.java
index aee03e60b4a..aee03e60b4a 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-lib-dir/sources/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-missing-source-dir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-missing-source-dir/sonar-project.properties
index 3a7a65335dc..3a7a65335dc 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-missing-source-dir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-missing-source-dir/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-binary/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-binary/sonar-project.properties
index 55d1ddf0242..55d1ddf0242 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-binary/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-binary/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-binary/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-binary/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-binary/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-binary/sources/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-lib/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-lib/sonar-project.properties
index 69ccd8d1411..69ccd8d1411 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-lib/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-lib/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-lib/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-lib/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-lib/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-lib/sources/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-source-dir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-source-dir/sonar-project.properties
index 0b83b11f29c..0b83b11f29c 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-source-dir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-source-dir/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-test-dir/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-test-dir/sonar-project.properties
index a4fac8e4ca6..a4fac8e4ca6 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-test-dir/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-test-dir/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-test-dir/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-test-dir/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-test-dir/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project-with-unexisting-test-dir/sources/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/libs/lib1.txt b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project/libs/lib1.txt
index 81d4e95a0b6..81d4e95a0b6 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/libs/lib1.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project/libs/lib1.txt
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/libs/lib2.txt b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project/libs/lib2.txt
index 7dacac0fd9a..7dacac0fd9a 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/libs/lib2.txt
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project/libs/lib2.txt
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/sonar-project.properties b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project/sonar-project.properties
index 69ccd8d1411..69ccd8d1411 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/sonar-project.properties
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project/sonar-project.properties
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/sources/Fake.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project/sources/Fake.java
index e67004defc5..e67004defc5 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/ProjectReactorBuilderTest/simple-project/sources/Fake.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/ProjectReactorBuilderTest/simple-project/sources/Fake.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/report/JSONReportTest/report-without-resolved-issues.json b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/report/JSONReportTest/report-without-resolved-issues.json
index b5af45efe6c..b5af45efe6c 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/report/JSONReportTest/report-without-resolved-issues.json
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/report/JSONReportTest/report-without-resolved-issues.json
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/report/JSONReportTest/report.json b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/report/JSONReportTest/report.json
index e024e17340d..e024e17340d 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/scan/report/JSONReportTest/report.json
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/scan/report/JSONReportTest/report.json
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/source/CodeColorizersTest/Person.java b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/source/CodeColorizersTest/Person.java
index c5cc9793730..c5cc9793730 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/source/CodeColorizersTest/Person.java
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/source/CodeColorizersTest/Person.java
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/source/CodeColorizersTest/Person.js b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/source/CodeColorizersTest/Person.js
index fc36e5aa127..fc36e5aa127 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/source/CodeColorizersTest/Person.js
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/source/CodeColorizersTest/Person.js
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/batch/source/CodeColorizersTest/package.html b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/source/CodeColorizersTest/package.html
index f2d90e627d6..f2d90e627d6 100644
--- a/sonar-scanner-engine/src/test/resources/org/sonar/batch/source/CodeColorizersTest/package.html
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/source/CodeColorizersTest/package.html