Moved controllers and mapping