diff --git a/Spring Data Commons.sonargraph b/Spring Data Commons.sonargraph
index dd909007e..ba449bdd3 100644
--- a/Spring Data Commons.sonargraph	
+++ b/Spring Data Commons.sonargraph	
@@ -46,6 +46,15 @@
                     <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|Core"/>
                     <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|Query"/>
                 </element>
+                <element name="Support" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.support.**" type="WeakTypePattern"/>
+                    </element>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|API"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|Core"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|Implementation"/>
+                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|Query"/>
+                </element>
                 <element name="Configuration" type="Subsystem">
                     <element name="Assignment" type="TypeFilter">
                         <element name="**.config.**" type="IncludeTypePattern"/>
@@ -55,14 +64,6 @@
                     <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|Implementation"/>
                     <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|Query"/>
                 </element>
-                <element name="Support" type="Subsystem">
-                    <element name="Assignment" type="TypeFilter">
-                        <element name="**.support.**" type="WeakTypePattern"/>
-                    </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|API"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|Core"/>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Repositories::Subsystem|Implementation"/>
-                </element>
                 <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Application"/>
                 <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Core"/>
                 <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Mapping"/>
@@ -103,17 +104,10 @@
                         <element name="**.mapping.*" type="IncludeTypePattern"/>
                     </element>
                 </element>
-                <element name="Events" type="Subsystem">
-                    <element name="Assignment" type="TypeFilter">
-                        <element name="**.event.**" type="IncludeTypePattern"/>
-                    </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Mapping::Subsystem|Model"/>
-                </element>
                 <element name="Context" type="Subsystem">
                     <element name="Assignment" type="TypeFilter">
                         <element name="**.context.**" type="IncludeTypePattern"/>
                     </element>
-                    <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Mapping::Subsystem|Events"/>
                     <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Mapping::Subsystem|Model"/>
                 </element>
                 <dependency type="AllowedDependency" toName="Project|spring-data-commons-core::Layer|Core"/>
@@ -122,7 +116,7 @@
                 <element name="Assignment" type="TypeFilter"/>
                 <element name="Types" type="Subsystem">
                     <element name="Assignment" type="TypeFilter">
-                        <element name="**.util.**" type="IncludeTypePattern"/>
+                        <element name="**.util.**" type="WeakTypePattern"/>
                     </element>
                 </element>
                 <element name="Annotations" type="Subsystem">
@@ -136,6 +130,18 @@
                     </element>
                     <stereotype name="Unrestricted"/>
                 </element>
+                <element name="Configuration" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.config.**" type="WeakTypePattern"/>
+                    </element>
+                    <stereotype name="Unrestricted"/>
+                </element>
+                <element name="History" type="Subsystem">
+                    <element name="Assignment" type="TypeFilter">
+                        <element name="**.history.**" type="WeakTypePattern"/>
+                    </element>
+                    <stereotype name="Unrestricted"/>
+                </element>
             </element>
         </architecture>
         <workspace>
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
index 965730bf2..d0a5f4ab8 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
@@ -45,7 +45,6 @@ import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.PropertyPath;
-import org.springframework.data.mapping.event.MappingContextEvent;
 import org.springframework.data.mapping.model.MappingException;
 import org.springframework.data.mapping.model.MutablePersistentEntity;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/event/MappingContextEvent.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/MappingContextEvent.java
similarity index 95%
rename from spring-data-commons-core/src/main/java/org/springframework/data/mapping/event/MappingContextEvent.java
rename to spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/MappingContextEvent.java
index 8b40cc514..4cb7e1277 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/event/MappingContextEvent.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/MappingContextEvent.java
@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mapping.event;
+package org.springframework.data.mapping.context;
 
 import org.springframework.context.ApplicationEvent;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PersistentProperty;
-import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/event/package-info.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/event/package-info.java
deleted file mode 100644
index e2d6753c5..000000000
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/event/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * 
- */
-package org.springframework.data.mapping.event;
\ No newline at end of file
diff --git a/spring-data-commons-core/src/test/java/org/springframework/data/mapping/event/MappingContextEventUnitTests.java b/spring-data-commons-core/src/test/java/org/springframework/data/mapping/context/MappingContextEventUnitTests.java
similarity index 94%
rename from spring-data-commons-core/src/test/java/org/springframework/data/mapping/event/MappingContextEventUnitTests.java
rename to spring-data-commons-core/src/test/java/org/springframework/data/mapping/context/MappingContextEventUnitTests.java
index 5e9334f5f..4fbe48a83 100644
--- a/spring-data-commons-core/src/test/java/org/springframework/data/mapping/event/MappingContextEventUnitTests.java
+++ b/spring-data-commons-core/src/test/java/org/springframework/data/mapping/context/MappingContextEventUnitTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mapping.event;
+package org.springframework.data.mapping.context;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -25,6 +25,7 @@ import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mapping.context.MappingContextEvent;
 
 /**
  * Unit tests for {@link MappingContextEvent}.