start big cleanup of bundles
consolidated config files
reorder bundles