[shitou] - refactor file stucture, add tests