1. add tstool of utils
2. adjust folder structs