Reorganize setup wizard

signed by: Carlos Jesús <xxx.reptar.rawrr.xxx@gmail.com>

Change-Id: I319a06be9d51688aa23344b72dc7b49c99915f34