Move bucket parsing into parsing pkg.