diff --git a/refpolicy/Changelog b/refpolicy/Changelog
index b2c5bf34..6c1fe192 100644
--- a/refpolicy/Changelog
+++ b/refpolicy/Changelog
@@ -1,3 +1,5 @@
+- Move domain, files, and corecommands modules to kernel
+  layer to resolve some layering inconsistencies.
 - Move policy build options out of Makefile into build.conf.
 - Add yppasswd to nis module.
 - Change optional_policy() to refer to the module name
diff --git a/refpolicy/policy/modules/system/corecommands.fc b/refpolicy/policy/modules/kernel/corecommands.fc
similarity index 100%
rename from refpolicy/policy/modules/system/corecommands.fc
rename to refpolicy/policy/modules/kernel/corecommands.fc
diff --git a/refpolicy/policy/modules/system/corecommands.if b/refpolicy/policy/modules/kernel/corecommands.if
similarity index 100%
rename from refpolicy/policy/modules/system/corecommands.if
rename to refpolicy/policy/modules/kernel/corecommands.if
diff --git a/refpolicy/policy/modules/system/corecommands.te b/refpolicy/policy/modules/kernel/corecommands.te
similarity index 100%
rename from refpolicy/policy/modules/system/corecommands.te
rename to refpolicy/policy/modules/kernel/corecommands.te
diff --git a/refpolicy/policy/modules/system/domain.fc b/refpolicy/policy/modules/kernel/domain.fc
similarity index 100%
rename from refpolicy/policy/modules/system/domain.fc
rename to refpolicy/policy/modules/kernel/domain.fc
diff --git a/refpolicy/policy/modules/system/domain.if b/refpolicy/policy/modules/kernel/domain.if
similarity index 100%
rename from refpolicy/policy/modules/system/domain.if
rename to refpolicy/policy/modules/kernel/domain.if
diff --git a/refpolicy/policy/modules/system/domain.te b/refpolicy/policy/modules/kernel/domain.te
similarity index 100%
rename from refpolicy/policy/modules/system/domain.te
rename to refpolicy/policy/modules/kernel/domain.te
diff --git a/refpolicy/policy/modules/system/files.fc b/refpolicy/policy/modules/kernel/files.fc
similarity index 100%
rename from refpolicy/policy/modules/system/files.fc
rename to refpolicy/policy/modules/kernel/files.fc
diff --git a/refpolicy/policy/modules/system/files.if b/refpolicy/policy/modules/kernel/files.if
similarity index 100%
rename from refpolicy/policy/modules/system/files.if
rename to refpolicy/policy/modules/kernel/files.if
diff --git a/refpolicy/policy/modules/system/files.te b/refpolicy/policy/modules/kernel/files.te
similarity index 100%
rename from refpolicy/policy/modules/system/files.te
rename to refpolicy/policy/modules/kernel/files.te