diff --git a/SConscript b/SConscript
index 39a609b63578477fc605877d3d7dd0eca0de6b8a..c12088c740153bdbb8d0705b8cac747a321ecfb1 100644
--- a/SConscript
+++ b/SConscript
@@ -42,18 +42,18 @@ Depends(libirdbdeep,libsmpsa)
 
 print "Zipr install is "+env['ZIPR_INSTALL']
 Export('env')
-libtrace=env.SConscript(["zipr_trace_plugin/libtrace/SConscript"])
-print "Zipr install is "+env['ZIPR_INSTALL']
-zipr_trace_plugin=SConscript(["zipr_trace_plugin/SConscript"])
-Depends(zipr_trace_plugin,libtrace);
+
+
+#libtrace=env.SConscript(["zipr_trace_plugin/libtrace/SConscript"])
+#print "Zipr install is "+env['ZIPR_INSTALL']
+#zipr_trace_plugin=SConscript(["zipr_trace_plugin/SConscript"])
+#Depends(zipr_trace_plugin,libtrace);
 
 
 # list of zipr plugins and irdb xforms to build
 transformDirs='''
-	zipr_large_only_plugin
 	irdb_transforms
 	zipr_push64_reloc_plugin
-	zipr_relax_plugin
 	zipr
 	zipr_unpin_plugin
 	'''
