more models
fix imports
finished reorganization