Reorganized file and folder naming structure