LIMS-1430 Reestructuracion to solve some problems