Update and rename Popup.java to PopupDialog.java