Changed some package locations