Refactor to different packages and separate Dialog actions into a single class