Changed some paths to the better