More JS reorganization.