Make changes in bundle name and structure