Improving structure folder-structure