Tests refactoring
More spring
More spring
Refactor package structure
Format
Format
Improve shell
use json for config file