Reestructuración

Change-Id: I7e50faf4a97298081957ef27f110e71bd78b8a0c
Signed-off-by: sernav <sergio.navarrogil@gmail.com>