reorganised packeges, added icons