JAL-3210 Moving j2s components around