moved to waf
rename some dirs