Finishing up JS reorganization.