The file groups thing I described above should let you accomplish the same thing, Butler can be used for doing branching builds for patched files.
