Reestructuracion of pakages and bugs fixed