More js reorganization.