diff --git a/_define.php b/lib/define.php
similarity index 100%
rename from _define.php
rename to lib/define.php
diff --git a/_functions.php b/lib/functions.php
similarity index 100%
rename from _functions.php
rename to lib/functions.php
diff --git a/rfc8416.php b/rfc8416.php
index d2d2d1c..7738bc2 100755
--- a/rfc8416.php
+++ b/rfc8416.php
@@ -1,8 +1,8 @@
 <?php
 
 // Load lib files.
-require ("_define.php");
-require ("_functions.php");
+require ("lib/define.php");
+require ("lib/functions.php");
 
 // Before we begin. Ensure registry repository is up-to-date
 fetchUpstreamMaster();
diff --git a/roagen.php b/roagen.php
index 425f2de..4b00a15 100755
--- a/roagen.php
+++ b/roagen.php
@@ -1,7 +1,7 @@
 <?php
 
-require ("_define.php");
-require ("_functions.php");
+require ("lib/define.php");
+require ("lib/functions.php");
 
 // Before we begin. Ensure registry repository is up-to-date
 fetchUpstreamMaster();