Okay, I think I'm actually done with the package refactoring

Author: SQiShER

src/integration-test/java/de/danielbechler/diff/ObjectDifferIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Daniel Bechler
+ * Copyright 2014 Daniel Bechler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,10 +28,10 @@
 import de.danielbechler.diff.mock.ObjectWithMethodEqualsOnlyValueProviderMethodOnGetNestedObject;
 import de.danielbechler.diff.mock.ObjectWithNestedObject;
 import de.danielbechler.diff.node.DiffNode;
+import de.danielbechler.diff.node.NodeHierarchyVisitor;
 import de.danielbechler.diff.path.NodePath;
 import de.danielbechler.diff.selector.CollectionItemElementSelector;
 import de.danielbechler.diff.selector.MapKeyElementSelector;
-import de.danielbechler.diff.visitors.NodeHierarchyVisitor;
 import org.fest.assertions.api.Assertions;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

src/integration-test/java/de/danielbechler/diff/example/CanonicalAccessorExample.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Daniel Bechler
+ * Copyright 2014 Daniel Bechler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@
 
 import de.danielbechler.diff.ObjectDifferBuilder;
 import de.danielbechler.diff.node.DiffNode;
+import de.danielbechler.diff.node.NodeHierarchyVisitor;
 import de.danielbechler.diff.selector.CollectionItemElementSelector;
-import de.danielbechler.diff.visitors.NodeHierarchyVisitor;
 
 import java.util.LinkedList;
 import java.util.List;

src/integration-test/java/de/danielbechler/diff/example/EqualsOnlyValueProviderMethodExample.java

@@ -1,9 +1,25 @@
+/*
+ * Copyright 2014 Daniel Bechler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package de.danielbechler.diff.example;
 
 import de.danielbechler.diff.ObjectDifferBuilder;
 import de.danielbechler.diff.node.DiffNode;
+import de.danielbechler.diff.node.PrintingVisitor;
 import de.danielbechler.diff.path.NodePath;
-import de.danielbechler.diff.visitors.PrintingVisitor;
 
 class EqualsOnlyValueProviderMethodExample
 {

src/integration-test/java/de/danielbechler/diff/example/Example2IT.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Daniel Bechler
+ * Copyright 2014 Daniel Bechler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
 package de.danielbechler.diff.example
 
 import de.danielbechler.diff.ObjectDifferBuilder
-import de.danielbechler.diff.config.introspection.ObjectDiffEqualsOnlyType
-import de.danielbechler.diff.config.introspection.ObjectDiffProperty
+import de.danielbechler.diff.introspection.ObjectDiffEqualsOnlyType
+import de.danielbechler.diff.introspection.ObjectDiffProperty
 import de.danielbechler.diff.path.NodePath
 import spock.lang.Specification
 

src/integration-test/java/de/danielbechler/diff/example/IgnoreExample.java

@@ -1,10 +1,26 @@
+/*
+ * Copyright 2014 Daniel Bechler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package de.danielbechler.diff.example;
 
 import de.danielbechler.diff.ObjectDifferBuilder;
-import de.danielbechler.diff.config.introspection.ObjectDiffProperty;
+import de.danielbechler.diff.introspection.ObjectDiffProperty;
 import de.danielbechler.diff.node.DiffNode;
+import de.danielbechler.diff.node.PrintingVisitor;
 import de.danielbechler.diff.path.NodePath;
-import de.danielbechler.diff.visitors.PrintingVisitor;
 
 /**
  * @author Daniel Bechler

src/integration-test/java/de/danielbechler/diff/example/SimpleNodeExample.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Daniel Bechler
+ * Copyright 2014 Daniel Bechler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,10 @@
 
 package de.danielbechler.diff.example;
 
-import de.danielbechler.diff.visitors.NodeHierarchyVisitor;
-import de.danielbechler.diff.visitors.PrintingVisitor;
 import de.danielbechler.diff.ObjectDifferBuilder;
 import de.danielbechler.diff.node.DiffNode;
+import de.danielbechler.diff.node.NodeHierarchyVisitor;
+import de.danielbechler.diff.node.PrintingVisitor;
 
 /**
  * @author Daniel Bechler
@@ -30,6 +30,22 @@ private SimpleNodeExample()
 	{
 	}
 
+	public static void main(final String[] args)
+	{
+		final Person bruceWayne = new Person("Bruce", "Wayne");
+		final Person batman = new Person("Batman", null);
+		final DiffNode rootNode = ObjectDifferBuilder.buildDefault().compare(batman, bruceWayne);
+		rootNode.visit(new NodeHierarchyVisitor(10));
+		rootNode.visit(new PrintingVisitor(batman, bruceWayne)
+		{
+			@Override
+			protected boolean filter(final DiffNode node)
+			{
+				return true;
+			}
+		});
+	}
+
 	private static class Person
 	{
 		private String firstName;
@@ -76,20 +92,4 @@ public String toString()
 			return sb.toString();
 		}
 	}
-
-	public static void main(final String[] args)
-	{
-		final Person bruceWayne = new Person("Bruce", "Wayne");
-		final Person batman = new Person("Batman", null);
-		final DiffNode rootNode = ObjectDifferBuilder.buildDefault().compare(batman, bruceWayne);
-		rootNode.visit(new NodeHierarchyVisitor(10));
-		rootNode.visit(new PrintingVisitor(batman, bruceWayne)
-		{
-			@Override
-			protected boolean filter(final DiffNode node)
-			{
-				return true;
-			}
-		});
-	}
 }

src/integration-test/java/de/danielbechler/diff/example/gettingstarted/GettingStarted.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Daniel Bechler
+ * Copyright 2014 Daniel Bechler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,13 @@
 
 package de.danielbechler.diff.example.gettingstarted;
 
-import de.danielbechler.diff.visitors.PrintingVisitor;
 import de.danielbechler.diff.ObjectDiffer;
 import de.danielbechler.diff.ObjectDifferBuilder;
 import de.danielbechler.diff.example.phonebook.Contact;
 import de.danielbechler.diff.example.phonebook.PhoneBook;
 import de.danielbechler.diff.example.phonebook.PhoneNumber;
 import de.danielbechler.diff.node.DiffNode;
+import de.danielbechler.diff.node.PrintingVisitor;
 
 /**
  * @author Daniel Bechler

src/integration-test/java/de/danielbechler/diff/example/phonebook/Contact.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Daniel Bechler
+ * Copyright 2014 Daniel Bechler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package de.danielbechler.diff.example.phonebook;
 
-import de.danielbechler.diff.config.introspection.ObjectDiffProperty;
+import de.danielbechler.diff.introspection.ObjectDiffProperty;
 import de.danielbechler.util.Strings;
 
 import java.util.LinkedHashMap;
@@ -27,14 +27,6 @@
  */
 public class Contact
 {
-	public static Contact from(final Contact contact)
-	{
-		final Contact copy = new Contact(contact.firstName, contact.lastName);
-		copy.setMiddleName(contact.middleName);
-		copy.setPhoneNumbers(new LinkedHashMap<String, PhoneNumber>(contact.phoneNumbers));
-		return copy;
-	}
-
 	private final String firstName;
 	private final String lastName;
 	private String middleName;
@@ -46,6 +38,14 @@ public Contact(final String firstName, final String lastName)
 		this.lastName = lastName;
 	}
 
