updated folders and bundling added