Organizacion del settings

Change-Id: I5a1d10e3be444e636e663e2d2473d1dd4f3d5f07