Saad's Uri fixes and my directory changes