Corrected packages

Change-Id: Ief7372b114850e74074694520df6bd73be7c5f77
Remove duplicated classes

Change-Id: If2e246023c5c013efb3d3b44817580ef7a33ae49
Remove more duplicated classes

Change-Id: Ib0f9230716c56ed770101108793e598dab0b29d7