folder structure clean up, dialog updated