changed structure and added more vundles