Refactor packages
Fix dialog bugs
Fix validation
Fix file name bug
Merge branch 'fix/refactor_code'