rename dicts -> dict
rename scripts -> script
add servertest
Merge remote-tracking branch 'origin/dev'