Added waf, altered directory structure