Organize and update bundles.

@yuhunglin just some bundle organization