Some changes

Moved Mappers to the MainController
Added Name enum to Round.