Updating paths to get everything working correctly