Filename and directory cleanup