diff --git a/policy/all.bro b/policy/all.bro
index 23a39029f8..242e7df36a 100644
--- a/policy/all.bro
+++ b/policy/all.bro
@@ -11,12 +11,11 @@
 #@load ssl
 @load syslog
 
-@load communication
+#@load communication
 @load metrics
 @load notice
 @load signatures
 @load software
-@load weird 
 
 @load detectors/http-MHR
 
diff --git a/policy/bro.init b/policy/bro.init
index af0dc28f76..3ce7b635ba 100644
--- a/policy/bro.init
+++ b/policy/bro.init
@@ -1416,7 +1416,7 @@ function prefixed_id(id: count): string
 # ANALYZER_<analyzer-name>*, e.g., ANALYZER_HTTP.
 type AnalyzerTag: count;
 
-# DPM configuration.
+# DPD configuration.
 
 type dpd_protocol_config: record {
 	ports: set[port] &optional;
@@ -1489,4 +1489,3 @@ const parse_udp_tunnels = F &redef;
 
 #@load site
 #@load dpd
-@load weird
\ No newline at end of file
diff --git a/policy/frameworks/notice/__load__.bro b/policy/frameworks/notice/__load__.bro
index 5528c34af0..b0c5addbe1 100644
--- a/policy/frameworks/notice/__load__.bro
+++ b/policy/frameworks/notice/__load__.bro
@@ -1,2 +1,3 @@
-@load notice/base
+@load frameworks/notice/base
+@load frameworks/notice/weird
 #@load notice/action-filters
\ No newline at end of file
diff --git a/policy/weird.bro b/policy/frameworks/notice/weird.bro
similarity index 99%
rename from policy/weird.bro
rename to policy/frameworks/notice/weird.bro
index 186944b232..9a95c85374 100644
--- a/policy/weird.bro
+++ b/policy/frameworks/notice/weird.bro
@@ -1,4 +1,4 @@
-@load notice
+@load frameworks/notice/base
 @load utils/conn_ids
 
 module Weird;
diff --git a/policy/tuning/defaults/remove-high-volume-notices.bro b/policy/tuning/defaults/remove-high-volume-notices.bro
index f951a86546..2bcaf5acd5 100644
--- a/policy/tuning/defaults/remove-high-volume-notices.bro
+++ b/policy/tuning/defaults/remove-high-volume-notices.bro
@@ -4,7 +4,7 @@
 @load notice
 
 # Load the policy scripts where the notices are defined.
-@load weird
+@load frameworks/notice/weird
 @load dpd
 
 # Remove these notices from logging since they can be too noisy.