Tidied references to the BundlesDir