app/model reaorganized