Changed name of tours, moved converters to todo/