Simplifying CompositeStack stacking logic
Move waf scripts to a submodule