+	public static Contact from(final Contact contact)
+	{
+		final Contact copy = new Contact(contact.firstName, contact.lastName);
+		copy.setMiddleName(contact.middleName);
+		copy.setPhoneNumbers(new LinkedHashMap<String, PhoneNumber>(contact.phoneNumbers));
+		return copy;
+	}
+
 	@ObjectDiffProperty(categories = "name")
 	public String getFirstName()
 	{

src/integration-test/java/de/danielbechler/diff/example/phonebook/PhoneNumber.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Daniel Bechler
+ * Copyright 2014 Daniel Bechler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package de.danielbechler.diff.example.phonebook;
 
-import de.danielbechler.diff.config.introspection.ObjectDiffEqualsOnlyType;
+import de.danielbechler.diff.introspection.ObjectDiffEqualsOnlyType;
 
 /**
  * @author Daniel Bechler

src/integration-test/java/de/danielbechler/diff/config/inclusion/IncludingAnElementViaNodePathIT.groovy renamed to src/integration-test/java/de/danielbechler/diff/inclusion/IncludingAnElementViaNodePathIT.groovy

@@ -1,11 +1,26 @@
-package de.danielbechler.diff.config.inclusion
+/*
+ * Copyright 2014 Daniel Bechler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.danielbechler.diff.inclusion
 
 import de.danielbechler.diff.ObjectDifferBuilder
-import de.danielbechler.diff.PhoneBookSetup
 import de.danielbechler.diff.path.NodePath
 import spock.lang.Specification
 
-import static de.danielbechler.diff.PhoneBookSetup.Contact
+import static PhoneBookSetup.Contact
 
 /**
  * Created by Daniel Bechler.