Simplified folder and file names