Reorganized other model code