DS_Store cleanup, image reorganization