diff --git a/peasoup_examples/LICENSE.txt b/examples/LICENSE.txt
similarity index 100%
rename from peasoup_examples/LICENSE.txt
rename to examples/LICENSE.txt
diff --git a/peasoup_examples/README b/examples/README
similarity index 100%
rename from peasoup_examples/README
rename to examples/README
diff --git a/peasoup_examples/ada-examples/e_c17_p1.ada b/examples/ada-examples/e_c17_p1.ada
similarity index 100%
rename from peasoup_examples/ada-examples/e_c17_p1.ada
rename to examples/ada-examples/e_c17_p1.ada
diff --git a/peasoup_examples/ada-examples/e_c17_p2.ada b/examples/ada-examples/e_c17_p2.ada
similarity index 100%
rename from peasoup_examples/ada-examples/e_c17_p2.ada
rename to examples/ada-examples/e_c17_p2.ada
diff --git a/peasoup_examples/ada-examples/e_c17_p3.ada b/examples/ada-examples/e_c17_p3.ada
similarity index 100%
rename from peasoup_examples/ada-examples/e_c17_p3.ada
rename to examples/ada-examples/e_c17_p3.ada
diff --git a/peasoup_examples/ada-examples/e_c17_p4.ada b/examples/ada-examples/e_c17_p4.ada
similarity index 100%
rename from peasoup_examples/ada-examples/e_c17_p4.ada
rename to examples/ada-examples/e_c17_p4.ada
diff --git a/peasoup_examples/ada-examples/e_c17_p6.ada b/examples/ada-examples/e_c17_p6.ada
similarity index 100%
rename from peasoup_examples/ada-examples/e_c17_p6.ada
rename to examples/ada-examples/e_c17_p6.ada
diff --git a/peasoup_examples/ada-examples/except5.adb b/examples/ada-examples/except5.adb
similarity index 100%
rename from peasoup_examples/ada-examples/except5.adb
rename to examples/ada-examples/except5.adb
diff --git a/peasoup_examples/ada-examples/stuff.adb b/examples/ada-examples/stuff.adb
similarity index 100%
rename from peasoup_examples/ada-examples/stuff.adb
rename to examples/ada-examples/stuff.adb
diff --git a/peasoup_examples/ada-examples/stuff.ads b/examples/ada-examples/stuff.ads
similarity index 100%
rename from peasoup_examples/ada-examples/stuff.ads
rename to examples/ada-examples/stuff.ads
diff --git a/peasoup_examples/ada-examples/testit.sh b/examples/ada-examples/testit.sh
similarity index 100%
rename from peasoup_examples/ada-examples/testit.sh
rename to examples/ada-examples/testit.sh
diff --git a/peasoup_examples/cgc_spri/Makefile b/examples/cgc_spri/Makefile
similarity index 100%
rename from peasoup_examples/cgc_spri/Makefile
rename to examples/cgc_spri/Makefile
diff --git a/peasoup_examples/cgc_spri/spawn_with_spri_open.c b/examples/cgc_spri/spawn_with_spri_open.c
similarity index 100%
rename from peasoup_examples/cgc_spri/spawn_with_spri_open.c
rename to examples/cgc_spri/spawn_with_spri_open.c
diff --git a/peasoup_examples/cpp-examples/Makefile b/examples/cpp-examples/Makefile
similarity index 100%
rename from peasoup_examples/cpp-examples/Makefile
rename to examples/cpp-examples/Makefile
diff --git a/peasoup_examples/cpp-examples/Makefile.zipr b/examples/cpp-examples/Makefile.zipr
similarity index 100%
rename from peasoup_examples/cpp-examples/Makefile.zipr
rename to examples/cpp-examples/Makefile.zipr
diff --git a/peasoup_examples/cpp-examples/derived2_throw.cpp b/examples/cpp-examples/derived2_throw.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/derived2_throw.cpp
rename to examples/cpp-examples/derived2_throw.cpp
diff --git a/peasoup_examples/cpp-examples/derived3_throw.cpp b/examples/cpp-examples/derived3_throw.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/derived3_throw.cpp
rename to examples/cpp-examples/derived3_throw.cpp
diff --git a/peasoup_examples/cpp-examples/derived4_throw.cpp b/examples/cpp-examples/derived4_throw.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/derived4_throw.cpp
rename to examples/cpp-examples/derived4_throw.cpp
diff --git a/peasoup_examples/cpp-examples/derived_throw.cpp b/examples/cpp-examples/derived_throw.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/derived_throw.cpp
rename to examples/cpp-examples/derived_throw.cpp
diff --git a/peasoup_examples/cpp-examples/dynamic_exception.cpp b/examples/cpp-examples/dynamic_exception.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/dynamic_exception.cpp
rename to examples/cpp-examples/dynamic_exception.cpp
diff --git a/peasoup_examples/cpp-examples/hanoi++.cpp b/examples/cpp-examples/hanoi++.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/hanoi++.cpp
rename to examples/cpp-examples/hanoi++.cpp
diff --git a/peasoup_examples/cpp-examples/newdel.cpp b/examples/cpp-examples/newdel.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/newdel.cpp
rename to examples/cpp-examples/newdel.cpp
diff --git a/peasoup_examples/cpp-examples/newdel_broke1.cpp b/examples/cpp-examples/newdel_broke1.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/newdel_broke1.cpp
rename to examples/cpp-examples/newdel_broke1.cpp
diff --git a/peasoup_examples/cpp-examples/newdel_broke2.cpp b/examples/cpp-examples/newdel_broke2.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/newdel_broke2.cpp
rename to examples/cpp-examples/newdel_broke2.cpp
diff --git a/peasoup_examples/cpp-examples/newdel_broke3.cpp b/examples/cpp-examples/newdel_broke3.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/newdel_broke3.cpp
rename to examples/cpp-examples/newdel_broke3.cpp
diff --git a/peasoup_examples/cpp-examples/newdel_broke4.cpp b/examples/cpp-examples/newdel_broke4.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/newdel_broke4.cpp
rename to examples/cpp-examples/newdel_broke4.cpp
diff --git a/peasoup_examples/cpp-examples/newdel_broke5.cpp b/examples/cpp-examples/newdel_broke5.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/newdel_broke5.cpp
rename to examples/cpp-examples/newdel_broke5.cpp
diff --git a/peasoup_examples/cpp-examples/newdel_broke6.cpp b/examples/cpp-examples/newdel_broke6.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/newdel_broke6.cpp
rename to examples/cpp-examples/newdel_broke6.cpp
diff --git a/peasoup_examples/cpp-examples/newdel_broke7.cpp b/examples/cpp-examples/newdel_broke7.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/newdel_broke7.cpp
rename to examples/cpp-examples/newdel_broke7.cpp
diff --git a/peasoup_examples/cpp-examples/newdelete1.cpp b/examples/cpp-examples/newdelete1.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/newdelete1.cpp
rename to examples/cpp-examples/newdelete1.cpp
diff --git a/peasoup_examples/cpp-examples/newdelete2.cpp b/examples/cpp-examples/newdelete2.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/newdelete2.cpp
rename to examples/cpp-examples/newdelete2.cpp
diff --git a/peasoup_examples/cpp-examples/newdelete3.cpp b/examples/cpp-examples/newdelete3.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/newdelete3.cpp
rename to examples/cpp-examples/newdelete3.cpp
diff --git a/peasoup_examples/cpp-examples/newdelete4.cpp b/examples/cpp-examples/newdelete4.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/newdelete4.cpp
rename to examples/cpp-examples/newdelete4.cpp
diff --git a/peasoup_examples/cpp-examples/newdelete5.cpp b/examples/cpp-examples/newdelete5.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/newdelete5.cpp
rename to examples/cpp-examples/newdelete5.cpp
diff --git a/peasoup_examples/cpp-examples/newdelete6.cpp b/examples/cpp-examples/newdelete6.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/newdelete6.cpp
rename to examples/cpp-examples/newdelete6.cpp
diff --git a/peasoup_examples/cpp-examples/simple_throw.cpp b/examples/cpp-examples/simple_throw.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/simple_throw.cpp
rename to examples/cpp-examples/simple_throw.cpp
diff --git a/peasoup_examples/cpp-examples/test_quick.sh b/examples/cpp-examples/test_quick.sh
similarity index 100%
rename from peasoup_examples/cpp-examples/test_quick.sh
rename to examples/cpp-examples/test_quick.sh
diff --git a/peasoup_examples/cpp-examples/test_quick_zipronly.sh b/examples/cpp-examples/test_quick_zipronly.sh
similarity index 100%
rename from peasoup_examples/cpp-examples/test_quick_zipronly.sh
rename to examples/cpp-examples/test_quick_zipronly.sh
diff --git a/peasoup_examples/cpp-examples/test_spec.sh b/examples/cpp-examples/test_spec.sh
similarity index 100%
rename from peasoup_examples/cpp-examples/test_spec.sh
rename to examples/cpp-examples/test_spec.sh
diff --git a/peasoup_examples/cpp-examples/testit.sh b/examples/cpp-examples/testit.sh
similarity index 100%
rename from peasoup_examples/cpp-examples/testit.sh
rename to examples/cpp-examples/testit.sh
diff --git a/peasoup_examples/cpp-examples/throw.cpp b/examples/cpp-examples/throw.cpp
similarity index 100%
rename from peasoup_examples/cpp-examples/throw.cpp
rename to examples/cpp-examples/throw.cpp
diff --git a/peasoup_examples/demos/Makefile b/examples/demos/Makefile
similarity index 100%
rename from peasoup_examples/demos/Makefile
rename to examples/demos/Makefile
diff --git a/peasoup_examples/demos/demo.aug_9_2011/Makefile b/examples/demos/demo.aug_9_2011/Makefile
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/Makefile
rename to examples/demos/demo.aug_9_2011/Makefile
diff --git a/peasoup_examples/demos/demo.aug_9_2011/demo_heaprand.sh b/examples/demos/demo.aug_9_2011/demo_heaprand.sh
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/demo_heaprand.sh
rename to examples/demos/demo.aug_9_2011/demo_heaprand.sh
diff --git a/peasoup_examples/demos/demo.aug_9_2011/demo_ilr.sh b/examples/demos/demo.aug_9_2011/demo_ilr.sh
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/demo_ilr.sh
rename to examples/demos/demo.aug_9_2011/demo_ilr.sh
diff --git a/peasoup_examples/demos/demo.aug_9_2011/dumbledore.c b/examples/demos/demo.aug_9_2011/dumbledore.c
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/dumbledore.c
rename to examples/demos/demo.aug_9_2011/dumbledore.c
diff --git a/peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/Makefile b/examples/demos/demo.aug_9_2011/dumbledore.exploits/Makefile
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/Makefile
rename to examples/demos/demo.aug_9_2011/dumbledore.exploits/Makefile
diff --git a/peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-gradeA.dynamic.no_strata.c b/examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-gradeA.dynamic.no_strata.c
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-gradeA.dynamic.no_strata.c
rename to examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-gradeA.dynamic.no_strata.c
diff --git a/peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-gradeA.no_strata.c b/examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-gradeA.no_strata.c
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-gradeA.no_strata.c
rename to examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-gradeA.no_strata.c
diff --git a/peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-gradeB.dynamic.no_strata.c b/examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-gradeB.dynamic.no_strata.c
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-gradeB.dynamic.no_strata.c
rename to examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-gradeB.dynamic.no_strata.c
diff --git a/peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-gradeB.no_strata.c b/examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-gradeB.no_strata.c
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-gradeB.no_strata.c
rename to examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-gradeB.no_strata.c
diff --git a/peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-strata_parm1.c b/examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-strata_parm1.c
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-strata_parm1.c
rename to examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-strata_parm1.c
diff --git a/peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-strata_tracing.c b/examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-strata_tracing.c
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-strata_tracing.c
rename to examples/demos/demo.aug_9_2011/dumbledore.exploits/attack-strata_tracing.c
diff --git a/peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/badA.dynamic.txt b/examples/demos/demo.aug_9_2011/dumbledore.exploits/badA.dynamic.txt
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/badA.dynamic.txt
rename to examples/demos/demo.aug_9_2011/dumbledore.exploits/badA.dynamic.txt
diff --git a/peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/badA.static.txt b/examples/demos/demo.aug_9_2011/dumbledore.exploits/badA.static.txt
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/badA.static.txt
rename to examples/demos/demo.aug_9_2011/dumbledore.exploits/badA.static.txt
diff --git a/peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/badA.txt b/examples/demos/demo.aug_9_2011/dumbledore.exploits/badA.txt
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/badA.txt
rename to examples/demos/demo.aug_9_2011/dumbledore.exploits/badA.txt
diff --git a/peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/badB.dynamic.txt b/examples/demos/demo.aug_9_2011/dumbledore.exploits/badB.dynamic.txt
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/badB.dynamic.txt
rename to examples/demos/demo.aug_9_2011/dumbledore.exploits/badB.dynamic.txt
diff --git a/peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/badB.static.txt b/examples/demos/demo.aug_9_2011/dumbledore.exploits/badB.static.txt
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/badB.static.txt
rename to examples/demos/demo.aug_9_2011/dumbledore.exploits/badB.static.txt
diff --git a/peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/badB.txt b/examples/demos/demo.aug_9_2011/dumbledore.exploits/badB.txt
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/dumbledore.exploits/badB.txt
rename to examples/demos/demo.aug_9_2011/dumbledore.exploits/badB.txt
diff --git a/peasoup_examples/demos/demo.aug_9_2011/dumbledore.good_inputs/good.txt b/examples/demos/demo.aug_9_2011/dumbledore.good_inputs/good.txt
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/dumbledore.good_inputs/good.txt
rename to examples/demos/demo.aug_9_2011/dumbledore.good_inputs/good.txt
diff --git a/peasoup_examples/demos/demo.aug_9_2011/heap_overflow.c b/examples/demos/demo.aug_9_2011/heap_overflow.c
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/heap_overflow.c
rename to examples/demos/demo.aug_9_2011/heap_overflow.c
diff --git a/peasoup_examples/demos/demo.aug_9_2011/help.txt b/examples/demos/demo.aug_9_2011/help.txt
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/help.txt
rename to examples/demos/demo.aug_9_2011/help.txt
diff --git a/peasoup_examples/demos/demo.aug_9_2011/malloc.c b/examples/demos/demo.aug_9_2011/malloc.c
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/malloc.c
rename to examples/demos/demo.aug_9_2011/malloc.c
diff --git a/peasoup_examples/demos/demo.aug_9_2011/ps_demo.sh b/examples/demos/demo.aug_9_2011/ps_demo.sh
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/ps_demo.sh
rename to examples/demos/demo.aug_9_2011/ps_demo.sh
diff --git a/peasoup_examples/demos/demo.aug_9_2011/sample.txt b/examples/demos/demo.aug_9_2011/sample.txt
similarity index 100%
rename from peasoup_examples/demos/demo.aug_9_2011/sample.txt
rename to examples/demos/demo.aug_9_2011/sample.txt
diff --git a/peasoup_examples/demos/demo.jan_21_2011/Makefile b/examples/demos/demo.jan_21_2011/Makefile
similarity index 100%
rename from peasoup_examples/demos/demo.jan_21_2011/Makefile
rename to examples/demos/demo.jan_21_2011/Makefile
diff --git a/peasoup_examples/demos/demo.jan_21_2011/demo_analyze.sh b/examples/demos/demo.jan_21_2011/demo_analyze.sh
similarity index 100%
rename from peasoup_examples/demos/demo.jan_21_2011/demo_analyze.sh
rename to examples/demos/demo.jan_21_2011/demo_analyze.sh
diff --git a/peasoup_examples/demos/demo.jan_21_2011/dumbledore.c b/examples/demos/demo.jan_21_2011/dumbledore.c
similarity index 100%
rename from peasoup_examples/demos/demo.jan_21_2011/dumbledore.c
rename to examples/demos/demo.jan_21_2011/dumbledore.c
diff --git a/peasoup_examples/demos/demo.jan_21_2011/dumbledore.exploits/Makefile b/examples/demos/demo.jan_21_2011/dumbledore.exploits/Makefile
similarity index 100%
rename from peasoup_examples/demos/demo.jan_21_2011/dumbledore.exploits/Makefile
rename to examples/demos/demo.jan_21_2011/dumbledore.exploits/Makefile
diff --git a/peasoup_examples/demos/demo.jan_21_2011/dumbledore.exploits/attack-gradeA.no_strata.c b/examples/demos/demo.jan_21_2011/dumbledore.exploits/attack-gradeA.no_strata.c
similarity index 100%
rename from peasoup_examples/demos/demo.jan_21_2011/dumbledore.exploits/attack-gradeA.no_strata.c
rename to examples/demos/demo.jan_21_2011/dumbledore.exploits/attack-gradeA.no_strata.c
diff --git a/peasoup_examples/demos/demo.jan_21_2011/dumbledore.exploits/attack-gradeB.no_strata.c b/examples/demos/demo.jan_21_2011/dumbledore.exploits/attack-gradeB.no_strata.c
similarity index 100%
rename from peasoup_examples/demos/demo.jan_21_2011/dumbledore.exploits/attack-gradeB.no_strata.c
rename to examples/demos/demo.jan_21_2011/dumbledore.exploits/attack-gradeB.no_strata.c
diff --git a/peasoup_examples/demos/demo.jan_21_2011/dumbledore.exploits/attack-strata_parm1.c b/examples/demos/demo.jan_21_2011/dumbledore.exploits/attack-strata_parm1.c
similarity index 100%
rename from peasoup_examples/demos/demo.jan_21_2011/dumbledore.exploits/attack-strata_parm1.c
rename to examples/demos/demo.jan_21_2011/dumbledore.exploits/attack-strata_parm1.c
diff --git a/peasoup_examples/demos/demo.jan_21_2011/dumbledore.exploits/attack-strata_tracing.c b/examples/demos/demo.jan_21_2011/dumbledore.exploits/attack-strata_tracing.c
similarity index 100%
rename from peasoup_examples/demos/demo.jan_21_2011/dumbledore.exploits/attack-strata_tracing.c
rename to examples/demos/demo.jan_21_2011/dumbledore.exploits/attack-strata_tracing.c
diff --git a/peasoup_examples/demos/demo.jan_21_2011/dumbledore.exploits/badA.txt b/examples/demos/demo.jan_21_2011/dumbledore.exploits/badA.txt
similarity index 100%
rename from peasoup_examples/demos/demo.jan_21_2011/dumbledore.exploits/badA.txt
rename to examples/demos/demo.jan_21_2011/dumbledore.exploits/badA.txt
diff --git a/peasoup_examples/demos/demo.jan_21_2011/dumbledore.exploits/badB.txt b/examples/demos/demo.jan_21_2011/dumbledore.exploits/badB.txt
similarity index 100%
rename from peasoup_examples/demos/demo.jan_21_2011/dumbledore.exploits/badB.txt
rename to examples/demos/demo.jan_21_2011/dumbledore.exploits/badB.txt
diff --git a/peasoup_examples/demos/demo.jan_21_2011/dumbledore.good_inputs/good.txt b/examples/demos/demo.jan_21_2011/dumbledore.good_inputs/good.txt
similarity index 100%
rename from peasoup_examples/demos/demo.jan_21_2011/dumbledore.good_inputs/good.txt
rename to examples/demos/demo.jan_21_2011/dumbledore.good_inputs/good.txt
diff --git a/peasoup_examples/demos/demo.jan_21_2011/dumbledore_cmd.c b/examples/demos/demo.jan_21_2011/dumbledore_cmd.c
similarity index 100%
rename from peasoup_examples/demos/demo.jan_21_2011/dumbledore_cmd.c
rename to examples/demos/demo.jan_21_2011/dumbledore_cmd.c
diff --git a/peasoup_examples/demos/demo.jan_21_2011/gdb.demo.script b/examples/demos/demo.jan_21_2011/gdb.demo.script
similarity index 100%
rename from peasoup_examples/demos/demo.jan_21_2011/gdb.demo.script
rename to examples/demos/demo.jan_21_2011/gdb.demo.script
diff --git a/peasoup_examples/demos/demo.jan_21_2011/ps_demo.sh b/examples/demos/demo.jan_21_2011/ps_demo.sh
similarity index 100%
rename from peasoup_examples/demos/demo.jan_21_2011/ps_demo.sh
rename to examples/demos/demo.jan_21_2011/ps_demo.sh
diff --git a/peasoup_examples/demos/demo.jan_21_2011/run_gdb.sh b/examples/demos/demo.jan_21_2011/run_gdb.sh
similarity index 100%
rename from peasoup_examples/demos/demo.jan_21_2011/run_gdb.sh
rename to examples/demos/demo.jan_21_2011/run_gdb.sh
diff --git a/peasoup_examples/demos/demo.jan_21_2011/test_infinite.sh b/examples/demos/demo.jan_21_2011/test_infinite.sh
similarity index 100%
rename from peasoup_examples/demos/demo.jan_21_2011/test_infinite.sh
rename to examples/demos/demo.jan_21_2011/test_infinite.sh
diff --git a/peasoup_examples/dyna_examples/000.c b/examples/dyna_examples/000.c
similarity index 100%
rename from peasoup_examples/dyna_examples/000.c
rename to examples/dyna_examples/000.c
diff --git a/peasoup_examples/dyna_examples/Makefile b/examples/dyna_examples/Makefile
similarity index 100%
rename from peasoup_examples/dyna_examples/Makefile
rename to examples/dyna_examples/Makefile
diff --git a/peasoup_examples/dyna_examples/bad_purify.c b/examples/dyna_examples/bad_purify.c
similarity index 100%
rename from peasoup_examples/dyna_examples/bad_purify.c
rename to examples/dyna_examples/bad_purify.c
diff --git a/peasoup_examples/dyna_examples/block_copy.c b/examples/dyna_examples/block_copy.c
similarity index 100%
rename from peasoup_examples/dyna_examples/block_copy.c
rename to examples/dyna_examples/block_copy.c
diff --git a/peasoup_examples/dyna_examples/cmd_args_005.c b/examples/dyna_examples/cmd_args_005.c
similarity index 100%
rename from peasoup_examples/dyna_examples/cmd_args_005.c
rename to examples/dyna_examples/cmd_args_005.c
diff --git a/peasoup_examples/dyna_examples/concolic_test_handshake.c b/examples/dyna_examples/concolic_test_handshake.c
similarity index 100%
rename from peasoup_examples/dyna_examples/concolic_test_handshake.c
rename to examples/dyna_examples/concolic_test_handshake.c
diff --git a/peasoup_examples/dyna_examples/data.txt b/examples/dyna_examples/data.txt
similarity index 100%
rename from peasoup_examples/dyna_examples/data.txt
rename to examples/dyna_examples/data.txt
diff --git a/peasoup_examples/dyna_examples/dumble_dll.c b/examples/dyna_examples/dumble_dll.c
similarity index 100%
rename from peasoup_examples/dyna_examples/dumble_dll.c
rename to examples/dyna_examples/dumble_dll.c
diff --git a/peasoup_examples/dyna_examples/dumbledore_cmd.c b/examples/dyna_examples/dumbledore_cmd.c
similarity index 100%
rename from peasoup_examples/dyna_examples/dumbledore_cmd.c
rename to examples/dyna_examples/dumbledore_cmd.c
diff --git a/peasoup_examples/dyna_examples/dumbledore_file.c b/examples/dyna_examples/dumbledore_file.c
similarity index 100%
rename from peasoup_examples/dyna_examples/dumbledore_file.c
rename to examples/dyna_examples/dumbledore_file.c
diff --git a/peasoup_examples/dyna_examples/dumbledore_file_with_fopen_check.c b/examples/dyna_examples/dumbledore_file_with_fopen_check.c
similarity index 100%
rename from peasoup_examples/dyna_examples/dumbledore_file_with_fopen_check.c
rename to examples/dyna_examples/dumbledore_file_with_fopen_check.c
diff --git a/peasoup_examples/dyna_examples/dumbledore_stdin.c b/examples/dyna_examples/dumbledore_stdin.c
similarity index 100%
rename from peasoup_examples/dyna_examples/dumbledore_stdin.c
rename to examples/dyna_examples/dumbledore_stdin.c
diff --git a/peasoup_examples/dyna_examples/fptest.c b/examples/dyna_examples/fptest.c
similarity index 100%
rename from peasoup_examples/dyna_examples/fptest.c
rename to examples/dyna_examples/fptest.c
diff --git a/peasoup_examples/dyna_examples/globalfield.c b/examples/dyna_examples/globalfield.c
similarity index 100%
rename from peasoup_examples/dyna_examples/globalfield.c
rename to examples/dyna_examples/globalfield.c
diff --git a/peasoup_examples/dyna_examples/hanoi.c b/examples/dyna_examples/hanoi.c
similarity index 100%
rename from peasoup_examples/dyna_examples/hanoi.c
rename to examples/dyna_examples/hanoi.c
diff --git a/peasoup_examples/dyna_examples/hanoi_heap_overrun.c b/examples/dyna_examples/hanoi_heap_overrun.c
similarity index 100%
rename from peasoup_examples/dyna_examples/hanoi_heap_overrun.c
rename to examples/dyna_examples/hanoi_heap_overrun.c
diff --git a/peasoup_examples/dyna_examples/hanoi_nostrata.c b/examples/dyna_examples/hanoi_nostrata.c
similarity index 100%
rename from peasoup_examples/dyna_examples/hanoi_nostrata.c
rename to examples/dyna_examples/hanoi_nostrata.c
diff --git a/peasoup_examples/dyna_examples/hanoi_overrun.c b/examples/dyna_examples/hanoi_overrun.c
similarity index 100%
rename from peasoup_examples/dyna_examples/hanoi_overrun.c
rename to examples/dyna_examples/hanoi_overrun.c
diff --git a/peasoup_examples/dyna_examples/hanoi_overrun_tainted.c b/examples/dyna_examples/hanoi_overrun_tainted.c
similarity index 100%
rename from peasoup_examples/dyna_examples/hanoi_overrun_tainted.c
rename to examples/dyna_examples/hanoi_overrun_tainted.c
diff --git a/peasoup_examples/dyna_examples/hanoi_overrun_taintedenv.c b/examples/dyna_examples/hanoi_overrun_taintedenv.c
similarity index 100%
rename from peasoup_examples/dyna_examples/hanoi_overrun_taintedenv.c
rename to examples/dyna_examples/hanoi_overrun_taintedenv.c
diff --git a/peasoup_examples/dyna_examples/hanoi_stack_overrun.c b/examples/dyna_examples/hanoi_stack_overrun.c
similarity index 100%
rename from peasoup_examples/dyna_examples/hanoi_stack_overrun.c
rename to examples/dyna_examples/hanoi_stack_overrun.c
diff --git a/peasoup_examples/dyna_examples/hello.c b/examples/dyna_examples/hello.c
similarity index 100%
rename from peasoup_examples/dyna_examples/hello.c
rename to examples/dyna_examples/hello.c
diff --git a/peasoup_examples/dyna_examples/long.c b/examples/dyna_examples/long.c
similarity index 100%
rename from peasoup_examples/dyna_examples/long.c
rename to examples/dyna_examples/long.c
diff --git a/peasoup_examples/dyna_examples/malloc.c b/examples/dyna_examples/malloc.c
similarity index 100%
rename from peasoup_examples/dyna_examples/malloc.c
rename to examples/dyna_examples/malloc.c
diff --git a/peasoup_examples/dyna_examples/memcpy.c b/examples/dyna_examples/memcpy.c
similarity index 100%
rename from peasoup_examples/dyna_examples/memcpy.c
rename to examples/dyna_examples/memcpy.c
diff --git a/peasoup_examples/dyna_examples/myhanoi.c b/examples/dyna_examples/myhanoi.c
similarity index 100%
rename from peasoup_examples/dyna_examples/myhanoi.c
rename to examples/dyna_examples/myhanoi.c
diff --git a/peasoup_examples/dyna_examples/print_ptr.c b/examples/dyna_examples/print_ptr.c
similarity index 100%
rename from peasoup_examples/dyna_examples/print_ptr.c
rename to examples/dyna_examples/print_ptr.c
diff --git a/peasoup_examples/dyna_examples/recover_example.c b/examples/dyna_examples/recover_example.c
similarity index 100%
rename from peasoup_examples/dyna_examples/recover_example.c
rename to examples/dyna_examples/recover_example.c
diff --git a/peasoup_examples/examples/Makefile b/examples/examples/Makefile
similarity index 100%
rename from peasoup_examples/examples/Makefile
rename to examples/examples/Makefile
diff --git a/peasoup_examples/examples/block_copy.c b/examples/examples/block_copy.c
similarity index 100%
rename from peasoup_examples/examples/block_copy.c
rename to examples/examples/block_copy.c
diff --git a/peasoup_examples/examples/cmd_args_005.c b/examples/examples/cmd_args_005.c
similarity index 100%
rename from peasoup_examples/examples/cmd_args_005.c
rename to examples/examples/cmd_args_005.c
diff --git a/peasoup_examples/examples/concolic_test_handshake.c b/examples/examples/concolic_test_handshake.c
similarity index 100%
rename from peasoup_examples/examples/concolic_test_handshake.c
rename to examples/examples/concolic_test_handshake.c
diff --git a/peasoup_examples/examples/data.txt b/examples/examples/data.txt
similarity index 100%
rename from peasoup_examples/examples/data.txt
rename to examples/examples/data.txt
diff --git a/peasoup_examples/examples/dumbledore_cmd.c b/examples/examples/dumbledore_cmd.c
similarity index 100%
rename from peasoup_examples/examples/dumbledore_cmd.c
rename to examples/examples/dumbledore_cmd.c
diff --git a/peasoup_examples/examples/dumbledore_file.c b/examples/examples/dumbledore_file.c
similarity index 100%
rename from peasoup_examples/examples/dumbledore_file.c
rename to examples/examples/dumbledore_file.c
diff --git a/peasoup_examples/examples/dumbledore_file_with_fopen_check.c b/examples/examples/dumbledore_file_with_fopen_check.c
similarity index 100%
rename from peasoup_examples/examples/dumbledore_file_with_fopen_check.c
rename to examples/examples/dumbledore_file_with_fopen_check.c
diff --git a/peasoup_examples/examples/dumbledore_stdin.c b/examples/examples/dumbledore_stdin.c
similarity index 100%
rename from peasoup_examples/examples/dumbledore_stdin.c
rename to examples/examples/dumbledore_stdin.c
diff --git a/peasoup_examples/examples/fptest.c b/examples/examples/fptest.c
similarity index 100%
rename from peasoup_examples/examples/fptest.c
rename to examples/examples/fptest.c
diff --git a/peasoup_examples/examples/globalfield.c b/examples/examples/globalfield.c
similarity index 100%
rename from peasoup_examples/examples/globalfield.c
rename to examples/examples/globalfield.c
diff --git a/peasoup_examples/examples/hanoi.c b/examples/examples/hanoi.c
similarity index 100%
rename from peasoup_examples/examples/hanoi.c
rename to examples/examples/hanoi.c
diff --git a/peasoup_examples/examples/hanoi_heap_overrun.c b/examples/examples/hanoi_heap_overrun.c
similarity index 100%
rename from peasoup_examples/examples/hanoi_heap_overrun.c
rename to examples/examples/hanoi_heap_overrun.c
diff --git a/peasoup_examples/examples/hanoi_nostrata.c b/examples/examples/hanoi_nostrata.c
similarity index 100%
rename from peasoup_examples/examples/hanoi_nostrata.c
rename to examples/examples/hanoi_nostrata.c
diff --git a/peasoup_examples/examples/hanoi_overrun.c b/examples/examples/hanoi_overrun.c
similarity index 100%
rename from peasoup_examples/examples/hanoi_overrun.c
rename to examples/examples/hanoi_overrun.c
diff --git a/peasoup_examples/examples/hanoi_overrun_tainted.c b/examples/examples/hanoi_overrun_tainted.c
similarity index 100%
rename from peasoup_examples/examples/hanoi_overrun_tainted.c
rename to examples/examples/hanoi_overrun_tainted.c
diff --git a/peasoup_examples/examples/hanoi_overrun_taintedenv.c b/examples/examples/hanoi_overrun_taintedenv.c
similarity index 100%
rename from peasoup_examples/examples/hanoi_overrun_taintedenv.c
rename to examples/examples/hanoi_overrun_taintedenv.c
diff --git a/peasoup_examples/examples/hanoi_stack_overrun.c b/examples/examples/hanoi_stack_overrun.c
similarity index 100%
rename from peasoup_examples/examples/hanoi_stack_overrun.c
rename to examples/examples/hanoi_stack_overrun.c
diff --git a/peasoup_examples/examples/hello.c b/examples/examples/hello.c
similarity index 100%
rename from peasoup_examples/examples/hello.c
rename to examples/examples/hello.c
diff --git a/peasoup_examples/examples/ld_script b/examples/examples/ld_script
similarity index 100%
rename from peasoup_examples/examples/ld_script
rename to examples/examples/ld_script
diff --git a/peasoup_examples/examples/malloc.c b/examples/examples/malloc.c
similarity index 100%
rename from peasoup_examples/examples/malloc.c
rename to examples/examples/malloc.c
diff --git a/peasoup_examples/examples/memcpy.c b/examples/examples/memcpy.c
similarity index 100%
rename from peasoup_examples/examples/memcpy.c
rename to examples/examples/memcpy.c
diff --git a/peasoup_examples/examples/myhanoi.c b/examples/examples/myhanoi.c
similarity index 100%
rename from peasoup_examples/examples/myhanoi.c
rename to examples/examples/myhanoi.c
diff --git a/peasoup_examples/examples/print_ptr.c b/examples/examples/print_ptr.c
similarity index 100%
rename from peasoup_examples/examples/print_ptr.c
rename to examples/examples/print_ptr.c
diff --git a/peasoup_examples/examples/recover_example.c b/examples/examples/recover_example.c
similarity index 100%
rename from peasoup_examples/examples/recover_example.c
rename to examples/examples/recover_example.c
diff --git a/peasoup_examples/spec/.gitignore b/examples/spec/.gitignore
similarity index 100%
rename from peasoup_examples/spec/.gitignore
rename to examples/spec/.gitignore
diff --git a/peasoup_examples/spec/test_spec.sh b/examples/spec/test_spec.sh
similarity index 100%
rename from peasoup_examples/spec/test_spec.sh
rename to examples/spec/test_spec.sh
diff --git a/peasoup_examples/spec/test_spec17.sh b/examples/spec/test_spec17.sh
similarity index 100%
rename from peasoup_examples/spec/test_spec17.sh
rename to examples/spec/test_spec17.sh
diff --git a/peasoup_examples/stock_examples/Makefile b/examples/stock_examples/Makefile
similarity index 100%
rename from peasoup_examples/stock_examples/Makefile
rename to examples/stock_examples/Makefile
diff --git a/peasoup_examples/stock_examples/bzip2.stock b/examples/stock_examples/bzip2.stock
similarity index 100%
rename from peasoup_examples/stock_examples/bzip2.stock
rename to examples/stock_examples/bzip2.stock
diff --git a/peasoup_examples/stock_examples/xpdf.stock b/examples/stock_examples/xpdf.stock
similarity index 100%
rename from peasoup_examples/stock_examples/xpdf.stock
rename to examples/stock_examples/xpdf.stock
diff --git a/peasoup_examples/stock_examples/xpdfsrc.stock b/examples/stock_examples/xpdfsrc.stock
similarity index 100%
rename from peasoup_examples/stock_examples/xpdfsrc.stock
rename to examples/stock_examples/xpdfsrc.stock
diff --git a/peasoup_examples/stock_examples64/Makefile b/examples/stock_examples64/Makefile
similarity index 100%
rename from peasoup_examples/stock_examples64/Makefile
rename to examples/stock_examples64/Makefile
diff --git a/peasoup_examples/stock_examples64/bzip2.stock b/examples/stock_examples64/bzip2.stock
similarity index 100%
rename from peasoup_examples/stock_examples64/bzip2.stock
rename to examples/stock_examples64/bzip2.stock
diff --git a/peasoup_examples/stock_examples64/gedit.stock b/examples/stock_examples64/gedit.stock
similarity index 100%
rename from peasoup_examples/stock_examples64/gedit.stock
rename to examples/stock_examples64/gedit.stock
diff --git a/peasoup_examples/stock_examples64/grep.stock b/examples/stock_examples64/grep.stock
similarity index 100%
rename from peasoup_examples/stock_examples64/grep.stock
rename to examples/stock_examples64/grep.stock
diff --git a/peasoup_examples/stock_examples64/less.stock b/examples/stock_examples64/less.stock
similarity index 100%
rename from peasoup_examples/stock_examples64/less.stock
rename to examples/stock_examples64/less.stock
diff --git a/peasoup_examples/stock_examples64/ls.win.exe b/examples/stock_examples64/ls.win.exe
similarity index 100%
rename from peasoup_examples/stock_examples64/ls.win.exe
rename to examples/stock_examples64/ls.win.exe
diff --git a/peasoup_examples/stock_examples64/synaptic.stock b/examples/stock_examples64/synaptic.stock
similarity index 100%
rename from peasoup_examples/stock_examples64/synaptic.stock
rename to examples/stock_examples64/synaptic.stock
diff --git a/peasoup_examples/stock_examples64/vita.pdf b/examples/stock_examples64/vita.pdf
similarity index 100%
rename from peasoup_examples/stock_examples64/vita.pdf
rename to examples/stock_examples64/vita.pdf
diff --git a/peasoup_examples/stock_examples64/xcalc.stock b/examples/stock_examples64/xcalc.stock
similarity index 100%
rename from peasoup_examples/stock_examples64/xcalc.stock
rename to examples/stock_examples64/xcalc.stock
diff --git a/peasoup_examples/stock_examples64/xedit.stock b/examples/stock_examples64/xedit.stock
similarity index 100%
rename from peasoup_examples/stock_examples64/xedit.stock
rename to examples/stock_examples64/xedit.stock
diff --git a/peasoup_examples/stock_examples64/xeyes.stock b/examples/stock_examples64/xeyes.stock
similarity index 100%
rename from peasoup_examples/stock_examples64/xeyes.stock
rename to examples/stock_examples64/xeyes.stock
diff --git a/peasoup_examples/web_server/.lighttpdpassword b/examples/web_server/.lighttpdpassword
similarity index 100%
rename from peasoup_examples/web_server/.lighttpdpassword
rename to examples/web_server/.lighttpdpassword
diff --git a/peasoup_examples/web_server/lighttpd_conf_template b/examples/web_server/lighttpd_conf_template
similarity index 100%
rename from peasoup_examples/web_server/lighttpd_conf_template
rename to examples/web_server/lighttpd_conf_template
diff --git a/peasoup_examples/web_server/www/hello_world.txt b/examples/web_server/www/hello_world.txt
similarity index 100%
rename from peasoup_examples/web_server/www/hello_world.txt
rename to examples/web_server/www/hello_world.txt
diff --git a/peasoup_examples/web_server/www/index.html b/examples/web_server/www/index.html
similarity index 100%
rename from peasoup_examples/web_server/www/index.html
rename to examples/web_server/www/index.html
diff --git a/peasoup_examples/web_server/www/index.lighttpd.html b/examples/web_server/www/index.lighttpd.html
similarity index 100%
rename from peasoup_examples/web_server/www/index.lighttpd.html
rename to examples/web_server/www/index.lighttpd.html
diff --git a/peasoup_examples/web_server/www/no_extension b/examples/web_server/www/no_extension
similarity index 100%
rename from peasoup_examples/web_server/www/no_extension
rename to examples/web_server/www/no_extension
diff --git a/peasoup_examples/web_server/www/peasoup.auth/hello_world.txt b/examples/web_server/www/peasoup.auth/hello_world.txt
similarity index 100%
rename from peasoup_examples/web_server/www/peasoup.auth/hello_world.txt
rename to examples/web_server/www/peasoup.auth/hello_world.txt
diff --git a/peasoup_examples/web_server/www/peasoup.auth/index.html b/examples/web_server/www/peasoup.auth/index.html
similarity index 100%
rename from peasoup_examples/web_server/www/peasoup.auth/index.html
rename to examples/web_server/www/peasoup.auth/index.html
diff --git a/peasoup_examples/web_server/www/peasoup/index.html b/examples/web_server/www/peasoup/index.html
similarity index 100%
rename from peasoup_examples/web_server/www/peasoup/index.html
rename to examples/web_server/www/peasoup/index.html
diff --git a/peasoup_examples/web_server/www/peasoup/peasoup.jpg b/examples/web_server/www/peasoup/peasoup.jpg
similarity index 100%
rename from peasoup_examples/web_server/www/peasoup/peasoup.jpg
rename to examples/web_server/www/peasoup/peasoup.jpg
diff --git a/peasoup_examples/web_server/www/testing/index.html b/examples/web_server/www/testing/index.html
similarity index 100%
rename from peasoup_examples/web_server/www/testing/index.html
rename to examples/web_server/www/testing/index.html
diff --git a/manifest.txt b/manifest.txt
index b163378a013ccc2e52f2ba35be4426451e499675..01232cc3f04b158de8c0a818787066235380f5d9 100644
--- a/manifest.txt
+++ b/manifest.txt
@@ -1,6 +1,5 @@
 
 submanifest irdb-libs/manifest.txt
-submanifest peasoup_examples/manifest.txt
 submanifest idaproCur/manifest.txt
 submanifest SMPStaticAnalyzer/manifest.txt
 submanifest zipr_install/manifest.txt
@@ -16,3 +15,8 @@ file README.txt ps
 file cfar_postgres_setup.sh cfar
 file get-peasoup-packages.sh ps
 directory centos_files centos
+directory tools ps
+directory tools/db ps
+directory tools/eh_frame_tools ps
+directory tools/cfar_configs cfar
+
diff --git a/peasoup_examples/manifest.txt b/peasoup_examples/manifest.txt
deleted file mode 100644
index 1fa72c089a6ba8f5c5fabfd8156e7ea33ed01274..0000000000000000000000000000000000000000
--- a/peasoup_examples/manifest.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-directory tools ps
-directory tools/db ps
-directory tools/eh_frame_tools ps
-directory tools/cfar_configs cfar