fixed some package declarations