Updated Javascript File Structure