further photo reorganization