Change the Structure

Signed-off-by: Angel Guerra <a.guerrarevilla@gmail.com>