[ET Trac] #469: Improve default directory locations