Merge "Correct directory location." into pi-dev