Moved dialogs into one folder + better names