buildbot: regroup structure around build targets again