More bundles, Better Rakefile