Bundle quick and dirty fix

Rename, remove first line (start with services)
FYI the errors from os.Open and os.Create already contain the path name,
so errgo.Mask(err) would probably be fine in both cases.