rework some paths in stack/builder