more models
fix imports
finished reorganization
Merge branch 'fitting'