diff --git a/bird.conf b/bird.conf
index 01d8cb9..40d0925 100644
--- a/bird.conf
+++ b/bird.conf
@@ -1,6 +1,7 @@
 # Need include PoP config file first
 # include "./config.conf";
 
+include "./util/*.conf";
 include "./lib/*.conf";
 include "./protcol/*.conf";
 include "./bird/*.conf";
\ No newline at end of file
diff --git a/lib/community-transit.conf b/lib/10-community-transit.conf
similarity index 100%
rename from lib/community-transit.conf
rename to lib/10-community-transit.conf
diff --git a/lib/community-net186.conf b/lib/20-community-net186.conf
similarity index 100%
rename from lib/community-net186.conf
rename to lib/20-community-net186.conf
diff --git a/lib/community-peer.conf b/lib/20-community-peer.conf
similarity index 100%
rename from lib/community-peer.conf
rename to lib/20-community-peer.conf
diff --git a/constant.conf b/util/constant.conf
similarity index 100%
rename from constant.conf
rename to util/constant.conf
diff --git a/protocol/rpki.conf b/util/rpki.conf
similarity index 100%
rename from protocol/rpki.conf
rename to util/rpki.conf
diff --git a/lib/util.conf b/util/util.conf
similarity index 97%
rename from lib/util.conf
rename to util/util.conf
index 44de865..43923a8 100644
--- a/lib/util.conf
+++ b/util/util.conf
@@ -1,5 +1,3 @@
-include "./constant.conf";
-
 function pub_is_invalid_net_length(){
     case net.type {
         NET_IP4: return net.len > 24;