- reorganize module
- schema itself validating
- some bugs