reorg JSS files continued (2)