Fixed delete button behavior / New folder structure
New folder structure
Delete button fix / folder structure change