Changed directory structure
Element buffer used.
Directory struture changed