Made some changes to pathing setup