file reorg; test script
add original for STM, clarify STM role