Moved duplicated dialog classes into spring