Reorganize files; Add test helpers for dialog