separated directives; renamed image elements