Folded form title into formModel
One last file move