New waf/wscript and initial reorganization
diff --git a/waf b/waf
index ef85684..d45d28b 100755
--- a/waf
+++ b/waf
Binary files differ