update
refactoer the model layout
rm some tests