diff --git a/PLAN b/PLAN
index 4ab2e646..d56f1cc0 100644
--- a/PLAN
+++ b/PLAN
@@ -15,16 +15,16 @@ We'll need to do five basic tasks:
   5) Sanity check the tree
 
 Gathering Packages
-  See gather/PLAN
+  See PLAN.gather
 
 Running Anaconda Tools
-  See pungi/PLAN
+  See PLAN.pungi
 
 Split Tree Into CD Size Chunks
-  See pungi/PLAN
+  See PLAN.pungi
 
 Create Isos of the Chunks
-  See pungi/PLAN
+  See PLAN.pungi
 
 Sanity Check the Tree
   This could/should be an ever growing set of post-tree build sanity checks.
@@ -35,9 +35,9 @@ Organization
   independantly and hopefully once functional it should be easy to tie them
   all together (one ring to bring them all, and in the darkness bind them)
 
-  gather/ is the module for repoclosing and downloading a set of packages.
-  pungi/ is the module for running anaconda tools against a set of packages
-         and creating isos
+  gather.py is the module for repoclosing and downloading a set of packages.
+  pungi.py  is the module for running anaconda tools against a set of packages
+            and creating isos
   tests/ This directory holds some files that are useful for testing
          functionality of the code.
 
diff --git a/gather/PLAN b/PLAN.gather
similarity index 100%
rename from gather/PLAN
rename to PLAN.gather
diff --git a/pungi/PLAN b/PLAN.pungi
similarity index 100%
rename from pungi/PLAN
rename to PLAN.pungi
diff --git a/gather/gather.py b/gather.py
similarity index 100%
rename from gather/gather.py
rename to gather.py
diff --git a/pungi/pungi.py b/pungi.py
similarity index 100%
rename from pungi/pungi.py
rename to pungi.py