renamed package again
fixed errors