diff --git a/processor/src/main/java/org/mapstruct/ap/util/MethodMatcher.java b/processor/src/main/java/org/mapstruct/ap/model/source/MethodMatcher.java
similarity index 99%
rename from processor/src/main/java/org/mapstruct/ap/util/MethodMatcher.java
rename to processor/src/main/java/org/mapstruct/ap/model/source/MethodMatcher.java
index 45a71f45c..b9fe199d0 100644
--- a/processor/src/main/java/org/mapstruct/ap/util/MethodMatcher.java
+++ b/processor/src/main/java/org/mapstruct/ap/model/source/MethodMatcher.java
@@ -16,11 +16,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.util;
+package org.mapstruct.ap.model.source;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.TypeParameterElement;
 import javax.lang.model.element.VariableElement;
@@ -35,7 +36,6 @@ import javax.lang.model.util.SimpleTypeVisitor6;
 import javax.lang.model.util.Types;
 
 import org.mapstruct.ap.model.Type;
-import org.mapstruct.ap.model.source.Method;
 
 /**
  * MethodMatcher $8.4 of the JavaLanguage specification describes a method body as such:
diff --git a/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java b/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java
index bca23ef2e..b5652eb33 100644
--- a/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java
+++ b/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java
@@ -58,11 +58,11 @@ import org.mapstruct.ap.model.Type;
 import org.mapstruct.ap.model.TypeConversion;
 import org.mapstruct.ap.model.source.Mapping;
 import org.mapstruct.ap.model.source.Method;
+import org.mapstruct.ap.model.source.MethodMatcher;
 import org.mapstruct.ap.option.Options;
 import org.mapstruct.ap.option.ReportingPolicy;
 import org.mapstruct.ap.util.Executables;
 import org.mapstruct.ap.util.Filters;
-import org.mapstruct.ap.util.MethodMatcher;
 import org.mapstruct.ap.util.Strings;
 import org.mapstruct.ap.util.TypeFactory;