Fix findings. Change package