updated doc
merge the util and defi
renamed model.py
update sphinx's doc