JBIDE-16019 Reorganize JST component