rename bundle directories to be less noisy
remove no-longer-needed conditionals