Adding correct package declarations and adding commons jar