- better code organization

Signed-off-by: Edgar Nadal <edgarnadal@esd.com.do>