Reorganized character control scripts.
Leftovers
Conflict fix