Re-arranging model file slightly.