Consolidated scripts and created bundle manager